Merge branch 'master' into master_1.5.1_autofac

Conflicts: default.ps1 source/VersionAssemblyInfo.cs
IdentityServer · May 8, 2015 · 2645627 · 2645627
2 parents 8f293f6 + ae8a2cb
commit 2645627
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/source/Core/Validation/AuthorizeRequestValidator.cs b/source/Core/Validation/AuthorizeRequestValidator.cs
@@ -354,12 +354,13 @@ private AuthorizeRequestValidationResult ValidateOptionalParameters(ValidatedAut
             }
             else
             {
-                if (request.Flow == Flows.Implicit)
+                if (request.Flow == Flows.Implicit ||
+                    request.Flow == Flows.Hybrid)
                 {
                     // only openid requests require nonce
                     if (request.IsOpenIdRequest)
                     {
-                        LogError("Nonce required for implicit flow with openid scope", request);
+                        LogError("Nonce required for implicit and hybrid flow with openid scope", request);
                         return Invalid(request, ErrorTypes.Client);
                     }
                 }