fixup! feat(DEV-10495): add image build task

team-monite · Jul 4, 2024 · 4aeecdd · 4aeecdd
1 parent 963400b
commit 4aeecdd
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 2 deletions.
diff --git a/.github/workflows/pull-preview-deploy.yml b/.github/workflows/pull-preview-deploy.yml
@@ -54,7 +54,7 @@ jobs:
             "monite_project_client_secret=${{ secrets.PULL_PREVIEW_MONITE_PROJECT_CLIENT_SECRET_DEV }}"
             "monite_project_client_id=${{ secrets.PULL_PREVIEW_MONITE_PROJECT_CLIENT_ID_DEV }}"
           build-args: |
-            NEXT_PUBLIC_CLERK_DOMAIN=${{ vars.PULL_PREVIEW_CLERK_DOMAIN_DEV }}
+            APP_SIGN_IN_URL=https://${{ vars.PULL_PREVIEW_CLERK_DOMAIN_DEV }}/sign-in
             TURBO_API=http://${{ env.turbo_api_ip }}:41230
             TURBO_TEAM=turbogha
             TURBO_TOKEN=turbogha

diff --git a/SdkDemoWithNextjsAndClerkAuth.PullPreviewDeploy.Dockerfile b/SdkDemoWithNextjsAndClerkAuth.PullPreviewDeploy.Dockerfile
@@ -14,6 +14,7 @@ ARG TURBO_TEAM
 ARG TURBO_TOKEN
 ARG NEXT_PUBLIC_CLERK_IS_SATELLITE=true
 ARG NEXT_PUBLIC_CLERK_DOMAIN
+ARG APP_SIGN_IN_URL
 
 RUN yarn build --filter='sdk-demo-with-nextjs-and-clerk-auth'
 
@@ -32,5 +33,8 @@ RUN --mount=type=secret,id=monite_project_client_id \
 RUN --mount=type=secret,id=monite_project_client_secret \
     echo "MONITE_PROJECT_CLIENT_SECRET=$(cat /run/secrets/monite_project_client_secret)" >> examples/with-nextjs-and-clerk-auth/.env.local
 
+# Must be main domain Sign In URL, not the satellite one
+RUN echo "APP_SIGN_IN_URL=$APP_SIGN_IN_URL" >> examples/with-nextjs-and-clerk-auth/.env.local
+
 CMD ["yarn", "workspace", "sdk-demo-with-nextjs-and-clerk-auth", "run", "start"]
 EXPOSE 3000
diff --git a/docker-compose.pull-preview.yml b/docker-compose.pull-preview.yml
@@ -16,3 +16,4 @@ services:
     image: "${PREVIEW_SDK_DEMO_WITH_NEXTJS_AND_CLERK_AUTH_IMAGE}"
     environment:
       MONITE_API_URL: "https://api.dev.monite.com/v1"
+      CLERK_SATELLITE_APP_DOMAIN: "${PULLPREVIEW_PUBLIC_DNS}"
diff --git a/examples/with-nextjs-and-clerk-auth/src/app/layout.tsx b/examples/with-nextjs-and-clerk-auth/src/app/layout.tsx
@@ -33,7 +33,11 @@ export default async function RootLayout({
   const selectedTheme = getSelectedTheme(user);
 
   return (
-    <ClerkProvider publishableKey={process.env.CLERK_PUBLISHABLE_KEY}>
+    <ClerkProvider
+      publishableKey={process.env.CLERK_PUBLISHABLE_KEY}
+      signInUrl={process.env.APP_SIGN_IN_URL}
+      domain={process.env.CLERK_SATELLITE_APP_DOMAIN}
+    >
       <MultisessionAppSupport>
         <html lang="en">
           <body className={themeFont.className}>

diff --git a/examples/with-nextjs-and-clerk-auth/src/middleware.ts b/examples/with-nextjs-and-clerk-auth/src/middleware.ts
@@ -6,9 +6,18 @@ import { authMiddleware as createAuthMiddleware } from '@clerk/nextjs';
 // Please edit this to allow other routes to be public as needed.
 // See https://clerk.com/docs/references/nextjs/auth-middleware for more information about configuring your middleware
 
+const authMiddlewareDomainOptions = process.env.CLERK_SATELLITE_APP_DOMAIN
+  ? {
+      domain: process.env.CLERK_SATELLITE_APP_DOMAIN,
+    }
+  : undefined;
+
 const authMiddleware = createAuthMiddleware({
   publicRoutes: ['/api/in/clerk', '/api/healthcheck', '/public'],
+  // @ts-expect-error - An issue with Clerk's types
   publishableKey: process.env.CLERK_PUBLISHABLE_KEY,
+  signInUrl: process.env.APP_SIGN_IN_URL, // main domain SignIn URL, not satellite
+  ...authMiddlewareDomainOptions,
 });
 
 const authMiddlewareNo401Response: NextMiddleware = async (request, event) => {