Merge pull request #12 from naasir/master

Fixed bug with reading access token from authorization header
micahlmartin · Jan 11, 2013 · 7f8ef60 · 7f8ef60
2 parents 9063fec + b84fe43
commit 7f8ef60
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/OAuth2Provider/Request/OAuthRequestBase.cs b/src/OAuth2Provider/Request/OAuthRequestBase.cs
@@ -6,7 +6,9 @@
 using OAuth2Provider;
 
 namespace OAuth2Provider.Request
-{
+{
+    using System.Linq;
+
     public abstract class OAuthRequestBase : IOAuthRequest
     {
         private readonly IRequest _request;
@@ -68,9 +70,9 @@ public string AccessToken
                 if (!string.IsNullOrWhiteSpace(accessToken))
                     return accessToken;
 
-                var authHeader = _request.Headers.SafeGet(HeaderType.Authorization) + "";
-                if(authHeader.Contains("OAuth") || authHeader.Contains("Bearer"))
-                    accessToken = authHeader.Replace("OAuth ", "").Replace("Bearer ", "").Trim();
+                var authHeader = _request.Headers.SafeGet(HeaderType.Authorization).FirstOrDefaultSafe() ?? string.Empty;
+                if (authHeader.Contains("OAuth") || authHeader.Contains("Bearer"))
+                    accessToken = authHeader.Replace("OAuth ", string.Empty).Replace("Bearer ", string.Empty).Trim();
 
                 return accessToken;
             }