From 2350aa12fae661e37895616e0e7fe3e7ebc62f53 Mon Sep 17 00:00:00 2001 From: Hassan Abouelela <47495861+HassanAbouelela@users.noreply.github.com> Date: Sat, 13 Feb 2021 01:13:37 +0300 Subject: Makes Authorize Helper Async Signed-off-by: Hassan Abouelela <47495861+HassanAbouelela@users.noreply.github.com> --- src/api/auth.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/api/auth.ts') diff --git a/src/api/auth.ts b/src/api/auth.ts index ae20236..fa3ac85 100644 --- a/src/api/auth.ts +++ b/src/api/auth.ts @@ -190,19 +190,21 @@ export async function requestBackendJWT(code: string): Promise { * @param disableFunction An optional function that can disable a component while processing. * @param path The site path to save the token under. */ -export default function authorize(scopes?: OAuthScopes[], disableFunction?: (newState: boolean) => void, path = "/"): void { +export default async function authorize(scopes?: OAuthScopes[], disableFunction?: (newState: boolean) => void, path = "/"): Promise { if (!checkScopes(scopes, path)) { const cookies = new Cookies; cookies.remove(CookieNames.Token + path); cookies.remove(CookieNames.Scopes + path); - getDiscordCode(scopes || [], disableFunction).then(discord_response =>{ - requestBackendJWT(discord_response.code).then(backend_response => { + await getDiscordCode(scopes || [], disableFunction).then(async discord_response =>{ + await requestBackendJWT(discord_response.code).then(backend_response => { const options: CookieSetOptions = {sameSite: "strict", expires: backend_response.Expiry, secure: PRODUCTION, path: path}; cookies.set(CookieNames.Token + path, backend_response.JWT, options); cookies.set(CookieNames.Scopes + path, discord_response.cleanedScopes, options); }); }); + + return new Promise(resolve => resolve()); } } -- cgit v1.2.3