Merge pull request #1484 from thunderstore-io/06-23-potentially_fix_logins_on_new_site

Potentially fix logins

Author: Oksamies

apps/cyberstorm-remix/.env

@@ -2,8 +2,8 @@ PUBLIC_SITE_URL=http://thunderstore.temp
 PUBLIC_API_URL=http://thunderstore.temp
 AUTH_ENABLED=
 AUTH_SECRET=development
-PUBLIC_AUTH_BASE_URL=https://auth.thunderstore.io/auth/login
-PUBLIC_AUTH_RETURN_URL=?next=https%3A%2F%2Fbeta.thunderstore.io%2F
+PUBLIC_AUTH_BASE_URL=https://auth.thunderstore.io
+PUBLIC_AUTH_RETURN_URL=https%3A%2F%2Fnew.thunderstore.io
 PUBLIC_AUTH_DISCORD_URL=$PUBLIC_AUTH_BASE_URL/discord/
 PUBLIC_AUTH_GITHUB_URL=$PUBLIC_AUTH_BASE_URL/github/
 PUBLIC_AUTH_OVERWOLF_URL=$PUBLIC_AUTH_BASE_URL/overwolf/

apps/cyberstorm-remix/app/root.tsx

@@ -86,6 +86,8 @@ export async function loader() {
         "PUBLIC_API_URL",
         "PUBLIC_CLIENT_SENTRY_DSN",
         "PUBLIC_SITE_URL",
+        "PUBLIC_AUTH_BASE_URL",
+        "PUBLIC_AUTH_RETURN_URL",
       ]),
     },
   };

apps/cyberstorm-remix/cyberstorm/security/publicEnvVariables.ts

@@ -8,6 +8,8 @@ type rootLoaderType = {
         PUBLIC_API_URL?: string;
         PUBLIC_CLIENT_SENTRY_DSN?: string;
         PUBLIC_SITE_URL?: string;
+        PUBLIC_AUTH_BASE_URL?: string;
+        PUBLIC_AUTH_RETURN_URL?: string;
       };
     };
   };
@@ -23,12 +25,18 @@ export const isRootLoaderData = (obj: unknown): obj is rootLoaderType =>
   (typeof obj.root.envStuff.ENV.PUBLIC_CLIENT_SENTRY_DSN === "string" ||
     typeof obj.root.envStuff.ENV.PUBLIC_CLIENT_SENTRY_DSN === "undefined") &&
   (typeof obj.root.envStuff.ENV.PUBLIC_SITE_URL === "string" ||
-    typeof obj.root.envStuff.ENV.PUBLIC_SITE_URL === "undefined");
+    typeof obj.root.envStuff.ENV.PUBLIC_SITE_URL === "undefined") &&
+  (typeof obj.root.envStuff.ENV.PUBLIC_AUTH_BASE_URL === "string" ||
+    typeof obj.root.envStuff.ENV.PUBLIC_AUTH_BASE_URL === "undefined") &&
+  (typeof obj.root.envStuff.ENV.PUBLIC_AUTH_RETURN_URL === "string" ||
+    typeof obj.root.envStuff.ENV.PUBLIC_AUTH_RETURN_URL === "undefined");
 
 export type publicEnvVariablesKeys =
   | "SITE_URL"
   | "API_URL"
-  | "CLIENT_SENTRY_DSN";
+  | "CLIENT_SENTRY_DSN"
+  | "AUTH_BASE_URL"
+  | "AUTH_RETURN_URL";
 
 export type PublicPrefix<envVariable extends string> = `PUBLIC_${envVariable}`;
 

apps/cyberstorm-remix/cyberstorm/utils/ThunderstoreAuth.tsx

@@ -6,12 +6,11 @@ interface Props {
 }
 
 export function buildAuthLoginUrl(props: Props) {
-  const PUBLIC_API_URL = getPublicEnvVariables([
-    "PUBLIC_API_URL",
-  ]).PUBLIC_API_URL;
-  return `${PUBLIC_API_URL}/auth/login/${props.type}/${
+  const { PUBLIC_AUTH_BASE_URL, PUBLIC_AUTH_RETURN_URL } =
+    getPublicEnvVariables(["PUBLIC_AUTH_BASE_URL", "PUBLIC_AUTH_RETURN_URL"]);
+  return `${PUBLIC_AUTH_BASE_URL}/auth/login/${props.type}/${
     props.nextUrl
       ? `?next=${encodeURIComponent(props.nextUrl)}`
-      : `?next=${encodeURIComponent(`${PUBLIC_API_URL}/communities/`)}`
+      : `?next=${encodeURIComponent(`${PUBLIC_AUTH_RETURN_URL}/communities/`)}`
   }`;
 }