Merge pull request #979 from github/fixes/login-delay

Add a delay to the login process.

Author: paladique

src/GitHub.App/Models/RepositoryHost.cs

@@ -122,7 +122,7 @@ public IObservable<AuthenticationResult> LogIn(string usernameOrEmail, string pa
                 // Try to get an authorization token, save it, then get the user to log in:
                 .SelectMany(fingerprint => ApiClient.GetOrCreateApplicationAuthenticationCode(interceptingTwoFactorChallengeHandler))
                 .SelectMany(saveAuthorizationToken)
-                .SelectMany(_ => GetUserFromApi())
+                .SelectMany(_ => GetUserFromApiWithDelay())
                 .Catch<UserAndScopes, ApiException>(firstTryEx =>
                 {
                     var exception = firstTryEx as AuthorizationException;
@@ -163,7 +163,7 @@ public IObservable<AuthenticationResult> LogIn(string usernameOrEmail, string pa
                             })
                             // Then save the authorization token (if there is one) and get the user:
                             .SelectMany(saveAuthorizationToken)
-                            .SelectMany(_ => GetUserFromApi());
+                            .SelectMany(_ => GetUserFromApiWithDelay());
                     }
 
                     return Observable.Throw<UserAndScopes>(firstTryEx);
@@ -178,7 +178,7 @@ public IObservable<AuthenticationResult> LogIn(string usernameOrEmail, string pa
                     // instead of 404 to signal that it's not allowed. In the name of backwards compatibility we 
                     // test for both 404 (NotFoundException) and 403 (ForbiddenException) here.
                     if (isEnterprise && (retryEx is NotFoundException || retryEx is ForbiddenException || retryEx.StatusCode == (HttpStatusCode)422))
-                        return GetUserFromApi();
+                        return GetUserFromApiWithDelay();
 
                     // Other errors are "real" so we pass them along:
                     return Observable.Throw<UserAndScopes>(retryEx);
@@ -268,6 +268,15 @@ IObservable<AuthenticationResult> LoginWithApiUser(UserAndScopes userAndScopes)
                 });
         }
 
+        IObservable<UserAndScopes> GetUserFromApiWithDelay()
+        {
+            // It seems that attempting to use a token immediately sometimes fails, add a delay
+            // of 1s to allow the token to propagate.
+            return Observable.Defer(() => 
+                Observable.Timer(TimeSpan.FromMilliseconds(1000))
+                          .SelectMany(_ => ApiClient.GetUser()));
+        }
+
         IObservable<UserAndScopes> GetUserFromApi()
         {
             return Observable.Defer(() => ApiClient.GetUser());