From 438ac6765e76ba350c2a471ad98c0ff2efd23af2 Mon Sep 17 00:00:00 2001 From: hyunho Date: Mon, 30 Nov 2020 07:24:53 +0000 Subject: [PATCH] --- FO/Controllers/MyController.cs | 10 +++++++--- FO/Views/Account/SNSLinkCallback.cshtml | 8 ++++---- FO/Views/My/MyInfoCheck.cshtml | 13 +++++++++---- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/FO/Controllers/MyController.cs b/FO/Controllers/MyController.cs index d56e1d8..cf7d13e 100644 --- a/FO/Controllers/MyController.cs +++ b/FO/Controllers/MyController.cs @@ -391,10 +391,14 @@ namespace NP.FO.Controllers ViewBag.kakaoClientID = kakaoClientID; ViewBag.googleClientID = googleClientID; - //인증키 확인 - if (vm.intval < 1 || Dao.Get("users.usercheckconfirm", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo }, { "checkkey", vm.intval } }).First() < 1) + string referrerURL = Request.UrlReferrer.ToString(); + if (!referrerURL.ToLower().Contains("myinfocheck") && !referrerURL.ToLower().Contains("snslinkcallback")) { - return Redirect("/My/MyInfo"); + //인증키 확인 + if (vm.intval < 1 || Dao.Get("users.usercheckconfirm", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo }, { "checkkey", vm.intval } }).First() < 1) + { + return Redirect("/My/MyInfo"); + } } vm.User = Dao.Get("users.users", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo } }).FirstOrDefault(); vm.ComCodes = GetComCodes("jobposition,job", true); diff --git a/FO/Views/Account/SNSLinkCallback.cshtml b/FO/Views/Account/SNSLinkCallback.cshtml index f33f4aa..df7b8d5 100644 --- a/FO/Views/Account/SNSLinkCallback.cshtml +++ b/FO/Views/Account/SNSLinkCallback.cshtml @@ -89,21 +89,21 @@ //공통 function snslink() { if (capResult.code > 0) { - msg("SNS 연동하였습니다."); + alert("연동하였습니다."); goRefresh(); } else { - msg("SNS 연동에 실패하였습니다. \r\n관리자에게 문의하세요."); + alert("SNS 연동에 실패하였습니다. \r\n관리자에게 문의하세요."); return; } } function goRefresh() { if (@jointype == 2) { - opener.location.href = "https://www.ynicte.com/My/MyinfoCheck"; + opener.location.href = "/My/MyinfoCheck"; self.close(); } else { - location.href = "https://www.ynicte.com/My/MyinfoCheck"; + location.href = "/My/MyinfoCheck"; } } diff --git a/FO/Views/My/MyInfoCheck.cshtml b/FO/Views/My/MyInfoCheck.cshtml index b75d6df..345a842 100644 --- a/FO/Views/My/MyInfoCheck.cshtml +++ b/FO/Views/My/MyInfoCheck.cshtml @@ -10,7 +10,6 @@ -
@@ -207,6 +206,12 @@ }); snsInit(); + + var referrer = document.referrer; + if (referrer.toLowerCase().indexOf('myinfocheck') > 0 || referrer.toLowerCase().indexOf('snslinkcallback') > 0) { + selectTab("sns"); + + } }); function setemail2() { setv("email2", val("email3")); @@ -292,8 +297,8 @@ } function afterSnsLink() { if (capResult.code > 0) { - msg("SNS 연동을 해제하였습니다."); - return; + alert("SNS 연동을 해제하였습니다."); + location.href = "/My/MyinfoCheck"; } else { msg("SNS 연동해제에 실패하였습니다. \r\n관리자에게 문의하세요."); @@ -315,7 +320,6 @@ function googleInit() { gapi.load('auth2', function () {var gauth = gapi.auth2.init({client_id: "@googleClientId", scope: 'profile'});gauth.then(function () {console.log('google init success');}, function () {console.error('google init fail');})}); } - var naverLogin = new naver.LoginWithNaverId({ clientId: "@naverClientId", callbackUrl: "https://www.ynicte.com/Account/SNSLinkCallback?jointype=2",isPopup: true,loginButton: { color: "green", type: 3, height: 60 }}); function loginWithKakao() { @@ -349,4 +353,5 @@ Kakao.init("@kakaoClientId"); } + @*header가 아니라 하단에 위치해야 읽어올수있음*@ }