updates for 1.2

aarasavilli · Feb 27, 2015 · 96db83a · 96db83a
1 parent ebaa12e
commit 96db83a
Show file tree

Hide file tree

Showing 28 changed files with 386 additions and 177 deletions.
diff --git a/source/AspNetIdentity/SelfHost/UserService-AspNetIdentity.csproj b/source/AspNetIdentity/SelfHost/UserService-AspNetIdentity.csproj
@@ -102,8 +102,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Thinktecture.IdentityModel.Core.1.3.0\lib\net45\Thinktecture.IdentityModel.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Thinktecture.IdentityServer3">
-      <HintPath>..\packages\Thinktecture.IdentityServer3.1.1.0-build00071\lib\net45\Thinktecture.IdentityServer3.dll</HintPath>
+    <Reference Include="Thinktecture.IdentityServer3, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Thinktecture.IdentityServer3.1.2.2-build00129\lib\net45\Thinktecture.IdentityServer3.dll</HintPath>
     </Reference>
     <Reference Include="Thinktecture.IdentityServer3.AspNetIdentity, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/source/AspNetIdentity/SelfHost/packages.config b/source/AspNetIdentity/SelfHost/packages.config
@@ -16,6 +16,6 @@
   <package id="Thinktecture.IdentityManager" version="1.0.0-pre-10013" targetFramework="net45" />
   <package id="Thinktecture.IdentityManager.AspNetIdentity" version="1.0.0-pre-10021" targetFramework="net45" />
   <package id="Thinktecture.IdentityModel.Core" version="1.3.0" targetFramework="net45" />
-  <package id="Thinktecture.IdentityServer3" version="1.1.0-build00071" targetFramework="net45" />
+  <package id="Thinktecture.IdentityServer3" version="1.2.2-build00129" targetFramework="net45" />
   <package id="Thinktecture.IdentityServer3.AspNetIdentity" version="1.0.1-build00005" targetFramework="net45" />
 </packages>
diff --git a/source/AspNetIdentity_2fa/WebHost/WebHost.csproj b/source/AspNetIdentity_2fa/WebHost/WebHost.csproj
@@ -86,8 +86,9 @@
     <Reference Include="Thinktecture.IdentityModel.Core">
       <HintPath>..\packages\Thinktecture.IdentityModel.Core.1.3.0\lib\net45\Thinktecture.IdentityModel.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Thinktecture.IdentityServer3">
-      <HintPath>..\packages\Thinktecture.IdentityServer3.1.1.0-build00071\lib\net45\Thinktecture.IdentityServer3.dll</HintPath>
+    <Reference Include="Thinktecture.IdentityServer3, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Thinktecture.IdentityServer3.1.2.2-build00129\lib\net45\Thinktecture.IdentityServer3.dll</HintPath>
     </Reference>
     <Reference Include="Thinktecture.IdentityServer3.AspNetIdentity, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/source/AspNetIdentity_2fa/WebHost/packages.config b/source/AspNetIdentity_2fa/WebHost/packages.config
@@ -16,6 +16,6 @@
   <package id="Thinktecture.IdentityManager" version="1.0.0-pre-10013" targetFramework="net45" />
   <package id="Thinktecture.IdentityManager.AspNetIdentity" version="1.0.0-pre-10021" targetFramework="net45" />
   <package id="Thinktecture.IdentityModel.Core" version="1.3.0" targetFramework="net45" />
-  <package id="Thinktecture.IdentityServer3" version="1.1.0-build00071" targetFramework="net45" />
+  <package id="Thinktecture.IdentityServer3" version="1.2.2-build00129" targetFramework="net45" />
   <package id="Thinktecture.IdentityServer3.AspNetIdentity" version="1.0.1-build00005" targetFramework="net45" />
 </packages>
diff --git a/source/CustomHrd/CustomHrd/CustomHrd.csproj b/source/CustomHrd/CustomHrd/CustomHrd.csproj
@@ -123,9 +123,9 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.EnterpriseServices" />
-    <Reference Include="Thinktecture.IdentityServer3, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Thinktecture.IdentityServer3, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Thinktecture.IdentityServer3.1.1.0-build00071\lib\net45\Thinktecture.IdentityServer3.dll</HintPath>
+      <HintPath>..\packages\Thinktecture.IdentityServer3.1.2.2-build00129\lib\net45\Thinktecture.IdentityServer3.dll</HintPath>
     </Reference>
     <Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/source/CustomHrd/CustomHrd/packages.config b/source/CustomHrd/CustomHrd/packages.config
