Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use scheme provided by arguments #6582

Merged
merged 1 commit into from
Oct 9, 2023
Merged

Use scheme provided by arguments #6582

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/StrawberryShake/Tooling/src/dotnet-graphql/OAuth/AuthArgumentsBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -69,7 +69,7 @@ public AuthArguments(
scopes,
cancellationToken)
.ConfigureAwait(false);
return new AccessToken(token, _defaultScheme);
return new AccessToken(token, scheme);
}

return null;
Expand Down Expand Up @@ -104,4 +104,4 @@ private void ValidateOAuthArguments(IActivity activity)
.Build());
}
}
}
}