Update the samples to use ASOS 1.0.0

aspnet-contrib · Jun 4, 2017 · 62184bc · 62184bc
1 parent c79f8c0
commit 62184bc
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 47 deletions.
diff --git a/build/dependencies.props b/build/dependencies.props
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <AspNetCoreVersion>1.0.0</AspNetCoreVersion>
-    <AspNetContribOpenIdExtensionsVersion>1.0.0-beta1-final</AspNetContribOpenIdExtensionsVersion>
-    <AspNetContribOpenIdServerVersion>1.0.0-rc1-final</AspNetContribOpenIdServerVersion>
+    <AspNetContribOpenIdExtensionsVersion>1.0.0</AspNetContribOpenIdExtensionsVersion>
+    <AspNetContribOpenIdServerVersion>1.0.0</AspNetContribOpenIdServerVersion>
     <NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
     <RuntimeFrameworkVersion>1.0.0</RuntimeFrameworkVersion>
     <SignalRVersion>0.1.0-*</SignalRVersion>

diff --git a/samples/Cordova/Backend/Providers/AuthorizationProvider.cs b/samples/Cordova/Backend/Providers/AuthorizationProvider.cs
@@ -35,7 +35,7 @@ public override async Task ValidateAuthorizationRequest(ValidateAuthorizationReq
             {
                 context.Reject(
                     error: OpenIdConnectConstants.Errors.InvalidRequest,
-                    description: "The specified response_mode is unsupported.");
+                    description: "The specified 'response_mode' is unsupported.");
 
                 return;
             }
@@ -51,7 +51,7 @@ public override async Task ValidateAuthorizationRequest(ValidateAuthorizationReq
             {
                 context.Reject(
                     error: OpenIdConnectConstants.Errors.InvalidClient,
-                    description: "Application not found in the database: ensure that your client_id is correct.");
+                    description: "The specified client identifier is invalid.");
 
                 return;
             }
@@ -61,7 +61,7 @@ public override async Task ValidateAuthorizationRequest(ValidateAuthorizationReq
             {
                 context.Reject(
                     error: OpenIdConnectConstants.Errors.InvalidClient,
-                    description: "Invalid redirect_uri.");
+                    description: "The specified 'redirect_uri' is invalid.");
 
                 return;
             }
@@ -89,7 +89,7 @@ public override async Task ValidateTokenRequest(ValidateTokenRequestContext cont
             {
                 context.Reject(
                     error: OpenIdConnectConstants.Errors.InvalidRequest,
-                    description: "The mandatory client_id parameter was missing");
+                    description: "The mandatory 'client_id'/'client_secret' parameters are missing.");
 
                 return;
             }
@@ -105,7 +105,7 @@ public override async Task ValidateTokenRequest(ValidateTokenRequestContext cont
             {
                 context.Reject(
                     error: OpenIdConnectConstants.Errors.InvalidClient,
-                    description: "Application not found in the database: ensure that your client_id is correct.");
+                    description: "The specified client identifier is invalid.");
 
                 return;
             }
@@ -119,20 +119,14 @@ public override async Task ValidateLogoutRequest(ValidateLogoutRequestContext co
         {
             var database = context.HttpContext.RequestServices.GetRequiredService<ApplicationContext>();
 
-            // Skip validation if the post_logout_redirect_uri parameter was missing.
-            if (string.IsNullOrEmpty(context.PostLogoutRedirectUri))
-            {
-                context.Skip();
-
-                return;
-            }
-
-            // When provided, post_logout_redirect_uri must exactly match the address registered by the client application.
-            if (!await database.Applications.AnyAsync(application => application.LogoutRedirectUri == context.PostLogoutRedirectUri))
+            // When provided, post_logout_redirect_uri must exactly
+            // match the address registered by the client application.
+            if (!string.IsNullOrEmpty(context.PostLogoutRedirectUri) &&
+                !await database.Applications.AnyAsync(application => application.LogoutRedirectUri == context.PostLogoutRedirectUri))
             {
                 context.Reject(
-                    error: OpenIdConnectConstants.Errors.InvalidClient,
-                    description: "Invalid post_logout_redirect_uri.");
+                    error: OpenIdConnectConstants.Errors.InvalidRequest,
+                    description: "The specified 'post_logout_redirect_uri' is invalid.");
 
                 return;
             }

diff --git a/samples/Mvc/Mvc.Server/Providers/AuthorizationProvider.cs b/samples/Mvc/Mvc.Server/Providers/AuthorizationProvider.cs
@@ -21,7 +21,7 @@ public override async Task ValidateAuthorizationRequest(ValidateAuthorizationReq
             {
                 context.Reject(
                     error: OpenIdConnectConstants.Errors.UnsupportedResponseType,
-                    description: "Only the authorization code flow is supported by this authorization server");
+                    description: "Only the authorization code flow is supported by this authorization server.");
 
                 return;
             }
@@ -35,7 +35,7 @@ public override async Task ValidateAuthorizationRequest(ValidateAuthorizationReq
             {
                 context.Reject(
                     error: OpenIdConnectConstants.Errors.InvalidRequest,
-                    description: "The specified response_mode is unsupported.");
+                    description: "The specified 'response_mode' is unsupported.");
 
                 return;
             }
@@ -51,7 +51,7 @@ public override async Task ValidateAuthorizationRequest(ValidateAuthorizationReq
             {
                 context.Reject(
                     error: OpenIdConnectConstants.Errors.InvalidClient,
-                    description: "Application not found in the database: ensure that your client_id is correct");
+                    description: "The specified client identifier is invalid.");
 
                 return;
             }
@@ -61,7 +61,7 @@ public override async Task ValidateAuthorizationRequest(ValidateAuthorizationReq
             {
                 context.Reject(
                     error: OpenIdConnectConstants.Errors.InvalidClient,
-                    description: "Invalid redirect_uri");
+                    description: "The specified 'redirect_uri' is invalid.");
 
                 return;
             }
@@ -79,7 +79,7 @@ public override async Task ValidateTokenRequest(ValidateTokenRequestContext cont
                 context.Reject(
                     error: OpenIdConnectConstants.Errors.UnsupportedGrantType,
                     description: "Only authorization code and refresh token grant types " +
-                                 "are accepted by this authorization server");
+                                 "are accepted by this authorization server.");
 
                 return;
             }
