Merge pull request #26 from SystemEngineeringTeam/preview-support

chore: プレビューサイトの対応
SystemEngineeringTeam · Dec 26, 2024 · 39a2fcd · 39a2fcd
2 parents 2da8671 + 6eefd69
commit 39a2fcd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/services/auth.server.ts b/app/services/auth.server.ts
@@ -17,10 +17,12 @@ export function getAuthenticator(env: Env) {
   }
 
   const sessionStorage = getSessionStorage(env.SESSION_SECRET);
+  const callbackURL = new URL(env.CF_PAGES_URL);
+  callbackURL.pathname = '/auth/callback';
   authenticator = new Authenticator<AuthUser>(sessionStorage);
   authenticator.use(new Auth0Strategy(
     {
-      callbackURL: env.AUTH0_CALLBACK_URL,
+      callbackURL: callbackURL.toString(),
       clientID: env.AUTH0_CLIENT_ID,
       clientSecret: env.AUTH0_CLIENT_SECRET,
       domain: env.AUTH0_DOMAIN,

diff --git a/worker-configuration.d.ts b/worker-configuration.d.ts
@@ -1,11 +1,12 @@
 // Generated by Wrangler by running `wrangler types`
 
 interface Env {
-	AUTH0_CALLBACK_URL: string;
+	AUTH0_DOMAIN: string;
 	AUTH0_CLIENT_ID: string;
 	AUTH0_CLIENT_SECRET: string;
-	AUTH0_DOMAIN: string;
+	AUTH0_CALLBACK_URL: string;
 	AUTH0_LOGOUT_URL: string;
 	AUTH0_RETURN_TO_URL: string;
 	SESSION_SECRET: string;
+	CF_PAGES_URL: string;
 }