From 5e602c9365080440dbcd5ff7d315d2c32a314f09 Mon Sep 17 00:00:00 2001 From: SubZero0 Date: Sun, 21 Jun 2020 10:12:40 -0300 Subject: [PATCH] Trim token --- src/Discord.Net.Rest/DiscordRestApiClient.cs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/Discord.Net.Rest/DiscordRestApiClient.cs b/src/Discord.Net.Rest/DiscordRestApiClient.cs index 30984c0e9..bc515d90d 100644 --- a/src/Discord.Net.Rest/DiscordRestApiClient.cs +++ b/src/Discord.Net.Rest/DiscordRestApiClient.cs @@ -80,17 +80,13 @@ namespace Discord.API /// Unknown OAuth token type. 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?.TrimEnd(), + TokenType.Bot => $"Bot {token?.TrimEnd()}", + TokenType.Bearer => $"Bearer {token?.TrimEnd()}", + _ => throw new ArgumentException(message: "Unknown OAuth token type.", paramName: nameof(tokenType)), + }; } internal virtual void Dispose(bool disposing) {