@@ -19,6 +19,6 @@
   <package id="Modernizr" version="2.8.3" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />
-  <package id="Thinktecture.IdentityServer3" version="1.1.0-build00071" targetFramework="net45" />
+  <package id="Thinktecture.IdentityServer3" version="1.2.2-build00129" targetFramework="net45" />
   <package id="WebGrease" version="1.6.0" targetFramework="net45" />
 </packages>
diff --git a/source/CustomUserService/CustomUserService/CustomUserService.csproj b/source/CustomUserService/CustomUserService/CustomUserService.csproj
@@ -123,9 +123,9 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.EnterpriseServices" />
-    <Reference Include="Thinktecture.IdentityServer3, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Thinktecture.IdentityServer3, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Thinktecture.IdentityServer3.1.1.0-build00071\lib\net45\Thinktecture.IdentityServer3.dll</HintPath>
+      <HintPath>..\packages\Thinktecture.IdentityServer3.1.2.2-build00129\lib\net45\Thinktecture.IdentityServer3.dll</HintPath>
     </Reference>
     <Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/source/CustomUserService/CustomUserService/packages.config b/source/CustomUserService/CustomUserService/packages.config
@@ -19,6 +19,6 @@
   <package id="Modernizr" version="2.8.3" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />
-  <package id="Thinktecture.IdentityServer3" version="1.1.0-build00071" targetFramework="net45" />
+  <package id="Thinktecture.IdentityServer3" version="1.2.2-build00129" targetFramework="net45" />
   <package id="WebGrease" version="1.6.0" targetFramework="net45" />
 </packages>
diff --git a/source/CustomViewService/CustomViewService/Content/app/app.js b/source/CustomViewService/CustomViewService/Content/app/app.js
@@ -32,6 +32,14 @@
         var json = Encoder.htmlDecode(encodedJson);
         var model = JSON.parse(json);
         angular.module("app").constant("Model", model);
+        if (model.autoRedirect && model.redirectUrl) {
+            if (model.autoRedirectDelay < 0) {
+                model.autoRedirectDelay = 0;
+            }
+            window.setTimeout(function () {
+                window.location = model.redirectUrl;
+            }, model.autoRedirectDelay * 1000);
+        }
     })();
 
 })();
diff --git a/source/CustomViewService/CustomViewService/Content/app/consent.html b/source/CustomViewService/CustomViewService/Content/app/consent.html
@@ -23,103 +23,102 @@
         </ul>
     </div>
 
-    <div class="container">
-        <div class="page-header">
-            <h1>This is a custom view</h1>
+        <div class="container">
+            <div class="page-header">
+                <h1>This is a custom view</h1>
+            </div>
         </div>
-    </div>
 
-    <div class="container" ng-cloak>
-        <div>
-            <div class="row page-header">
-                <div class="col-sm-10">
-                    <h1>
-                        {{model.clientName}}
-                        <small>is requesting your permission</small>
-                    </h1>
-                </div>
+    <div class='container page-consent' ng-cloak>
+        <div class="row page-header">
+            <div class="col-sm-10">
+                <div class="client-logo" ng-show="model.clientLogoUrl"><img ng-src="{{model.clientLogoUrl}}"></div>
+                <h1>
+                    {{model.clientName}}
+                    <small>is requesting your permission</small>
+                </h1>
             </div>
+        </div>
 
-            <div class="row">
-                <div class="col-sm-8">
-                    <div ng-show="model.errorMessage" class="alert alert-danger">
-                        <strong>Error:</strong>
-                        {{model.errorMessage}}
-                    </div>
-                    <form name="form" method="post" action="{{model.consentUrl}}" class="consent-form">
-                        <anti-forgery-token token="model.antiForgery"></anti-forgery-token>
+        <div class="row">
+            <div class="col-sm-8">
+                <div ng-show="model.errorMessage" class="alert alert-danger">
+                    <strong>Error:</strong>
+                    {{model.errorMessage}}
+                </div>
+                <form name="form" method="post" action="{{model.consentUrl}}" class="consent-form">
+                    <anti-forgery-token token="model.antiForgery"></anti-forgery-token>
 
