From 541ca565fb520f402c508d25d0d1d0b6e554cdd6 Mon Sep 17 00:00:00 2001 From: Googie2149 Date: Wed, 10 Aug 2016 00:37:25 -0400 Subject: [PATCH 1/2] Added bot authorization headers Basically grabbed this from 1.0, thank you Rand for all the help --- src/Discord.Net.Net45/Discord.Net.csproj | 1 + src/Discord.Net.Net45/Enums/TokenType.cs | 11 +++++++++++ src/Discord.Net/DiscordClient.cs | 20 +++++++++++++++++--- 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 src/Discord.Net.Net45/Enums/TokenType.cs diff --git a/src/Discord.Net.Net45/Discord.Net.csproj b/src/Discord.Net.Net45/Discord.Net.csproj index 8cb0cb65e..359f650a3 100644 --- a/src/Discord.Net.Net45/Discord.Net.csproj +++ b/src/Discord.Net.Net45/Discord.Net.csproj @@ -611,6 +611,7 @@ TaskManager.cs + diff --git a/src/Discord.Net.Net45/Enums/TokenType.cs b/src/Discord.Net.Net45/Enums/TokenType.cs new file mode 100644 index 000000000..72f257aad --- /dev/null +++ b/src/Discord.Net.Net45/Enums/TokenType.cs @@ -0,0 +1,11 @@ +using System; + +namespace Discord +{ + public enum TokenType + { + User, + Bearer, + Bot, + } +} diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs index 0629f82e1..bbbd5b539 100644 --- a/src/Discord.Net/DiscordClient.cs +++ b/src/Discord.Net/DiscordClient.cs @@ -169,14 +169,14 @@ namespace Discord return ClientAPI.Token; } /// Connects to the Discord server with the provided token. - public async Task Connect(string token) + public async Task Connect(string token, TokenType tokenType) { if (token == null) throw new ArgumentNullException(token); - await BeginConnect(null, null, token).ConfigureAwait(false); + await BeginConnect(null, null, token, tokenType).ConfigureAwait(false); } - private async Task BeginConnect(string email, string password, string token = null) + private async Task BeginConnect(string email, string password, string token = null, TokenType tokenType = TokenType.User) { try { @@ -199,6 +199,20 @@ namespace Discord ClientAPI.CancelToken = CancelToken; StatusAPI.CancelToken = CancelToken; + switch (tokenType) + { + case TokenType.Bot: + token = $"Bot {token}"; + break; + case TokenType.Bearer: + token = $"Bearer {token}"; + break; + case TokenType.User: + break; + default: + throw new ArgumentException("Unknown oauth token type", nameof(tokenType)); + } + await Login(email, password, token).ConfigureAwait(false); await GatewaySocket.Connect(ClientAPI, CancelToken).ConfigureAwait(false); From 2a19820c58d689774647443aeafd81a37564c7c6 Mon Sep 17 00:00:00 2001 From: Googie2149 Date: Thu, 11 Aug 2016 22:14:57 -0400 Subject: [PATCH 2/2] Removed Bearer token type --- src/Discord.Net.Net45/Enums/TokenType.cs | 1 - src/Discord.Net/DiscordClient.cs | 3 --- 2 files changed, 4 deletions(-) diff --git a/src/Discord.Net.Net45/Enums/TokenType.cs b/src/Discord.Net.Net45/Enums/TokenType.cs index 72f257aad..6ffeaffd0 100644 --- a/src/Discord.Net.Net45/Enums/TokenType.cs +++ b/src/Discord.Net.Net45/Enums/TokenType.cs @@ -5,7 +5,6 @@ namespace Discord public enum TokenType { User, - Bearer, Bot, } } diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs index bbbd5b539..9dacfe71a 100644 --- a/src/Discord.Net/DiscordClient.cs +++ b/src/Discord.Net/DiscordClient.cs @@ -204,9 +204,6 @@ namespace Discord case TokenType.Bot: token = $"Bot {token}"; break; - case TokenType.Bearer: - token = $"Bearer {token}"; - break; case TokenType.User: break; default: