fix login

byCrookie · Oct 28, 2023 · ed910a0 · ed910a0
1 parent f35c60d
commit ed910a0
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 11 deletions.
diff --git a/...ackup/GithubBackup.Cli.Tests/Commands/Github/Auth/Pipeline/DeviceFlowAuthPipelineTests.cs b/...ackup/GithubBackup.Cli.Tests/Commands/Github/Auth/Pipeline/DeviceFlowAuthPipelineTests.cs
@@ -133,7 +133,7 @@ public async Task LoginAsync_Invalid_ThrowException()
 
         await action.Should().ThrowAsync<Exception>();
 
-        await _githubTokenStore.Received(0).SetAsync(token);
+        await _githubTokenStore.Received(1).SetAsync(token);
         await _persistentCredentialStore.Received(0).StoreTokenAsync(Arg.Any<string>(), Arg.Any<CancellationToken>());
 
         _logger.VerifyLogs(

diff --git a/GithubBackup/GithubBackup.Cli.Tests/Commands/Github/Auth/Pipeline/PersistedPipelineTests.cs b/GithubBackup/GithubBackup.Cli.Tests/Commands/Github/Auth/Pipeline/PersistedPipelineTests.cs
@@ -91,7 +91,7 @@ public async Task LoginAsync_TokenNotValid_CallNext()
 
         await _sut.LoginAsync(globalArgs, loginArgs, true, ct);
 
-        await _githubTokenStore.Received(0).SetAsync(Arg.Any<string>());
+        await _githubTokenStore.Received(1).SetAsync(token);
         await _persistentCredentialStore.Received(0).StoreTokenAsync(Arg.Any<string>(), Arg.Any<CancellationToken>());
 
         await _next.Received(1).LoginAsync(globalArgs, loginArgs, true, ct);

diff --git a/GithubBackup/GithubBackup.Cli.Tests/Commands/Github/Auth/Pipeline/TokenArgPipelineTests.cs b/GithubBackup/GithubBackup.Cli.Tests/Commands/Github/Auth/Pipeline/TokenArgPipelineTests.cs
@@ -109,7 +109,7 @@ public async Task LoginAsync_Invalid_ThrowException()
 
         await action.Should().ThrowAsync<Exception>();
 
-        await _githubTokenStore.Received(0).SetAsync(token);
+        await _githubTokenStore.Received(1).SetAsync(token);
         await _persistentCredentialStore.Received(0).StoreTokenAsync(Arg.Any<string>(), Arg.Any<CancellationToken>());
 
         _logger.VerifyLogs(

diff --git a/...thubBackup.Cli.Tests/Commands/Github/Auth/Pipeline/TokenFromConfigurationPipelineTests.cs b/...thubBackup.Cli.Tests/Commands/Github/Auth/Pipeline/TokenFromConfigurationPipelineTests.cs
@@ -86,7 +86,7 @@ public async Task LoginAsync_Invalid_ThrowException()
 
         await action.Should().ThrowAsync<Exception>();
 
-        await _githubTokenStore.Received(0).SetAsync(token);
+        await _githubTokenStore.Received(1).SetAsync(token);
 
         _logger.VerifyLogs(
             new LogEntry(LogLevel.Information, "Using token from environment variable"),

diff --git a/GithubBackup/GithubBackup.Cli/Commands/Github/Auth/Pipeline/DeviceFlowAuthPipeline.cs b/GithubBackup/GithubBackup.Cli/Commands/Github/Auth/Pipeline/DeviceFlowAuthPipeline.cs
@@ -53,9 +53,8 @@ private static bool IsReponsible(LoginArgs args)
 
         try
         {
-            var user = await _userService.WhoAmIAsync(ct);
-
             await _githubTokenStore.SetAsync(oauthToken);
+            var user = await _userService.WhoAmIAsync(ct);
 
             if (persist)
             {

diff --git a/GithubBackup/GithubBackup.Cli/Commands/Github/Auth/Pipeline/PersistedPipeline.cs b/GithubBackup/GithubBackup.Cli/Commands/Github/Auth/Pipeline/PersistedPipeline.cs
@@ -63,8 +63,8 @@ private static bool IsReponsible(LoginArgs args)
                 return null;
             }
 
-            var user = await _userService.WhoAmIAsync(ct);
             await _githubTokenStore.SetAsync(t);
+            var user = await _userService.WhoAmIAsync(ct);
             return user;
         }
         catch (Exception e)

diff --git a/GithubBackup/GithubBackup.Cli/Commands/Github/Auth/Pipeline/TokenArgPipeline.cs b/GithubBackup/GithubBackup.Cli/Commands/Github/Auth/Pipeline/TokenArgPipeline.cs
@@ -44,9 +44,8 @@ private static bool IsReponsible(LoginArgs args)
 
         try
         {
-            var user = await _userService.WhoAmIAsync(ct);
-
             await _githubTokenStore.SetAsync(args.Token);
+            var user = await _userService.WhoAmIAsync(ct);
 
             if (persist)
             {

diff --git a/...ubBackup/GithubBackup.Cli/Commands/Github/Auth/Pipeline/TokenFromConfigurationPipeline.cs b/...ubBackup/GithubBackup.Cli/Commands/Github/Auth/Pipeline/TokenFromConfigurationPipeline.cs
@@ -47,9 +47,8 @@ private bool IsReponsible()
 
         try
         {
-            var user = await _userService.WhoAmIAsync(ct);
             await _githubTokenStore.SetAsync(token);
-            return user;
+            return await _userService.WhoAmIAsync(ct);
         }
         catch (Exception e)
         {