@@ -94,8 +94,7 @@ public override async Task ValidateTokenRequest(ValidateTokenRequestContext cont
             {
                 context.Reject(
                     error: OpenIdConnectConstants.Errors.InvalidRequest,
-                    description: "Missing credentials: ensure that your credentials were correctly " +
-                                 "flowed in the request body or in the authorization header");
+                    description: "The mandatory 'client_id'/'client_secret' parameters are missing.");
 
                 return;
             }
@@ -111,7 +110,7 @@ public override async Task ValidateTokenRequest(ValidateTokenRequestContext cont
             {
                 context.Reject(
                     error: OpenIdConnectConstants.Errors.InvalidClient,
-                    description: "Application not found in the database: ensure that your client_id is correct");
+                    description: "The specified client identifier is invalid.");
 
                 return;
             }
@@ -126,7 +125,7 @@ public override async Task ValidateTokenRequest(ValidateTokenRequestContext cont
             {
                 context.Reject(
                     error: OpenIdConnectConstants.Errors.InvalidClient,
-                    description: "Invalid credentials: ensure that you specified a correct client_secret");
+                    description: "The specified client credentials are invalid.");
 
                 return;
             }
@@ -138,20 +137,14 @@ public override async Task ValidateLogoutRequest(ValidateLogoutRequestContext co
         {
             var database = context.HttpContext.RequestServices.GetRequiredService<ApplicationContext>();
 
-            // Skip validation if the post_logout_redirect_uri parameter was missing.
-            if (string.IsNullOrEmpty(context.PostLogoutRedirectUri))
-            {
-                context.Skip();
-
-                return;
-            }
-
-            // When provided, post_logout_redirect_uri must exactly match the address registered by the client application.
-            if (!await database.Applications.AnyAsync(application => application.LogoutRedirectUri == context.PostLogoutRedirectUri))
+            // When provided, post_logout_redirect_uri must exactly
+            // match the address registered by the client application.
+            if (!string.IsNullOrEmpty(context.PostLogoutRedirectUri) &&
+                !await database.Applications.AnyAsync(application => application.LogoutRedirectUri == context.PostLogoutRedirectUri))
             {
                 context.Reject(
-                    error: OpenIdConnectConstants.Errors.InvalidClient,
-                    description: "Invalid post_logout_redirect_uri");
+                    error: OpenIdConnectConstants.Errors.InvalidRequest,
+                    description: "The specified 'post_logout_redirect_uri' is invalid.");
 
                 return;
             }

diff --git a/samples/Postman/Providers/AuthorizationProvider.cs b/samples/Postman/Providers/AuthorizationProvider.cs
@@ -36,7 +36,7 @@ public override Task ValidateAuthorizationRequest(ValidateAuthorizationRequestCo
             {
                 context.Reject(
                     error: OpenIdConnectConstants.Errors.InvalidRequest,
-                    description: "The specified response_mode is unsupported.");
+                    description: "The specified 'response_mode' is unsupported.");
 
                 return Task.FromResult(0);
             }
@@ -46,7 +46,7 @@ public override Task ValidateAuthorizationRequest(ValidateAuthorizationRequestCo
             {
                 context.Reject(
                     error: OpenIdConnectConstants.Errors.InvalidClient,
-                    description: "The specified client_id is unknown.");
+                    description: "The specified client identifier is invalid.");
 
                 return Task.FromResult(0);
             }
@@ -56,7 +56,7 @@ public override Task ValidateAuthorizationRequest(ValidateAuthorizationRequestCo
             {
                 context.Reject(
                     error: OpenIdConnectConstants.Errors.InvalidClient,
-                    description: "The specified redirect_uri is invalid.");
+                    description: "The specified 'redirect_uri' is invalid.");
 
                 return Task.FromResult(0);
             }
@@ -103,7 +103,7 @@ public override Task HandleTokenRequest(HandleTokenRequestContext context)
                 {
                     context.Reject(
                         error: OpenIdConnectConstants.Errors.InvalidGrant,
-                        description: "Invalid user credentials.");
+                        description: "The specified user credentials are invalid.");
 
                     return Task.FromResult(0);
                 }

diff --git a/samples/SignalR/HelloSignalR/Providers/AuthorizationProvider.cs b/samples/SignalR/HelloSignalR/Providers/AuthorizationProvider.cs
@@ -52,7 +52,7 @@ public override Task HandleTokenRequest(HandleTokenRequestContext context)
                 {
                     context.Reject(
                         error: OpenIdConnectConstants.Errors.InvalidGrant,
-                        description: "Invalid username or password.");
+                        description: "The specified user credentials are invalid.");
 
                     return Task.FromResult(0);
                 }

diff --git a/samples/SignalR/HelloSignalR/wwwroot/index.html b/samples/SignalR/HelloSignalR/wwwroot/index.html
@@ -45,8 +45,7 @@
                 data: "client_id=AspNetContribSample"
                        + "&grant_type=password"
                        + "&username=AspNet"
-                       + "&password=contrib"
-                       + "&resource=" + encodeURIComponent(connectionBase),
+                       + "&password=contrib",
                 contentType: "application/x-www-form-urlencoded"
             }).then(function (data) {
                 connectToSignalR(data.access_token);