feat: Add prompt=none to Discord OAuth authorization URL

pagefaultgames · Jul 21, 2024 · 4c65569 · 4c65569
1 parent 22cd54c
commit 4c65569
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/phases.ts b/src/phases.ts
@@ -134,7 +134,7 @@ export class LoginPhase extends Phase {
               }, () => {
                 const redirectUri = encodeURIComponent(`${import.meta.env.VITE_SERVER_URL}/auth/discord/callback`);
                 const discordId = import.meta.env.VITE_DISCORD_CLIENT_ID;
-                const discordUrl = `https://discord.com/api/oauth2/authorize?client_id=${discordId}&redirect_uri=${redirectUri}&response_type=code&scope=identify`;
+                const discordUrl = `https://discord.com/api/oauth2/authorize?client_id=${discordId}&redirect_uri=${redirectUri}&response_type=code&scope=identify&prompt=none`;
                 window.open(discordUrl, "_self");
               }, () => {
                 const redirectUri = encodeURIComponent(`${import.meta.env.VITE_SERVER_URL}/auth/google/callback`);

diff --git a/src/ui/login-form-ui-handler.ts b/src/ui/login-form-ui-handler.ts
@@ -49,7 +49,7 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
     discordImage.on("pointerdown", () => {
       const redirectUri = encodeURIComponent(`${import.meta.env.VITE_SERVER_URL}/auth/discord/callback`);
       const discordId = import.meta.env.VITE_DISCORD_CLIENT_ID;
-      const discordUrl = `https://discord.com/api/oauth2/authorize?client_id=${discordId}&redirect_uri=${redirectUri}&response_type=code&scope=identify`;
+      const discordUrl = `https://discord.com/api/oauth2/authorize?client_id=${discordId}&redirect_uri=${redirectUri}&response_type=code&scope=identify&prompt=none`;
       window.open(discordUrl, "_self");
     });
     this.discordImage = discordImage;

diff --git a/src/ui/menu-ui-handler.ts b/src/ui/menu-ui-handler.ts
@@ -395,7 +395,7 @@ export default class MenuUiHandler extends MessageUiHandler {
                   const token = Utils.getCookie(Utils.sessionIdKey);
                   const redirectUri = encodeURIComponent(`${import.meta.env.VITE_SERVER_URL}/auth/discord/callback`);
                   const discordId = import.meta.env.VITE_DISCORD_CLIENT_ID;
-                  const discordUrl = `https://discord.com/api/oauth2/authorize?client_id=${discordId}&redirect_uri=${redirectUri}&response_type=code&scope=identify&state=${token}`;
+                  const discordUrl = `https://discord.com/api/oauth2/authorize?client_id=${discordId}&redirect_uri=${redirectUri}&response_type=code&scope=identify&state=${token}&prompt=none`;
                   window.open(discordUrl, "_self");
                   return true;
                 } else {

diff --git a/src/utils.ts b/src/utils.ts
@@ -297,7 +297,7 @@ export const isBeta = import.meta.env.MODE === "beta"; // this checks to see if
 export function setCookie(cName: string, cValue: string): void {
   const expiration = new Date();
   expiration.setTime(new Date().getTime() + 3600000 * 24 * 30 * 3/*7*/);
-  document.cookie = `${cName}=${cValue};Secure;SameSite=Strict;Path=/;Expires=${expiration.toUTCString()}`;
+  document.cookie = `${cName}=${cValue};Secure;SameSite=Strict;Domain=beta.pokerogue.net;Path=/;Expires=${expiration.toUTCString()}`;
 }
 
 export function getCookie(cName: string): string {