-                        <div>Uncheck the permissions you do not wish to grant.</div>
+                    <div>Uncheck the permissions you do not wish to grant.</div>
 
-                        <div class="panel panel-default consent-buttons" ng-show="model.identityScopes">
-                            <div class="panel-heading">
-                                <span class="glyphicon glyphicon-user"></span>
-                                Personal Information
-                            </div>
-                            <ul class="list-group">
-                                <li ng-repeat="scope in model.identityScopes" class="list-group-item">
-                                    <label>
-                                        <input class="consent-scopecheck" type="checkbox" name="scopes" id="scopes_{{scope.name}}" value="{{scope.name}}" ng-model="scope.selected" ng-disabled="scope.required" />
-                                        <strong>{{scope.displayName}}</strong>
-                                        <span ng-show="scope.emphasize" class="glyphicon glyphicon-exclamation-sign"></span>
-                                    </label>
-                                    <span ng-show="scope.required"><em>(required)</em></span>
-                                    <div class="consent-description" ng-show="scope.description">
-                                        <label for="scopes_{{scope.name}}">{{scope.description}}</label>
-                                    </div>
-                                </li>
-                            </ul>
+                    <div class="panel panel-default consent-buttons" ng-show="model.identityScopes">
+                        <div class="panel-heading">
+                            <span class="glyphicon glyphicon-user"></span>
+                            Personal Information
                         </div>
+                        <ul class="list-group">
+                            <li ng-repeat="scope in model.identityScopes" class="list-group-item">
+                                <label>
+                                    <input class="consent-scopecheck" type="checkbox" name="scopes" id="scopes_{{scope.name}}" value="{{scope.name}}" ng-model="scope.selected" ng-disabled="scope.required" />
+                                    <strong>{{scope.displayName}}</strong>
+                                    <span ng-show="scope.emphasize" class="glyphicon glyphicon-exclamation-sign"></span>
+                                </label>
+                                <span ng-show="scope.required"><em>(required)</em></span>
+                                <div class="consent-description" ng-show="scope.description">
+                                    <label for="scopes_{{scope.name}}">{{scope.description}}</label>
+                                </div>
+                            </li>
+                        </ul>
+                    </div>
 
-                        <div class="panel panel-default" ng-show="model.resourceScopes">
-                            <div class="panel-heading">
-                                <span class="glyphicon glyphicon-tasks"></span>
-                                Application Access
-                            </div>
-                            <ul class="list-group">
-                                <li ng-repeat="scope in model.resourceScopes" class="list-group-item">
-                                    <label>
-                                        <input class="consent-scopecheck" type="checkbox" name="scopes" value="{{scope.name}}" ng-model="scope.selected" ng-disabled="scope.required" />
-                                        <strong>{{scope.displayName}}</strong>
-                                        <span ng-show="scope.emphasize" class="glyphicon glyphicon-exclamation-sign"></span>
-                                    </label>
-                                    <span ng-show="scope.required"><em>(required)</em></span>
-                                    <div class="consent-description" ng-show="scope.description">
-                                        <span ng-show="scope.required"><em>(required)</em></span>
-                                        <label for="scopes_{{scope.name}}">{{scope.description}}</label>
-                                    </div>
-                                </li>
-                            </ul>
+                    <div class="panel panel-default" ng-show="model.resourceScopes">
+                        <div class="panel-heading">
+                            <span class="glyphicon glyphicon-tasks"></span>
+                            Application Access
                         </div>
+                        <ul class="list-group">
+                            <li ng-repeat="scope in model.resourceScopes" class="list-group-item">
+                                <label>
+                                    <input class="consent-scopecheck" type="checkbox" name="scopes" value="{{scope.name}}" ng-model="scope.selected" ng-disabled="scope.required" />
+                                    <strong>{{scope.displayName}}</strong>
+                                    <span ng-show="scope.emphasize" class="glyphicon glyphicon-exclamation-sign"></span>
+                                </label>
+                                <span ng-show="scope.required"><em>(required)</em></span>
+                                <div class="consent-description" ng-show="scope.description">
+                                    <span ng-show="scope.required"><em>(required)</em></span>
+                                    <label for="scopes_{{scope.name}}">{{scope.description}}</label>
+                                </div>
+                            </li>
+                        </ul>
+                    </div>
 
