prepare docker image for proper release (#608)

Author: Brendonovich

.github/workflows/docker-build-web.yml

@@ -4,9 +4,9 @@ on:
   workflow_dispatch:
     inputs:
       tag:
-        description: 'Tag for the Docker image'
+        description: "Tag for the Docker image"
         required: false
-        default: 'latest'
+        default: "latest"
         type: string
 
 jobs:
@@ -23,10 +23,11 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-        
+
       - name: Create .env file
         run: |
           echo "WEB_URL=http://localhost:3000" > .env
+          echo "DOCKER_BUILD=true" >> .env
           echo "NEXT_PUBLIC_CAP_AWS_BUCKET=capso" >> .env
           echo "NEXT_PUBLIC_CAP_AWS_REGION=us-east-1" >> .env
           cat .env
@@ -59,4 +60,4 @@ jobs:
           cache-to: type=gha,mode=max
 
       - name: Show Docker Images
-        run: docker images
+        run: docker images

apps/desktop/src/routes/(window-chrome)/settings/general.tsx

@@ -259,16 +259,19 @@ function Inner(props: { initialStore: GeneralSettingsStore | null }) {
           <ServerURLSetting
             value={settings.serverUrl ?? "https://cap.so"}
             onChange={async (v) => {
+              const url = new URL(v);
+              const origin = url.origin;
+
               if (
                 !(await confirm(
-                  `Are you sure you want to change the server URL to '${v}'? You will need to sign in again.`
+                  `Are you sure you want to change the server URL to '${origin}'? You will need to sign in again.`
                 ))
               )
                 return;
 
               await authStore.set(undefined);
-              await commands.setServerUrl(v);
-              handleChange("serverUrl", v);
+              await commands.setServerUrl(origin);
+              handleChange("serverUrl", origin);
             }}
           />
         </div>

apps/desktop/src/utils/auth.ts

@@ -95,20 +95,28 @@ async function createLocalServerSession(signal: AbortSignal) {
 
       if (signal.aborted) throw new Error("Sign in aborted");
 
-      return paramsValidator.parse({
-        type: url.searchParams.get("type"),
-        api_key: url.searchParams.get("api_key"),
-        user_id: url.searchParams.get("user_id"),
-      });
+      const a = [...url.searchParams].reduce((acc, [k, v]) => {
+        acc[k] = v;
+        return acc;
+      }, {} as any);
+
+      return paramsValidator.parse(a);
     },
   };
 }
 
-const paramsValidator = z.object({
-  type: z.literal("api_key"),
-  api_key: z.string(),
-  user_id: z.string(),
-});
+const paramsValidator = z.union([
+  z.object({
+    type: z.literal("api_key"),
+    api_key: z.string(),
+    user_id: z.string(),
+  }),
+  z.object({
+    token: z.string(),
+    user_id: z.string(),
+    expires: z.coerce.number(),
+  }),
+]);
 
 async function createDeepLinkSession(signal: AbortSignal) {
   let res: (data: z.infer<typeof paramsValidator>) => void;
@@ -122,11 +130,12 @@ async function createDeepLinkSession(signal: AbortSignal) {
       const url = new URL(urlString);
 
       res(
-        paramsValidator.parse({
-          type: url.searchParams.get("type"),
-          api_key: url.searchParams.get("api_key"),
-          user_id: url.searchParams.get("user_id"),
-        })
+        paramsValidator.parse(
+          [...url.searchParams].reduce((acc, [k, v]) => {
+            acc[k] = v;
+            return acc;
+          }, {} as any)
+        )
       );
     }
   });
@@ -147,7 +156,10 @@ async function processAuthData(data: z.infer<typeof paramsValidator>) {
 
   const existingAuth = await authStore.get();
   await authStore.set({
-    secret: { api_key: data.api_key },
+    secret:
+      "api_key" in data
+        ? { api_key: data.api_key }
+        : { token: data.token, expires: data.expires },
     user_id: data.user_id,
     intercom_hash: existingAuth?.intercom_hash ?? "",
     plan: null,

apps/web/app/api/selfhosted/migrations/route.ts

@@ -2,7 +2,7 @@ import { NextResponse } from "next/server";
 import { db } from "@cap/database";
 import { migrate } from "drizzle-orm/mysql2/migrator";
 import path from "path";
-import { serverEnv } from "@cap/env";
+import { buildEnv } from "@cap/env";
 
 const migrations = {
   run: false,
@@ -16,7 +16,7 @@ export async function POST() {
     });
   }
 
-  const isDockerBuild = serverEnv().DOCKER_BUILD === "true";
+  const isDockerBuild = buildEnv.NEXT_PUBLIC_DOCKER_BUILD === "true";
   if (isDockerBuild) {
     try {
       console.log("🔍 DB migrations triggered");