Discord/chaosbot
3
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases Wiki Activity

Remove that again, since we're using cookies

Browse Source
This commit is contained in:
Daniel_I_Am 2020-08-25 19:49:05 +02:00
parent 73932635f8
commit 5f97bcfa71
No known key found for this signature in database
GPG Key ID: 80C428FCC9743E84
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChaosBot/WebServer/App/DiscordController.cs
View File

@ -1,7 +1,9 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Net.Http; using System.Net.Http;
using System.Net.Http.Headers; using System.Net.Http.Headers;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Newtonsoft.Json; using Newtonsoft.Json;
@ -45,16 +47,17 @@ namespace ChaosBot.WebServer.App
} }
[HttpGet("user")] [HttpGet("user")]
public IActionResult GetUser(string access_token) public IActionResult GetUser()
{ {
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", access_token); if (!Request.Cookies.TryGetValue("access_token", out string accessToken))
accessToken = null;
HttpResponseMessage response; HttpResponseMessage response;
using (HttpRequestMessage requestMessage = using (HttpRequestMessage requestMessage =
new HttpRequestMessage(HttpMethod.Get, "https://discord.com/api/v7/users/@me")) new HttpRequestMessage(HttpMethod.Get, "https://discord.com/api/v7/users/@me"))
{ {
requestMessage.Headers.Authorization = requestMessage.Headers.Authorization =
new AuthenticationHeaderValue("Bearer", access_token); new AuthenticationHeaderValue("Bearer", accessToken);
response = client.SendAsync(requestMessage).GetAwaiter().GetResult(); response = client.SendAsync(requestMessage).GetAwaiter().GetResult();
} }
string responseString = response.Content.ReadAsStringAsync().GetAwaiter().GetResult(); string responseString = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
@ -64,16 +67,17 @@ namespace ChaosBot.WebServer.App
} }
[HttpGet("guilds")] [HttpGet("guilds")]
public IActionResult GetGuilds(string access_token) public IActionResult GetGuilds()
{ {
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", access_token); if (!Request.Cookies.TryGetValue("access_token", out string accessToken))
accessToken = null;
HttpResponseMessage response; HttpResponseMessage response;
using (HttpRequestMessage requestMessage = using (HttpRequestMessage requestMessage =
new HttpRequestMessage(HttpMethod.Get, "https://discord.com/api/v7/users/@me/guilds")) new HttpRequestMessage(HttpMethod.Get, "https://discord.com/api/v7/users/@me/guilds"))
{ {
requestMessage.Headers.Authorization = requestMessage.Headers.Authorization =
new AuthenticationHeaderValue("Bearer", access_token); new AuthenticationHeaderValue("Bearer", accessToken);
response = client.SendAsync(requestMessage).GetAwaiter().GetResult(); response = client.SendAsync(requestMessage).GetAwaiter().GetResult();
} }
string responseString = response.Content.ReadAsStringAsync().GetAwaiter().GetResult(); string responseString = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();

2
ChaosBot/wwwroot

@ -1 +1 @@
Subproject commit d5f6beff41569ca8b8cf6e38fa48a03a32824623 Subproject commit 205122b26ade4c897300fe23682fe6b47609c6be