|
@@ -80,17 +80,13 @@ namespace Discord.API |
|
|
/// <exception cref="ArgumentException">Unknown OAuth token type.</exception> |
|
|
/// <exception cref="ArgumentException">Unknown OAuth token type.</exception> |
|
|
internal static string GetPrefixedToken(TokenType tokenType, string token) |
|
|
internal static string GetPrefixedToken(TokenType tokenType, string token) |
|
|
{ |
|
|
{ |
|
|
switch (tokenType) |
|
|
|
|
|
|
|
|
return tokenType switch |
|
|
{ |
|
|
{ |
|
|
case default(TokenType): |
|
|
|
|
|
return token; |
|
|
|
|
|
case TokenType.Bot: |
|
|
|
|
|
return $"Bot {token}"; |
|
|
|
|
|
case TokenType.Bearer: |
|
|
|
|
|
return $"Bearer {token}"; |
|
|
|
|
|
default: |
|
|
|
|
|
throw new ArgumentException(message: "Unknown OAuth token type.", paramName: nameof(tokenType)); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
default(TokenType) => token, |
|
|
|
|
|
TokenType.Bot => $"Bot {token}", |
|
|
|
|
|
TokenType.Bearer => $"Bearer {token}", |
|
|
|
|
|
_ => throw new ArgumentException(message: "Unknown OAuth token type.", paramName: nameof(tokenType)), |
|
|
|
|
|
}; |
|
|
} |
|
|
} |
|
|
internal virtual void Dispose(bool disposing) |
|
|
internal virtual void Dispose(bool disposing) |
|
|
{ |
|
|
{ |
|
@@ -133,7 +129,7 @@ namespace Discord.API |
|
|
RestClient.SetCancelToken(_loginCancelToken.Token); |
|
|
RestClient.SetCancelToken(_loginCancelToken.Token); |
|
|
|
|
|
|
|
|
AuthTokenType = tokenType; |
|
|
AuthTokenType = tokenType; |
|
|
AuthToken = token; |
|
|
|
|
|
|
|
|
AuthToken = token?.TrimEnd(); |
|
|
if (tokenType != TokenType.Webhook) |
|
|
if (tokenType != TokenType.Webhook) |
|
|
RestClient.SetHeader("authorization", GetPrefixedToken(AuthTokenType, AuthToken)); |
|
|
RestClient.SetHeader("authorization", GetPrefixedToken(AuthTokenType, AuthToken)); |
|
|
|
|
|
|
|
|