Changed the public API for OAuth 2.0 scope from a space-delimited string to a HashSet<string>

1 files changed, 3 insertions, 6 deletions

diff --git a/projecttemplates/RelyingPartyLogic/OAuthAuthorizationServer.cs b/projecttemplates/RelyingPartyLogic/OAuthAuthorizationServer.cs
index 2b207f9..3dafa0a 100644
--- a/projecttemplates/RelyingPartyLogic/OAuthAuthorizationServer.cs
+++ b/projecttemplates/RelyingPartyLogic/OAuthAuthorizationServer.cs
@@ -145,11 +145,8 @@ namespace RelyingPartyLogic {
 			return false;
 		}
 
-		private bool IsAuthorizationValid(string requestedScope, string clientIdentifier, DateTime issuedUtc, string username)
+		private bool IsAuthorizationValid(HashSet<string> requestedScopes, string clientIdentifier, DateTime issuedUtc, string username)
 		{
-			var stringCompare = StringComparer.Ordinal;
-			var requestedScopes = OAuthUtilities.BreakUpScopes(requestedScope, stringCompare);
-
 			var grantedScopeStrings = from auth in Database.DataContext.ClientAuthorizations
 									  where
 										auth.Client.ClientIdentifier == clientIdentifier &&
@@ -165,9 +162,9 @@ namespace RelyingPartyLogic {
 				return false;
 			}
 
-			var grantedScopes = new HashSet<string>(stringCompare);
+			var grantedScopes = new HashSet<string>(OAuthUtilities.ScopeStringComparer);
 			foreach (string scope in grantedScopeStrings) {
-				grantedScopes.UnionWith(OAuthUtilities.BreakUpScopes(scope, stringCompare));
+				grantedScopes.UnionWith(OAuthUtilities.SplitScopes(scope));
 			}
 
 			return requestedScopes.IsSubsetOf(grantedScopes);