-                        <div class="consent-remember" ng-show="model.allowRememberConsent">
-                            <label>
-                                <input class="consent-scopecheck" type="checkbox" name="RememberConsent" value="true" ng-model="model.rememberConsent" />
-                                <strong>Remember My Decision</strong>
-                            </label>
-                        </div>
+                    <div class="consent-remember" ng-show="model.allowRememberConsent">
+                        <label>
+                            <input class="consent-scopecheck" type="checkbox" name="RememberConsent" value="true" ng-model="model.rememberConsent" />
+                            <strong>Remember My Decision</strong>
+                        </label>
+                    </div>
 
-                        <div class="consent-buttons">
-                            <button name="button" value="yes" class="btn btn-primary" autofocus>Yes, Allow</button>
-                            <button name="button" value="no" class="btn">No, Do Not Allow</button>
-                            <a class="pull-right btn btn-default" target="_blank" ng-show="model.clientUrl" ng-href="{{model.clientUrl}}">
-                                <span class="glyphicon glyphicon-info-sign"></span>
-                                <strong>{{model.clientName}}</strong>
-                            </a>
-                        </div>
-                    </form>
-                </div>
+                    <div class="consent-buttons">
+                        <button name="button" value="yes" class="btn btn-primary" autofocus>Yes, Allow</button>
+                        <button name="button" value="no" class="btn">No, Do Not Allow</button>
+                        <a class="pull-right btn btn-default" target="_blank" ng-show="model.clientUrl" ng-href="{{model.clientUrl}}">
+                            <span class="glyphicon glyphicon-info-sign"></span>
+                            <strong>{{model.clientName}}</strong>
+                        </a>
+                    </div>
+                </form>
             </div>
         </div>
     </div>
 
-    <script id='modelJson' type='application/json'>
-        {model}
-    </script>
-    <script src="/content/libs/jquery/jquery-1.11.0.min.js"></script>
-    <script src="/content/libs/bootstrap/js/bootstrap.min.js"></script>
-    <script src="/content/libs/angular/angular.1.2.13.min.js"></script>
-    <script src="/content/libs/encoder/encoder.min.js"></script>
-    <script src="/content/app/app.js"></script>
+        <script id='modelJson' type='application/json'>
+            {model}
+        </script>
+        <script src="/content/libs/jquery/jquery-1.11.0.min.js"></script>
+        <script src="/content/libs/bootstrap/js/bootstrap.min.js"></script>
+        <script src="/content/libs/angular/angular.1.2.13.min.js"></script>
+        <script src="/content/libs/encoder/encoder.min.js"></script>
+        <script src="/content/app/app.js"></script>
 </body>
 </html>
diff --git a/source/CustomViewService/CustomViewService/Content/app/error.html b/source/CustomViewService/CustomViewService/Content/app/error.html
@@ -29,20 +29,20 @@ <h1>This is a custom view</h1>
         </div>
     </div>
 
-    <div class="container" ng-cloak>
+    <div class='container page-error' ng-cloak>
         <div class="page-header">
             <h1>Error</h1>
         </div>
 
         <div class="row">
             <div class="col-md-6 col-sm-6">
                 <div class="alert alert-danger">
-                    <strong>Error:</strong>
-                    <span ng-show="model.errorMessage">{{model.errorMessage}}</span>
-                    <span ng-hide="model.errorMessage">There was an unexpected error</span>
+                    <div ng-show="model.errorMessage">{{model.errorMessage}}</div>
                 </div>
+                <div class="request-id">Request Id: <span ng-bind="model.requestId"></span></div>
             </div>
-        </div>    </div>
+        </div>
+    </div>
 
     <script id='modelJson' type='application/json'>
         {model}

diff --git a/source/CustomViewService/CustomViewService/Content/app/loggedOut.html b/source/CustomViewService/CustomViewService/Content/app/loggedOut.html
@@ -30,12 +30,16 @@ <h1>This is a custom view</h1>
     </div>
 
 
-    <div class="container" ng-cloak>
+    <div class='container page-loggedOut' ng-cloak>
         <div class="page-header">
             <h1>
                 Logout
                 <small>You are now logged out</small>
             </h1>
+            <div ng-show="model.redirectUrl">
+                Click <a ng-href="{{model.redirectUrl}}">here</a> to return to the
+                <span ng-bind="model.clientName"></span> application.
+            </div>
             <iframe class="signout" ng-repeat="url in model.iFrameUrls" ng-src="{{url}}"></iframe>
         </div>
     </div>