Merge branch 'dev' into main

Author: gustavotoyota

apps/app-server/src/trpc/api/users/account/stripe/create-checkout-session.ts

@@ -109,8 +109,7 @@ export async function createCheckoutSession({
 
         customer: customer.id,
 
-        success_url: `${ctx.req.headers['origin']}/subscribed#/subscribed`,
-        cancel_url: `${ctx.req.headers['origin']}/pricing#/pricing`,
+        success_url: `${ctx.req.headers['origin']}/subscribed`,
       });
 
       if (session.url == null) {

apps/app-server/src/trpc/api/users/account/stripe/create-portal-session.ts

@@ -2,21 +2,15 @@ import { checkRedlockSignalAborted } from '@stdlib/redlock';
 import { once } from 'lodash';
 import type { InferProcedureOpts } from 'src/trpc/helpers';
 import { authProcedure } from 'src/trpc/helpers';
-import { z } from 'zod';
 
-const baseProcedure = authProcedure.input(
-  z.object({
-    returnUrl: z.string().url(),
-  }),
-);
+const baseProcedure = authProcedure;
 
 export const createPortalSessionProcedure = once(() =>
   baseProcedure.mutation(createPortalSession),
 );
 
 export async function createPortalSession({
   ctx,
-  input,
 }: InferProcedureOpts<typeof baseProcedure>) {
   return await ctx.usingLocks(
     [[`user-lock:${ctx.userId}`]],
@@ -39,7 +33,6 @@ export async function createPortalSession({
 
       const portalSession = await ctx.stripe.billingPortal.sessions.create({
         customer: customerId,
-        return_url: input.returnUrl,
       });
 
       // Return portal session URL

apps/client/src-electron/electron-main.ts

@@ -68,6 +68,7 @@ function createWindow() {
       contextIsolation: true,
       // More info: https://v2.quasar.dev/quasar-cli-vite/developing-electron-apps/electron-preload-script
       preload: path.resolve(__dirname, process.env.QUASAR_ELECTRON_PRELOAD),
+      devTools: !!process.env.DEBUGGING,
     },
     show: false,
   });
@@ -79,13 +80,20 @@ function createWindow() {
 
   if (!process.env.DEBUGGING) {
     mainWindow.setMenuBarVisibility(false);
-
-    // we're on production; no access to devtools pls
-    mainWindow.webContents.on('devtools-opened', () => {
-      mainWindow?.webContents.closeDevTools();
-    });
   }
 
+  mainWindow.webContents.setWindowOpenHandler((details) => {
+    return {
+      action: 'allow',
+      overrideBrowserWindowOptions: {
+        autoHideMenuBar: true,
+        webPreferences: {
+          devTools: false,
+        },
+      },
+    };
+  });
+
   mainWindow.on('closed', () => {
     mainWindow = undefined;
   });
@@ -105,7 +113,7 @@ function createWindow() {
     obj[key] = value;
   }
 
-  function getValue(obj: any, key: string) {
+  function getValue(obj: any, key: string): string | undefined {
     const lowerCaseKey = key.toLowerCase();
 
     for (const key of Object.keys(obj)) {
@@ -160,21 +168,23 @@ function createWindow() {
         const cookieName = Object.keys(parsedCookie)[0];
 
         const expires = getValue(parsedCookie, 'Expires');
-        const sameSite = getValue(parsedCookie, 'SameSite');
+        const sameSite = getValue(parsedCookie, 'SameSite')?.toLowerCase();
 
-        const cookieDetails = {
+        const cookieDetails: Electron.CookiesSetDetails = {
           url: 'https://deepnotes.app',
           name: cookieName,
           value: parsedCookie[cookieName],
-          // domain: getValue(parsedCookie, 'Domain'),
-          // path: getValue(parsedCookie, 'Path'),
-          // secure: getValue(parsedCookie, 'Secure'),
-          // httpOnly: getValue(parsedCookie, 'HttpOnly'),
+          domain: getValue(parsedCookie, 'Domain'),
+          path: getValue(parsedCookie, 'Path'),
+          secure: getValue(parsedCookie, 'Secure') != null,
+          httpOnly: getValue(parsedCookie, 'HttpOnly') != null,
           expirationDate: expires ? new Date(expires).getTime() : undefined,
-          // sameSite:
-          //   sameSite?.toLowerCase() !== 'none'
-          //     ? sameSite?.toLowerCase()
-          //     : 'no_restriction',
+          sameSite:
+            sameSite == null
+              ? 'lax'
+              : sameSite === 'none'
+              ? 'no_restriction'
+              : (sameSite as any),
         };
 
         void mainWindow?.webContents.session.cookies

apps/client/src/pages/home/Download/Download.vue

@@ -209,7 +209,7 @@ import { multiModePath } from 'src/code/utils/misc';
 
 import PlatformCard from './PlatformCard.vue';
 
-const version = '1.0.0';
+const version = '1.0.1';
 
 const loading = ref(true);
 

apps/client/src/pages/home/Pricing/Pricing.vue

@@ -148,15 +148,13 @@ async function createCheckoutSession() {
   const { checkoutSessionUrl } =
     await trpcClient.users.account.stripe.createCheckoutSession.mutate();
 
-  location.href = checkoutSessionUrl;
+  window.open(checkoutSessionUrl, '_blank');
 }
 
 async function createPortalSession() {
   const { portalSessionUrl } =
-    await trpcClient.users.account.stripe.createPortalSession.mutate({
-      returnUrl: location.href,
-    });
+    await trpcClient.users.account.stripe.createPortalSession.mutate();
 
-  location.href = portalSessionUrl;
+  window.open(portalSessionUrl, '_blank');
 }
 </script>

captain-definition-app-server

@@ -2,6 +2,6 @@
   "schemaVersion": 2,
   "caproverName": "captain-01",
   "caproverApp": "deepnotes-app-server",
-  "branch": "main",
+  "branch": "dev",
   "dockerfilePath": "./apps/app-server/Dockerfile"
 }

captain-definition-client

@@ -2,6 +2,6 @@
   "schemaVersion": 2,
   "caproverName": "captain-01",
   "caproverApp": "deepnotes-client",
-  "branch": "main",
+  "branch": "dev",
   "dockerfilePath": "./apps/client/Dockerfile"
 }

captain-definition-collab-server

@@ -2,6 +2,6 @@
   "schemaVersion": 2,
   "caproverName": "captain-01",
   "caproverApp": "deepnotes-collab-server",
-  "branch": "main",
+  "branch": "dev",
   "dockerfilePath": "./apps/collab-server/Dockerfile"
 }

captain-definition-realtime-server

@@ -2,6 +2,6 @@
   "schemaVersion": 2,
   "caproverName": "captain-01",
   "caproverApp": "deepnotes-realtime-server",
-  "branch": "main",
+  "branch": "dev",
   "dockerfilePath": "./apps/realtime-server/Dockerfile"
 }

captain-definition-scheduler

@@ -2,6 +2,6 @@
   "schemaVersion": 2,
   "caproverName": "captain-01",
   "caproverApp": "deepnotes-scheduler",
-  "branch": "main",
+  "branch": "dev",
   "dockerfilePath": "./apps/scheduler/Dockerfile"
 }