<기능개선>
1. PMS NO : 2. (주요)작업내용 (1) 로그인 후 Account/login 입장허용된 부분 예외처리
This commit is contained in:
parent
2efcb78b4b
commit
a81f39ed46
|
|
@ -21,18 +21,26 @@ namespace NP.BO.Controllers
|
||||||
//[AllowAnonymous]
|
//[AllowAnonymous]
|
||||||
public ActionResult Index(VMUser vm, bool istimeout = false)
|
public ActionResult Index(VMUser vm, bool istimeout = false)
|
||||||
{
|
{
|
||||||
ViewBag.IsTimeOut = istimeout;
|
int userno = SUserInfo != null ? SUserInfo.UserNo : 0;
|
||||||
if (Request.IsAjaxRequest())
|
|
||||||
|
if(userno >0)
|
||||||
{
|
{
|
||||||
return JsonError<String>(Base.ENUM.JSONCode.Error, "403:" + Request.Url.AbsolutePath, "0112");
|
Response.Redirect("~/");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
vm.SavedId = CookieGet("SavedId", "");
|
ViewBag.IsTimeOut = istimeout;
|
||||||
|
if (Request.IsAjaxRequest())
|
||||||
|
{
|
||||||
|
return JsonError<String>(Base.ENUM.JSONCode.Error, "403:" + Request.Url.AbsolutePath, "0112");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
vm.SavedId = CookieGet("SavedId", "");
|
||||||
|
}
|
||||||
|
// 로그인 실패 카운트 초기화
|
||||||
|
vm.logincnt = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 로그인 실패 카운트 초기화
|
|
||||||
vm.logincnt = 0;
|
|
||||||
return View(vm);
|
return View(vm);
|
||||||
}
|
}
|
||||||
public JsonResult PassGet(String pw)
|
public JsonResult PassGet(String pw)
|
||||||
|
|
|
||||||
|
|
@ -40,22 +40,31 @@ namespace NP.FO.Controllers
|
||||||
return View(vm);
|
return View(vm);
|
||||||
}
|
}
|
||||||
public ActionResult Index(VMUser vm){
|
public ActionResult Index(VMUser vm){
|
||||||
ViewBag.naverClientID = naverClientID;
|
int userno = SUserInfo != null ? SUserInfo.UserNo : 0;
|
||||||
ViewBag.kakaoClientID = kakaoClientID;
|
|
||||||
ViewBag.googleClientID = googleClientID;
|
|
||||||
|
|
||||||
if (Request.IsAjaxRequest()){
|
if (userno > 0)
|
||||||
return JsonError<String>(Base.ENUM.JSONCode.Error, "403:" + Request.Url.AbsolutePath, "0112");
|
{
|
||||||
|
Response.Redirect("~/");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
//ViewBag.gossl = 0;
|
ViewBag.naverClientID = naverClientID;
|
||||||
//if ("Y".Equals(GetConfig("usessl")) && !Request.IsSecureConnection)
|
ViewBag.kakaoClientID = kakaoClientID;
|
||||||
//{
|
ViewBag.googleClientID = googleClientID;
|
||||||
// //return Redirect("https://" + Request.Url.Host + Request.Url.PathAndQuery);
|
|
||||||
// ViewBag.gossl = 1;
|
if (Request.IsAjaxRequest())
|
||||||
//}
|
{
|
||||||
|
return JsonError<String>(Base.ENUM.JSONCode.Error, "403:" + Request.Url.AbsolutePath, "0112");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
//ViewBag.gossl = 0;
|
||||||
|
//if ("Y".Equals(GetConfig("usessl")) && !Request.IsSecureConnection)
|
||||||
|
//{
|
||||||
|
// //return Redirect("https://" + Request.Url.Host + Request.Url.PathAndQuery);
|
||||||
|
// ViewBag.gossl = 1;
|
||||||
|
//}
|
||||||
|
|
||||||
vm.Assign = new Assign();
|
vm.Assign = new Assign();
|
||||||
//서브도메인 확인 하여 고객사 설정
|
//서브도메인 확인 하여 고객사 설정
|
||||||
var sd = Request.Url.Host.Split('.')[0];
|
var sd = Request.Url.Host.Split('.')[0];
|
||||||
|
|
@ -66,9 +75,11 @@ namespace NP.FO.Controllers
|
||||||
ViewBag.SiteTitle = vm.Assign.asname;
|
ViewBag.SiteTitle = vm.Assign.asname;
|
||||||
}
|
}
|
||||||
ViewBag.SavedId = CookieGet("savedid", "");
|
ViewBag.SavedId = CookieGet("savedid", "");
|
||||||
|
|
||||||
return View(vm);
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return View(vm);
|
||||||
}
|
}
|
||||||
private ActionResult RedirectToLocal(string returnUrl){
|
private ActionResult RedirectToLocal(string returnUrl){
|
||||||
if (Url.IsLocalUrl(returnUrl)){return Redirect(returnUrl);}
|
if (Url.IsLocalUrl(returnUrl)){return Redirect(returnUrl);}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue