Cleaned up Auth Service

analogrelay · May 5, 2012 · 333c7a6 · 333c7a6
1 parent 6cea825
commit 333c7a6
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/ReviewR.Web/Services/AuthenticationService.cs b/ReviewR.Web/Services/AuthenticationService.cs
@@ -39,11 +39,7 @@ public virtual User GetUserByEmail(string email)
 
         public async virtual Task<UserInfo> ResolveAuthTokenAsync(string authenticationToken)
         {
-            HttpClient client = new HttpClient();
-            HttpResponseMessage resp = await client.GetAsync(String.Format(
-                "https://rpxnow.com/api/v2/auth_info?apiKey={0}&token={1}",
-                Settings.Get("Janrain:ApiKey"),
-                authenticationToken), HttpCompletionOption.ResponseContentRead);
+            HttpResponseMessage resp = await ExchangeToken(authenticationToken);
 
             if (!resp.IsSuccessStatusCode)
             {
@@ -64,6 +60,12 @@ public async virtual Task<UserInfo> ResolveAuthTokenAsync(string authenticationT
                     verifiedEmail = ""
                 }
             });
+
+            if (identifier == null || identifier.profile == null)
+            {
+                return null;
+            }
+
             string name = identifier.profile.displayName;
             if (identifier.profile.name != null && !String.IsNullOrEmpty(identifier.profile.name.formatted))
             {
@@ -120,5 +122,14 @@ public virtual void AddCredential(int userId, string provider, string identifier
             });
             Data.SaveChanges();
         }
+
+        protected internal async virtual Task<HttpResponseMessage> ExchangeToken(string token)
+        {
+            HttpClient client = new HttpClient();
+            return await client.GetAsync(String.Format(
+                "https://rpxnow.com/api/v2/auth_info?apiKey={0}&token={1}",
+                Settings.Get("Janrain:ApiKey"),
+                token), HttpCompletionOption.ResponseContentRead);
+        }
     }
 }