From c43c10982c23c3133f273adc08dfafb932bb3963 Mon Sep 17 00:00:00 2001 From: mklee Date: Wed, 23 Aug 2023 19:03:28 +0900 Subject: [PATCH] =?UTF-8?q?[=EC=9D=B4=EB=AF=BC=EA=B6=8C]=20link=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/service.go | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/core/service.go b/core/service.go index 123eae2..85098ee 100644 --- a/core/service.go +++ b/core/service.go @@ -329,20 +329,6 @@ func (sh *serviceDescription) link(w http.ResponseWriter, r *http.Request) { // fmt.Println(oldAuth.Uid) // fmt.Println("=================") - oldType, oldId, err := sh.getProviderInfo(oldType, oldId) - if err != nil { - logger.Error("getProviderInfo failed :", err) - w.WriteHeader(http.StatusBadRequest) - return - } - - //if oldAuth.Token != oldToken || oldAuth.Uid != oldId || oldAuth.Platform != oldType { - if oldAuth.Uid != oldId || oldAuth.Platform != oldType { - logger.Println("link failed. session key is not correct :", *oldAuth, queryvals) - w.WriteHeader(http.StatusBadRequest) - return - } - bfinfo, err := sh.getUserBrowserInfo(r) if err != nil { logger.Error("getUserBrowserInfo failed :", err) @@ -362,6 +348,20 @@ func (sh *serviceDescription) link(w http.ResponseWriter, r *http.Request) { logger.Println("from guest acc to real acc link : ", oldId, bfinfo, newType, newId, bfinfo) } + oldType, oldId, err = sh.getProviderInfo(oldType, oldId) + if err != nil { + logger.Error("getProviderInfo failed :", err) + w.WriteHeader(http.StatusBadRequest) + return + } + + //if oldAuth.Token != oldToken || oldAuth.Uid != oldId || oldAuth.Platform != oldType { + if oldAuth.Uid != oldId || oldAuth.Platform != oldType { + logger.Println("link failed. session key is not correct :", *oldAuth, queryvals) + w.WriteHeader(http.StatusBadRequest) + return + } + email, err := sh.readProfile(newType, newId, bfinfo) if err != nil { logger.Error("readProfile(new) failed :", err)