修改部分文件结构,完善第三方登陆功能

Infrastructure/Infrastructure.csproj

@@ -84,6 +84,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Response.cs" />
     <Compile Include="SessionHelper.cs" />
+    <Compile Include="StringExtensions.cs" />
     <Compile Include="UriUtil.cs" />
   </ItemGroup>
   <ItemGroup>

Infrastructure/StringExtensions.cs

@@ -1,7 +1,7 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace OpenAuth.WebApi.Areas.SSO.Models
+namespace Infrastructure
 {
     public static class StringExtensions
     {

OpenAuth.App/LoginApp.cs

@@ -1,9 +1,7 @@
-using System;
-using System.Linq;
+using System.Linq;
 using System.Web;
 using Infrastructure;
 using OpenAuth.App.ViewModel;
-using System.Web.Security;
 using OpenAuth.App.SSO;
 using OpenAuth.Domain.Service;
 

OpenAuth.App/OpenAuth.App.csproj

@@ -79,11 +79,17 @@
     <Compile Include="ResourceManagerApp.cs" />
     <Compile Include="RevelanceManagerApp.cs" />
     <Compile Include="RoleManagerApp.cs" />
+    <Compile Include="SSO\AppInfo.cs" />
+    <Compile Include="SSO\AppInfoService.cs" />
     <Compile Include="SSO\AuthUtil.cs" />
+    <Compile Include="SSO\PassportLoginRequest.cs" />
+    <Compile Include="SSO\ServiceContext.cs" />
+    <Compile Include="SSO\SSOAuthUtil.cs" />
     <Compile Include="SSO\SSOController.cs" />
     <Compile Include="SSO\LoginResult.cs" />
     <Compile Include="SSO\SSOAuthAttribute.cs" />
     <Compile Include="SSO\UserAuthSession.cs" />
+    <Compile Include="SSO\UserAuthSessionService.cs" />
     <Compile Include="StockManagerApp.cs" />
     <Compile Include="UserManagerApp.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

OpenAuth.App/SSO/AppInfo.cs

@@ -11,7 +11,7 @@
 
 using System;
 
-namespace OpenAuth.WebApi.Areas.SSO.Models
+namespace OpenAuth.App.SSO
 {
     /// <summary>
     /// 应用程序信息

OpenAuth.App/SSO/AppInfoService.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Linq;
+
+namespace OpenAuth.App.SSO
+{
+    public class AppInfoService : ServiceContext
+    {
+        public AppInfo Get(string appKey)
+        {
+            //可以从数据库读取
+            return _applist.SingleOrDefault(u => u.AppKey == appKey);
+        }
+
+        private AppInfo[] _applist = new[]
+        {
+            new AppInfo
+            {
+                AppKey = "openauth",
+                Icon = "/Areas/SSO/Content/images/logo.png",
+                IsEnable = true,
+                Remark = "基于DDDLite的权限管理系统",
+                ReturnUrl = "http://localhost:56813",
+                Title = "OpenAuth.Net",
+                CreateTime = DateTime.Now,
+            },
+            new AppInfo
+            {
+                AppKey = "openauthtest",
+                Icon = "/Areas/SSO/Content/images/logo.png",
+                IsEnable = true,
+                Remark = "这只是个模拟的测试站点",
+                ReturnUrl = "http://localhost:53050",
+                Title = "OpenAuth.Net测试站点",
+                CreateTime = DateTime.Now,
+            }
+        };
+    }
+}

OpenAuth.App/SSO/AuthUtil.cs

@@ -18,6 +18,15 @@ using OpenAuth.App.ViewModel;
 
 namespace OpenAuth.App.SSO
 {
+    /// <summary>
+    /// 第三方网站登录验证类
+    /// <para>登录时：</para>
+    /// <code>
+    ///  var result = AuthUtil.Login(AppKey, username, password);
+    ///  if (result.Success)
+    ///       return Redirect("/home/index?Token=" + result.Token);
+    /// </code>
+    /// </summary>
     public class AuthUtil
     {
         static HttpHelper _helper = new HttpHelper(ConfigurationManager.AppSettings["SSOPassport"]);
@@ -25,23 +34,23 @@ namespace OpenAuth.App.SSO
         private static string GetToken()
         {
             string token = HttpContext.Current.Request.QueryString["Token"];
-            if (!string.IsNullOrEmpty(token)) return token;
+            if (!String.IsNullOrEmpty(token)) return token;
 
             var cookie = HttpContext.Current.Request.Cookies["Token"];
-            return cookie == null ? string.Empty : cookie.Value;
+            return cookie == null ? String.Empty : cookie.Value;
         }
 
         public static bool CheckLogin(string token, string remark = "")
         {
-            if (string.IsNullOrEmpty(token) || string.IsNullOrEmpty(GetToken()))
+            if (String.IsNullOrEmpty(token) || String.IsNullOrEmpty(GetToken()))
                 return false;
 
-            var requestUri = string.Format("/SSO/Check/GetStatus?token={0}&requestid={1}", token, remark);
+            var requestUri = String.Format("/SSO/Check/GetStatus?token={0}&requestid={1}", token, remark);
 
             try
             {
                 var value = _helper.Get(null, requestUri);
-                return bool.Parse(value);
+                return Boolean.Parse(value);
             }
             catch (Exception ex)
             {
@@ -49,15 +58,26 @@ namespace OpenAuth.App.SSO
             }
         }
 
+        /// <summary>
+        /// 检查用户登录状态
+        /// <para>通过URL中的Token参数或Cookie中的Token</para>
+        /// </summary>
+        /// <param name="remark">备注信息</param>
         public static bool CheckLogin(string remark="")
         {
             return CheckLogin(GetToken(), remark);
         }
 
+        /// <summary>
+        /// 获取当前登录的用户信息
+        /// <para>通过URL中的Token参数或Cookie中的Token</para>
+        /// </summary>
+        /// <param name="remark">The remark.</param>
+        /// <returns>LoginUserVM.</returns>
         public static LoginUserVM GetCurrentUser(string remark = "")
         {
 
-            var requestUri = string.Format("/SSO/Check/GetUser?token={0}&requestid={1}", GetToken(), remark);
+            var requestUri = String.Format("/SSO/Check/GetUser?token={0}&requestid={1}", GetToken(), remark);
 
             try
             {
@@ -79,7 +99,7 @@ namespace OpenAuth.App.SSO
         /// <returns>System.String.</returns>
         public static LoginResult Login(string appKey, string username, string pwd)
         {
-            var requestUri = "/SSO/Login/Check";
+            var requestUri = "/SSO/Check/Login";
 
             try
             {
@@ -106,9 +126,9 @@ namespace OpenAuth.App.SSO
         public static bool Logout()
         {
             var token = GetToken();
-            if (string.IsNullOrEmpty(token)) return true;
+            if (String.IsNullOrEmpty(token)) return true;
 
-            var requestUri = string.Format("/SSO/Login/Logout?token={0}&requestid={1}", token, "");
+            var requestUri = String.Format("/SSO/Login/Logout?token={0}&requestid={1}", token, "");
 
             try
             {

OpenAuth.App/SSO/PassportLoginRequest.cs

@@ -1,26 +1,19 @@
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-
-namespace OpenAuth.WebApi.Areas.SSO.Models
+namespace OpenAuth.App.SSO
 {
 
     public class PassportLoginRequest
     {
-        [DisplayName("邮箱地址")]
         public string UserName { get; set; }
 
-        [Required]
-        [DisplayName("登录密码")]
         public string Password { get; set; }
 
-        [Display(Name = "应用标识")]
         public string AppKey { get; set; }
 
         public void Trim()
         {
             UserName = UserName.Trim();
             Password = Password.Trim();
-            AppKey = AppKey.Trim();
+            if(!string.IsNullOrEmpty(AppKey)) AppKey = AppKey.Trim();
         }
     }
 }

OpenAuth.App/SSO/SSOAuthUtil.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Web;
+using System.Web.Mvc;
+using Infrastructure;
+
+namespace OpenAuth.App.SSO
+{
+    public class SSOAuthUtil
+    {
+        public static  LoginResult Parse(PassportLoginRequest model)
+        {
+            model.Trim();
+
+            var result = new LoginResult();
+
+            try
+            {
+                //获取应用信息
+                var appInfo = new AppInfoService().Get(model.AppKey);
+                if (appInfo == null)
+                {
+                    throw  new Exception("应用不存在");
+                }
+                //获取用户信息
+                var usermanager = (UserManagerApp) DependencyResolver.Current.GetService(typeof (UserManagerApp));
+                var userInfo = usermanager.Get(model.UserName);
+                if (userInfo == null)
+                {
+                    throw new Exception("用户不存在");
+                }
+                if (userInfo.Password != model.Password)
+                {
+                    throw new Exception("密码错误");
+                }
+
+                var currentSession = new UserAuthSession
+                {
+                    UserName = model.UserName,
+                    Token = Guid.NewGuid().ToString().ToMd5(),
+                    InvalidTime = DateTime.Now.AddMinutes(10),
+                    AppKey = model.AppKey,
+                    CreateTime = DateTime.Now,
+                    IpAddress = HttpContext.Current.Request.UserHostAddress
+                };
+
+                //创建Session
+                new UserAuthSessionService().Create(currentSession);
+
+                result.Success = true;
+                result.ReturnUrl = appInfo.ReturnUrl;
+                result.Token = currentSession.Token;
+            }
+            catch (Exception ex)
+            {
+                result.Success = false;
+                result.ErrorMsg = ex.Message;
+            }
+
+            return result;
+        }
+    }
+}

OpenAuth.App/SSO/ServiceContext.cs

@@ -2,7 +2,7 @@
 using System.Globalization;
 using Infrastructure.Cache;
 
-namespace OpenAuth.WebApi.Areas.SSO.Models
+namespace OpenAuth.App.SSO
 {
     public abstract class ServiceContext : IDisposable
     {

OpenAuth.App/SSO/UserAuthSession.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace OpenAuth.WebApi.Areas.SSO.Models
+namespace OpenAuth.App.SSO
 {
     [Serializable]
     public class UserAuthSession

OpenAuth.App/SSO/UserAuthSessionService.cs

@@ -1,8 +1,24 @@
-using System;
+// ***********************************************************************
+// Assembly         : OpenAuth.WebApi
+// Author           : yubaolee
+// Created          : 07-11-2016
+//
+// Last Modified By : yubaolee
+// Last Modified On : 07-11-2016
+// Contact : 
+// File: UserAuthSessionService.cs
+// ***********************************************************************
+
+using System;
 using Infrastructure.Cache;
 
-namespace OpenAuth.WebApi.Areas.SSO.Models.Services
+namespace OpenAuth.App.SSO
 {
+    /// <summary>
+    /// 用户登录状态存储服务
+    /// <para>测试环境用的是基于http application的SessionContext</para>
+    /// <para>正式环境可以使用基于memcached的EnyimMemcachedContext</para>
+    /// </summary>
     public class UserAuthSessionService : ServiceContext
     {
         public UserAuthSessionService()

OpenAuth.Mvc/Controllers/LoginController.cs

@@ -7,7 +7,7 @@ namespace OpenAuth.Mvc.Controllers
 {
     public class LoginController : Controller
     {
-        private const string AppKey = "670b14728ad9902aecba32e22fa4f6bd";
+        private const string AppKey = "openauth";
 
         // GET: Login
         public ActionResult Index()

OpenAuth.Mvc/Views/Login/Index.cshtml

@@ -237,7 +237,8 @@
         </div>
         <div class="bottom">
             可以用admin(密码:admin) /test(密码:test) 查看不同账号登陆情况<br>
-            Copyright &copy; 2015 <a href="/Login/LoginByDev">基于经典DDD的权限管理 - 点击以开发者账号登录</a>
+            Copyright &copy; 2015 <a href="/Login/LoginByDev">基于经典DDD的权限管理 - 点击以开发者账号登录</a><br/>
+            <a href="http://localhost:52789/SSO/Login?appkey=openauth">或者使用OpenAuth.net第三方登陆功能</a>
         </div>
     </div>
 </body>

OpenAuth.Mvc/Web.config

@@ -67,9 +67,7 @@
     <!--<add key="SSOPassport" value="http://sso.com"/>-->
     <add key="SSOPassport" value="http://localhost:52789" />
     <!--AppKey唯一标识-->
-    <add key="SSOAppKey" value="670b14728ad9902aecba32e22fa4f6bd" />
-    <!--AppSecret安全私钥(未启用)-->
-    <add key="SSOAppSecret" value="670b14728ad9902aecba32e22fa4f6bd" />
+    <add key="SSOAppKey" value="openauth" />
     
   </appSettings>
   <system.web>

OpenAuth.WebApi/App_Start/BundleConfig.cs

@@ -1,28 +0,0 @@
-using System.Web;
-using System.Web.Optimization;
-
-namespace OpenAuth.WebApi
-{
-    public class BundleConfig
-    {
-        // 有关绑定的详细信息，请访问 http://go.microsoft.com/fwlink/?LinkId=301862
-        public static void RegisterBundles(BundleCollection bundles)
-        {
-            bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
-                        "~/Scripts/jquery-{version}.js"));
-
-            // 使用要用于开发和学习的 Modernizr 的开发版本。然后，当你做好
-            // 生产准备时，请使用 http://modernizr.com 上的生成工具来仅选择所需的测试。
-            bundles.Add(new ScriptBundle("~/bundles/modernizr").Include(
-                        "~/Scripts/modernizr-*"));
-
-            bundles.Add(new ScriptBundle("~/bundles/bootstrap").Include(
-                      "~/Scripts/bootstrap.js",
-                      "~/Scripts/respond.js"));
-
-            bundles.Add(new StyleBundle("~/Content/css").Include(
-                      "~/Content/bootstrap.css",
-                      "~/Content/site.css"));
-        }
-    }
-}

OpenAuth.WebApi/Areas/SSO/Controllers/CheckController.cs

@@ -1,11 +1,26 @@
-using System.Web.Http;
+// ***********************************************************************
+// Assembly         : OpenAuth.WebApi
+// Author           : yubaolee
+// Created          : 07-11-2016
+//
+// Last Modified By : yubaolee
+// Last Modified On : 07-11-2016
+// Contact : 
+// File: CheckController.cs
+// ***********************************************************************
+
 using System.Web.Mvc;
 using Infrastructure;
 using OpenAuth.App;
-using OpenAuth.WebApi.Areas.SSO.Models.Services;
+using OpenAuth.App.SSO;
 
 namespace OpenAuth.WebApi.Areas.SSO.Controllers
 {
+    /// <summary>
+    ///  sso验证
+    /// <para>其他站点通过后台Post来认证</para>
+    /// <para>或使用静态类OpenAuth.App.SSO.AuthUtil访问</para>
+    /// </summary>
     public class CheckController : Controller
     {
         private LoginApp _app;
@@ -34,5 +49,11 @@ namespace OpenAuth.WebApi.Areas.SSO.Controllers
 
             return string.Empty;
         }
+
+        [HttpPost]
+        public string Login(PassportLoginRequest request)
+        {
+            return JsonHelper.Instance.Serialize(SSOAuthUtil.Parse(request));
+        }
     }
 }

OpenAuth.WebApi/Areas/SSO/Controllers/LoginController.cs

@@ -1,25 +1,26 @@
 using System;
 using System.Web.Mvc;
-using Newtonsoft.Json;
-using OpenAuth.App;
 using OpenAuth.App.SSO;
-using OpenAuth.WebApi.Areas.SSO.Models;
-using OpenAuth.WebApi.Areas.SSO.Models.Services;
 
 namespace OpenAuth.WebApi.Areas.SSO.Controllers
 {
+
     /// <summary>
-    ///  公钥：AppKey
-    ///  私钥：AppSecret
-    ///  会话：Token
+    ///  SSO自带的登录处理
+    /// <para>第三方网站如果自己不开发登录界面，可直接跳转到本界面进行登录</para>
     /// </summary>
     public class LoginController : Controller
     {
-        private readonly AppInfoService _appInfoService = new AppInfoService();
-        private  UserManagerApp _useraApp = AutofacExt.GetFromFac<UserManagerApp>();
+        private AppInfoService _appInfoService;
+
+        public LoginController()
+        {
+            _appInfoService = new AppInfoService();
+        }
+
         private const string AppInfo = "AppInfo";
 
-        //默认登录界面
+        //加载登录界面
         public ActionResult Index(string appKey = "", string username = "")
         {
             TempData[AppInfo] = _appInfoService.Get(appKey);
@@ -37,7 +38,7 @@ namespace OpenAuth.WebApi.Areas.SSO.Controllers
         [HttpPost]
         public ActionResult Index(PassportLoginRequest model)
         {
-            var result = Parse(model);
+            var result = SSOAuthUtil.Parse(model);
 
             if (result.Success)
             {
@@ -47,14 +48,11 @@ namespace OpenAuth.WebApi.Areas.SSO.Controllers
                 return Redirect(redirectUrl);
             }
 
+            TempData[AppInfo] = _appInfoService.Get(model.AppKey);
             return View(model);
         }
 
-        [HttpPost]
-        public string Check(PassportLoginRequest request)
-        {
-            return JsonConvert.SerializeObject(Parse(request));
-        }
+
 
         [HttpPost]
         public bool Logout(string token, string requestid)
@@ -69,59 +67,5 @@ namespace OpenAuth.WebApi.Areas.SSO.Controllers
                 return false;
             }
         }
-
-        private LoginResult Parse(PassportLoginRequest model)
-        {
-            //过滤字段无效字符
-            model.Trim();
-
-            var result = new LoginResult();
-
-            try
-            {
-                //获取应用信息
-                var appInfo = _appInfoService.Get(model.AppKey);
-                if (appInfo == null)
-                {
-                    throw  new Exception("应用不存在");
-                }
-                TempData[AppInfo] = appInfo;
-
-                //获取用户信息
-                var userInfo = _useraApp.Get(model.UserName);
-                if (userInfo == null)
-                {
-                    throw new Exception("用户不存在");
-                }
-                if (userInfo.Password != model.Password)
-                {
-                    throw new Exception("密码错误");
-                }
-
-                var currentSession = new UserAuthSession
-                {
-                    UserName = model.UserName,
-                    Token = Guid.NewGuid().ToString().ToMd5(),
-                    InvalidTime = DateTime.Now.AddMinutes(10),
-                    AppKey = model.AppKey,
-                    CreateTime = DateTime.Now,
-                    IpAddress = Request.UserHostAddress
-                };
-
-                //创建Session
-                new UserAuthSessionService().Create(currentSession);
-
-                result.Success = true;
-                result.ReturnUrl = appInfo.ReturnUrl;
-                result.Token = currentSession.Token;
-            }
-            catch (Exception ex)
-            {
-                result.Success = false;
-                result.ErrorMsg = ex.Message;
-            }
-
-            return result;
-        }
     }
 }

OpenAuth.WebApi/Areas/SSO/Models/Services/AppInfoService.cs

@@ -1,23 +0,0 @@
-using System;
-
-namespace OpenAuth.WebApi.Areas.SSO.Models.Services
-{
-    public class AppInfoService : ServiceContext
-    {
-        public AppInfo Get(string appKey)
-        {
-            //可以从数据库读取
-            return new AppInfo
-            {
-                AppKey = "670b14728ad9902aecba32e22fa4f6bd",
-                AppSecret = "670b14728ad9902aecba32e22fa4f6bd",
-                Icon = "/Content/img/default-app.png",
-                IsEnable = true,
-                Remark = "OpenAuth.net",
-                ReturnUrl = "http://localhost:53050",
-                Title = "OpenAuth.Net",
-                CreateTime = DateTime.Now,
-            };
-        }
-    }
-}

OpenAuth.WebApi/Areas/SSO/Views/Login/Index.cshtml

@@ -1,58 +1,67 @@
-@using OpenAuth.WebApi.Areas.SSO.Models
-@model PassportLoginRequest
+@using OpenAuth.App.SSO
+@model  PassportLoginRequest
 @{
-    ViewBag.Title = "用户授权应用登录";
-
     var appinfo = TempData["AppInfo"] as AppInfo;
 }
 
-<div class="row">
+<head>
+    <link href="/Areas/SSO/Content/bootstrap.min.css" rel="stylesheet">
+    <link href="/Areas/SSO/Content/Site.css" rel="stylesheet">
+    <style id="igtranslator-color" type="text/css"></style>
+    <title>OpenAuth.net统一登陆授权中心</title>
+</head>
+<html>
+<body>
+    <div class="row">
 
-    @using (Html.BeginForm("Index", "Login", FormMethod.Post, new { @class = "form-horizontal", style = "max-width: 390px; padding-top:50px;  margin: 0 auto;" }))
-    {
-        if (appinfo != null)
+        @using (Html.BeginForm("Index", "Login", FormMethod.Post, new { @class = "form-horizontal", style = "max-width: 390px; padding-top:50px;  margin: 0 auto;" }))
         {
-            <div class="form-group">
-                <div class="col-md-11 col-md-offset-1">
-                    <div style="text-align: center;">
-                        <img src="@appinfo.Icon" style="width: 128px; height: 128px;" title="@appinfo.Title">
-                        <div class="caption">
-                            <h3>@appinfo.Title</h3>
-                            <p style="text-align: left;">
-                                <small>@appinfo.Remark</small>
-                            </p>
+            if (appinfo != null)
+            {
+                <div class="form-group">
+                    <div class="col-md-11 col-md-offset-1">
+                        <div style="text-align: center;">
+                            <img src="@appinfo.Icon" style="width: 128px; height: 128px;" title="@appinfo.Title">
+                            <div class="caption">
+                                <h3>@appinfo.Title</h3>
+                                <p style="text-align: left;">
+                                    <small>@appinfo.Remark</small>
+                                </p>
+                            </div>
                         </div>
                     </div>
                 </div>
+            }
+
+            <div class="form-group">
+                <label class="col-md-3 control-label" for="UserName">用户名</label>
+                <div class="col-md-9">
+                    @Html.TextBoxFor(model => model.UserName, new { @class = "form-control input-lg", style = "width: 280px" })
+                    @Html.HiddenFor(model => model.AppKey)
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label class="col-md-3 control-label" for="Password">密码</label>
+                <div class="col-md-9">
+                    @Html.PasswordFor(model => model.Password, new { @class = "form-control input-lg", style = "width: 280px" })
+                </div>
+            </div>
+
+            <div class="form-group">
+                <div class="col-md-9 col-md-offset-3">
+                    @Html.ValidationSummary(false)
+                </div>
+            </div>
+
+            <div class="form-group">
+                <div class="col-md-9 col-md-offset-3 ">
+                    <button type="submit" class="btn btn-primary">登录</button>
+                </div>
             </div>
         }
-        
-        <div class="form-group">
-            @Html.LabelFor(model => model.UserName, new { @class = "col-md-3 control-label" })
-            <div class="col-md-9">
-                @Html.TextBoxFor(model => model.UserName, new { @class = "form-control input-lg", style = "width: 280px", placeholder = "登录邮箱" })
-                @Html.HiddenFor(model => model.AppKey)
-            </div>
-        </div>
 
-        <div class="form-group">
-            @Html.LabelFor(model => model.Password, new { @class = "col-md-3 control-label" })
-            <div class="col-md-9">
-                @Html.PasswordFor(model => model.Password, new { @class = "form-control input-lg", style = "width: 280px", placeholder = "登录密码" })
-            </div>
-        </div>
+    </div>
+</body>
+</html>
 
-        <div class="form-group">
-            <div class="col-md-9 col-md-offset-3">
-                @Html.ValidationSummary(false)
-            </div>
-        </div>
-
-        <div class="form-group">
-            <div class="col-md-9 col-md-offset-3 ">
-                <button type="submit" class="btn btn-primary">登录</button>
-            </div>
-        </div>
-    }
-
-</div>

OpenAuth.WebApi/Global.asax.cs

@@ -19,7 +19,6 @@ namespace OpenAuth.WebApi
             GlobalConfiguration.Configure(WebApiConfig.Register);
             FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
             RouteConfig.RegisterRoutes(RouteTable.Routes);
-            BundleConfig.RegisterBundles(BundleTable.Bundles);
         }
     }
 }

OpenAuth.WebApi/OpenAuth.WebApi.csproj

@@ -143,20 +143,14 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
+    <Folder Include="Areas\SSO\Models\Services\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="App_Start\BundleConfig.cs" />
     <Compile Include="App_Start\FilterConfig.cs" />
     <Compile Include="App_Start\RouteConfig.cs" />
     <Compile Include="App_Start\WebApiConfig.cs" />
     <Compile Include="Areas\SSO\Controllers\LoginController.cs" />
     <Compile Include="Areas\SSO\Controllers\CheckController.cs" />
-    <Compile Include="Areas\SSO\Models\AppInfo.cs" />
-    <Compile Include="Areas\SSO\Models\PassportLoginRequest.cs" />
-    <Compile Include="Areas\SSO\Models\ServiceContext.cs" />
-    <Compile Include="Areas\SSO\Models\Services\AppInfoService.cs" />
-    <Compile Include="Areas\SSO\Models\Services\UserAuthSessionService.cs" />
-    <Compile Include="Areas\SSO\Models\StringExtensions.cs" />
     <Compile Include="Areas\SSO\SSOAreaRegistration.cs" />
     <Compile Include="AutofacExt.cs" />
     <Compile Include="Global.asax.cs">
@@ -165,21 +159,20 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Content\bootstrap.css" />
-    <Content Include="Content\bootstrap.min.css" />
+    <Content Include="Areas\SSO\Content\bootstrap.min.css" />
+    <Content Include="Areas\SSO\Content\images\logo.png" />
     <Content Include="favicon.ico" />
-    <Content Include="fonts\glyphicons-halflings-regular.svg" />
     <Content Include="Global.asax" />
-    <Content Include="Scripts\bootstrap.js" />
-    <Content Include="Scripts\bootstrap.min.js" />
+    <Content Include="Areas\SSO\Scripts\bootstrap.js" />
+    <Content Include="Areas\SSO\Scripts\bootstrap.min.js" />
     <Content Include="Areas\SSO\Views\web.config" />
     <Content Include="Areas\SSO\Views\Login\Index.cshtml" />
-    <None Include="Scripts\jquery-1.10.2.intellisense.js" />
-    <Content Include="Scripts\jquery-1.10.2.js" />
-    <Content Include="Scripts\jquery-1.10.2.min.js" />
-    <Content Include="Scripts\modernizr-2.6.2.js" />
-    <Content Include="Scripts\respond.js" />
-    <Content Include="Scripts\respond.min.js" />
+    <None Include="Areas\SSO\Scripts\jquery-1.10.2.intellisense.js" />
+    <Content Include="Areas\SSO\Scripts\jquery-1.10.2.js" />
+    <Content Include="Areas\SSO\Scripts\jquery-1.10.2.min.js" />
+    <Content Include="Areas\SSO\Scripts\modernizr-2.6.2.js" />
+    <Content Include="Areas\SSO\Scripts\respond.js" />
+    <Content Include="Areas\SSO\Scripts\respond.min.js" />
     <Content Include="Web.config" />
     <Content Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
@@ -187,8 +180,8 @@
     <Content Include="Web.Release.config">
       <DependentUpon>Web.config</DependentUpon>
     </Content>
-    <Content Include="Content\Site.css" />
-    <Content Include="Scripts\_references.js" />
+    <Content Include="Areas\SSO\Content\Site.css" />
+    <Content Include="Areas\SSO\Scripts\_references.js" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Infrastructure\Infrastructure.csproj">
@@ -209,11 +202,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="fonts\glyphicons-halflings-regular.woff" />
-    <Content Include="fonts\glyphicons-halflings-regular.ttf" />
-    <Content Include="fonts\glyphicons-halflings-regular.eot" />
     <Content Include="packages.config" />
-    <Content Include="Scripts\jquery-1.10.2.min.map" />
+    <Content Include="Areas\SSO\Scripts\jquery-1.10.2.min.map" />
   </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

OpenAuth.WebTest/Controllers/LoginController.cs

@@ -14,7 +14,7 @@ namespace OpenAuth.WebTest.Controllers
         [HttpPost]
         public ActionResult Index(string username, string password)
         {
-            var result = AuthUtil.Login("670b14728ad9902aecba32e22fa4f6bd", username, password);
+            var result = AuthUtil.Login("openauth", username, password);
             if (result.Success)
                 return Redirect("/home/index?Token=" + result.Token);
             else

OpenAuth.WebTest/Views/Login/Index.cshtml

@@ -5,12 +5,16 @@
 }
 
 <h2>OpenAuth.net测试站点登陆</h2>
-<div class="col-lg-12">
-    @if (Model != null && !Model.Success)
-    {
-        <span class="alert alert-danger">@Model.ErrorMsg</span>
-    }
-</div>
+
+
+@if (Model != null && !Model.Success)
+{
+    <div class="alert alert-danger">
+        <a href="#" class="close" data-dismiss="alert">&times;</a>
+        <strong>Warning!</strong>  @Model.ErrorMsg
+    </div>
+}
+
 <div class="col-lg-12">
     <form class="form-horizontal" method="POST">
         <div class="control-group">
@@ -31,6 +35,7 @@
                     <input type="checkbox"> Remember me
                 </label>
                 <button type="submit" class="btn btn-primary">登陆</button>
+                <a href="http://localhost:52789/SSO/Login?appkey=openauthtest">或者使用OpenAuth.net第三方登陆功能</a>
             </div>
         </div>
     </form>

OpenAuth.WebTest/Web.config

@@ -13,9 +13,7 @@
     <!--SSO单点登录主域-->
     <add key="SSOPassport" value="http://localhost:52789" />
     <!--AppKey唯一标识-->
-    <add key="SSOAppKey" value="670b14728ad9902aecba32e22fa4f6bd" />
-    <!--AppSecret安全私钥(未启用)-->
-    <add key="SSOAppSecret" value="670b14728ad9902aecba32e22fa4f6bd" />
+    <add key="SSOAppKey" value="openauthtest" />
 
     <add key="OpenAuthURL" value="http://localhost:56813" />
   </appSettings>

packages/Respond.1.2.0/content/Scripts/respond.min.js

@@ -0,0 +1,6 @@
+/*! matchMedia() polyfill - Test a CSS media type/query in JS. Authors & copyright (c) 2012: Scott Jehl, Paul Irish, Nicholas Zakas. Dual MIT/BSD license */
+/*! NOTE: If you're already including a window.matchMedia polyfill via Modernizr or otherwise, you don't need this part */
+window.matchMedia=window.matchMedia||(function(e,f){var c,a=e.documentElement,b=a.firstElementChild||a.firstChild,d=e.createElement("body"),g=e.createElement("div");g.id="mq-test-1";g.style.cssText="position:absolute;top:-100em";d.style.background="none";d.appendChild(g);return function(h){g.innerHTML='&shy;<style media="'+h+'"> #mq-test-1 { width: 42px; }</style>';a.insertBefore(d,b);c=g.offsetWidth==42;a.removeChild(d);return{matches:c,media:h}}})(document);
+
+/*! Respond.js v1.2.0: min/max-width media query polyfill. (c) Scott Jehl. MIT/GPLv2 Lic. j.mp/respondjs  */
+(function(e){e.respond={};respond.update=function(){};respond.mediaQueriesSupported=e.matchMedia&&e.matchMedia("only all").matches;if(respond.mediaQueriesSupported){return}var w=e.document,s=w.documentElement,i=[],k=[],q=[],o={},h=30,f=w.getElementsByTagName("head")[0]||s,g=w.getElementsByTagName("base")[0],b=f.getElementsByTagName("link"),d=[],a=function(){var D=b,y=D.length,B=0,A,z,C,x;for(;B<y;B++){A=D[B],z=A.href,C=A.media,x=A.rel&&A.rel.toLowerCase()==="stylesheet";if(!!z&&x&&!o[z]){if(A.styleSheet&&A.styleSheet.rawCssText){m(A.styleSheet.rawCssText,z,C);o[z]=true}else{if((!/^([a-zA-Z:]*\/\/)/.test(z)&&!g)||z.replace(RegExp.$1,"").split("/")[0]===e.location.host){d.push({href:z,media:C})}}}}u()},u=function(){if(d.length){var x=d.shift();n(x.href,function(y){m(y,x.href,x.media);o[x.href]=true;u()})}},m=function(I,x,z){var G=I.match(/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi),J=G&&G.length||0,x=x.substring(0,x.lastIndexOf("/")),y=function(K){return K.replace(/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,"$1"+x+"$2$3")},A=!J&&z,D=0,C,E,F,B,H;if(x.length){x+="/"}if(A){J=1}for(;D<J;D++){C=0;if(A){E=z;k.push(y(I))}else{E=G[D].match(/@media *([^\{]+)\{([\S\s]+?)$/)&&RegExp.$1;k.push(RegExp.$2&&y(RegExp.$2))}B=E.split(",");H=B.length;for(;C<H;C++){F=B[C];i.push({media:F.split("(")[0].match(/(only\s+)?([a-zA-Z]+)\s?/)&&RegExp.$2||"all",rules:k.length-1,hasquery:F.indexOf("(")>-1,minw:F.match(/\(min\-width:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:F.match(/\(max\-width:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}}j()},l,r,v=function(){var z,A=w.createElement("div"),x=w.body,y=false;A.style.cssText="position:absolute;font-size:1em;width:1em";if(!x){x=y=w.createElement("body");x.style.background="none"}x.appendChild(A);s.insertBefore(x,s.firstChild);z=A.offsetWidth;if(y){s.removeChild(x)}else{x.removeChild(A)}z=p=parseFloat(z);return z},p,j=function(I){var x="clientWidth",B=s[x],H=w.compatMode==="CSS1Compat"&&B||w.body[x]||B,D={},G=b[b.length-1],z=(new Date()).getTime();if(I&&l&&z-l<h){clearTimeout(r);r=setTimeout(j,h);return}else{l=z}for(var E in i){var K=i[E],C=K.minw,J=K.maxw,A=C===null,L=J===null,y="em";if(!!C){C=parseFloat(C)*(C.indexOf(y)>-1?(p||v()):1)}if(!!J){J=parseFloat(J)*(J.indexOf(y)>-1?(p||v()):1)}if(!K.hasquery||(!A||!L)&&(A||H>=C)&&(L||H<=J)){if(!D[K.media]){D[K.media]=[]}D[K.media].push(k[K.rules])}}for(var E in q){if(q[E]&&q[E].parentNode===f){f.removeChild(q[E])}}for(var E in D){var M=w.createElement("style"),F=D[E].join("\n");M.type="text/css";M.media=E;f.insertBefore(M,G.nextSibling);if(M.styleSheet){M.styleSheet.cssText=F}else{M.appendChild(w.createTextNode(F))}q.push(M)}},n=function(x,z){var y=c();if(!y){return}y.open("GET",x,true);y.onreadystatechange=function(){if(y.readyState!=4||y.status!=200&&y.status!=304){return}z(y.responseText)};if(y.readyState==4){return}y.send(null)},c=(function(){var x=false;try{x=new XMLHttpRequest()}catch(y){x=new ActiveXObject("Microsoft.XMLHTTP")}return function(){return x}})();a();respond.update=a;function t(){j(true)}if(e.addEventListener){e.addEventListener("resize",t,false)}else{if(e.attachEvent){e.attachEvent("onresize",t)}}})(this);

packages/bootstrap.3.0.0/Content/Content/bootstrap.css

@@ -1,14 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. The notices and licenses below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
 /*!
  * Bootstrap v3.0.0
  *