From 476bc45a76403887ccc346f9166a8606ac4b2391 Mon Sep 17 00:00:00 2001
From: Argo-Lenovo <Argo@163.com>
Date: Tue, 1 Nov 2016 13:58:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E5=88=A4=E6=96=AD=20Home/Logout=20=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E5=8C=BF=E5=90=8D=E8=AE=BF=E9=97=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../App_Start/BAAuthorizeAttribute.cs         | 38 ++++++++++++++++++-
 Bootstrap.Admin/Controllers/HomeController.cs |  2 +
 Bootstrap.DataAccess/User.cs                  | 10 +----
 3 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/Bootstrap.Admin/App_Start/BAAuthorizeAttribute.cs b/Bootstrap.Admin/App_Start/BAAuthorizeAttribute.cs
index 094db468..0ca72d1a 100644
--- a/Bootstrap.Admin/App_Start/BAAuthorizeAttribute.cs
+++ b/Bootstrap.Admin/App_Start/BAAuthorizeAttribute.cs
@@ -1,5 +1,7 @@
-using Longbow.Web.Mvc;
+using Longbow.Security.Principal;
+using Longbow.Web.Mvc;
 using System;
+using System.Web.Mvc;
 
 namespace Bootstrap.Admin
 {
@@ -9,6 +11,40 @@ namespace Bootstrap.Admin
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = true)]
     class BAAuthorizeAttribute : LgbAuthorizeAttribute
     {
+        public override void OnAuthorization(AuthorizationContext filterContext)
+        {
+            if (filterContext.HttpContext.User.Identity.IsAuthenticated)
+            {
+                var roles = "Administrators;Users".Split(';'); //RoleHelper.RetrieveRolesByUserName();
+                filterContext.HttpContext.User = new LgbPrincipal(filterContext.HttpContext.User.Identity, roles);
+            }
+            base.OnAuthorization(filterContext);
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="userName"></param>
+        /// <returns></returns>
+        protected override bool AuthenticateRole(string userName)
+        {
+            Roles = "Administrators;SupperAdmin"; //RoleHelper.RetrieveRolesByUrl();
+            return base.AuthenticateRole(userName);
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="filterContext"></param>
+        protected override void HandleUnauthorizedRequest(System.Web.Mvc.AuthorizationContext filterContext)
+        {
+            if (!filterContext.HttpContext.User.Identity.IsAuthenticated)
+            {
+                base.HandleUnauthorizedRequest(filterContext);
+                return;
+            }
 
+            var view = new ViewResult();
+            view.ViewName = "UnAuthorized";
+            filterContext.Result = view;
+        }
     }
 }
\ No newline at end of file
diff --git a/Bootstrap.Admin/Controllers/HomeController.cs b/Bootstrap.Admin/Controllers/HomeController.cs
index db1e6cc8..555f0a83 100644
--- a/Bootstrap.Admin/Controllers/HomeController.cs
+++ b/Bootstrap.Admin/Controllers/HomeController.cs
@@ -36,6 +36,7 @@ namespace Bootstrap.Admin.Controllers
             model.UserName = userName;
             if (LgbPrincipal.IsAdmin(userName) || UserHelper.Authenticate(userName, password))
             {
+                LgbPrincipal.SavePrincipalCookie(new LgbUser() { RealUserName = userName });
                 FormsAuthentication.RedirectFromLoginPage(userName, false);
             }
             return View(model);
@@ -44,6 +45,7 @@ namespace Bootstrap.Admin.Controllers
         /// 
         /// </summary>
         /// <returns></returns>
+        [AllowAnonymous]
         public ActionResult Logout()
         {
             FormsAuthentication.SignOut();
diff --git a/Bootstrap.DataAccess/User.cs b/Bootstrap.DataAccess/User.cs
index 1dc44c5b..a754d025 100644
--- a/Bootstrap.DataAccess/User.cs
+++ b/Bootstrap.DataAccess/User.cs
@@ -3,17 +3,13 @@
     /// <summary>
     /// 用户表实体类
     /// </summary>
-    public class User
+    public class User : Longbow.Security.Principal.LgbUser
     {
         /// <summary>
         /// 获得/设置 用户主键ID
         /// </summary>
         public int ID { get; set; }
         /// <summary>
-        /// 获得/设置 登陆账号
-        /// </summary>
-        public string UserName { get; set; }
-        /// <summary>
         /// 获取/设置 密码
         /// </summary>
         public string Password { get; set; }
@@ -22,10 +18,6 @@
         /// </summary>
         public string PassSalt { get; set; }
         /// <summary>
-        /// 获取/设置 显示名称
-        /// </summary>
-        public string DisplayName { get; set; }
-        /// <summary>
         /// 获取/设置 角色用户关联状态 checked 标示已经关联 '' 标示未关联
         /// </summary>
         public string Checked { get; set; }