Use scheme provided by arguments

ChilliCream · Oct 9, 2023 · 77891a5 · 77891a5
1 parent 892bbf8
commit 77891a5
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/StrawberryShake/Tooling/src/dotnet-graphql/OAuth/AuthArgumentsBase.cs b/src/StrawberryShake/Tooling/src/dotnet-graphql/OAuth/AuthArgumentsBase.cs
@@ -41,15 +41,15 @@ public AuthArguments(
         IConsoleOutput output,
         CancellationToken cancellationToken)
     {
-        if (Token.HasValue())
-        {
-            string? scheme = null;
+        string? scheme = null;
 
-            if (!NoScheme.HasValue())
-            {
-                scheme = Scheme.HasValue() ? Scheme.Value()!.Trim() : _defaultScheme;
-            }
+        if (!NoScheme.HasValue())
+        {
+            scheme = Scheme.HasValue() ? Scheme.Value()!.Trim() : _defaultScheme;
+        }
 
+        if (Token.HasValue())
+        {
             return new AccessToken(
                 Token.Value()!.Trim(),
                 scheme);
@@ -69,7 +69,7 @@ public AuthArguments(
                     scopes,
                     cancellationToken)
                 .ConfigureAwait(false);
-            return new AccessToken(token, _defaultScheme);
+            return new AccessToken(token, scheme);
         }
 
         return null;
@@ -104,4 +104,4 @@ private void ValidateOAuthArguments(IActivity activity)
                     .Build());
         }
     }
-}
+}