clean up

Author: Kitenite

apps/web/client/public/onlook-preload-script.js

@@ -12,7 +12,6 @@ export async function GET(request: Request) {
         const supabase = await createClient();
         const { error, data } = await supabase.auth.exchangeCodeForSession(code);
         if (!error) {
-            const forwardedHost = request.headers.get('x-forwarded-host'); // original origin before load balancer
             const user = await api.user.upsert({
                 id: data.user.id,
             });
@@ -35,6 +34,7 @@ export async function GET(request: Request) {
                 }
             });
 
+            const forwardedHost = request.headers.get('x-forwarded-host');
             // Redirect to the redirect page which will handle the return URL
             if (forwardedHost) {
                 const forwardedProto = request.headers.get('x-forwarded-proto') || 'https';

apps/web/client/src/app/auth/callback/route.ts

@@ -1,8 +1,9 @@
 'use client';
 
 import { api } from '@/trpc/react';
-import { LocalForageKeys, Routes } from '@/utils/constants';
+import { Routes } from '@/utils/constants';
 import { createClient } from '@/utils/supabase/client';
+import { getReturnUrlQueryParam } from '@/utils/url';
 import { Button } from '@onlook/ui/button';
 import { Icons } from '@onlook/ui/icons';
 import { Skeleton } from '@onlook/ui/skeleton';
@@ -32,7 +33,7 @@ export function Main({ invitationId }: { invitationId: string }) {
         const supabase = createClient();
         await supabase.auth.signOut();
         const currentUrl = `${pathname}${searchParams.toString() ? `?${searchParams.toString()}` : ''}`;
-        router.push(`${Routes.LOGIN}?${LocalForageKeys.RETURN_URL}=${currentUrl}`);
+        router.push(`${Routes.LOGIN}?${getReturnUrlQueryParam(currentUrl)}`);
     }
 
     const error = getInvitationError || acceptInvitationError;

apps/web/client/src/app/invitation/[id]/_components/main.tsx

@@ -1,6 +1,6 @@
 import { useStateManager } from '@/components/store/state';
 import { transKeys } from '@/i18n/keys';
-import { Links } from '@onlook/constants';
+import { Links, SUPPORT_EMAIL } from '@onlook/constants';
 import {
     DropdownMenu,
     DropdownMenuContent,
@@ -128,7 +128,7 @@ export const HelpDropdown = observer(() => {
                             {t(transKeys.help.menu.contactUs.github)}
                         </DropdownMenuItem>
                         <DropdownMenuItem
-                            onClick={() => window.open('mailto:[email protected]', '_blank')}
+                            onClick={() => window.open(`mailto:${SUPPORT_EMAIL}`, '_blank')}
                         >
                             <Icons.EnvelopeClosed className="w-4 h-4 mr-2" />
                             {t(transKeys.help.menu.contactUs.email)}

apps/web/client/src/app/project/[id]/_components/left-panel/help-dropdown/index.tsx

@@ -1,5 +1,6 @@
 import { api } from "@/trpc/server";
 import { Routes } from "@/utils/constants";
+import { SUPPORT_EMAIL } from "@onlook/constants";
 import { Icons } from "@onlook/ui/icons/index";
 import Link from "next/link";
 
@@ -13,7 +14,6 @@ export default async function Layout({ params, children }: Readonly<{ params: Pr
 }
 
 const NoAccess = () => {
-    const SUPPORT_EMAIL = '[email protected]';
     return (
         <main className="flex flex-1 flex-col items-center justify-center h-screen w-screen p-4 text-center">
             <div className="space-y-6">

apps/web/client/src/app/project/[id]/layout.tsx

@@ -2,6 +2,7 @@ import { prepareCommitMessage, sanitizeCommitMessage } from '@/utils/git';
 import { type GitCommit } from '@onlook/git';
 import stripAnsi from 'strip-ansi';
 import type { EditorEngine } from '../engine';
+import { SUPPORT_EMAIL } from '@onlook/constants';
 
 export const ONLOOK_DISPLAY_NAME_NOTE_REF = 'refs/notes/onlook-display-name';
 
@@ -16,7 +17,7 @@ export interface GitCommandResult {
 }
 
 export class GitManager {
-    constructor(private editorEngine: EditorEngine) {}
+    constructor(private editorEngine: EditorEngine) { }
 
     /**
      * Check if git repository is initialized
@@ -63,7 +64,7 @@ export class GitManager {
             // Set user.email if not configured
             if (!hasEmail) {
                 const emailConfigResult = await this.runCommand(
-                    'git config user.email "[email protected]"',
+                    `git config user.email "${SUPPORT_EMAIL}"`,
                 );
                 if (!emailConfigResult.success) {
                     console.error('Failed to set git user.email:', emailConfigResult.error);

apps/web/client/src/components/store/editor/version/git.ts

@@ -0,0 +1 @@
+export const SUPPORT_EMAIL = '[email protected]';

packages/constants/src/contact.ts

@@ -1,4 +1,5 @@
 export * from './colors';
+export * from './contact';
 export * from './csb';
 export * from './dom';
 export * from './editor';

packages/constants/src/index.ts

@@ -1,21 +1,20 @@
+import { SUPPORT_EMAIL } from '@onlook/constants';
 import { render } from '@react-email/components';
 import { type InviteUserEmailProps, InviteUserEmail } from './templates';
 import type { SendEmailParams } from './types/send-email';
 
 export const sendInvitationEmail = async (...params: SendEmailParams<InviteUserEmailProps>) => {
     const [client, inviteParams, { dryRun = false } = {}] = params;
-    const { inviteeEmail, invitedByEmail, inviteLink, invitedByName } = inviteParams;
+    const { inviteeEmail, invitedByEmail, invitedByName } = inviteParams;
 
     if (dryRun) {
-        const rendered = await render(
-            InviteUserEmail({ inviteeEmail, invitedByEmail, inviteLink }),
-        );
+        const rendered = await render(InviteUserEmail(inviteParams));
         console.log(rendered);
         return;
     }
 
     return await client.emails.send({
-        from: 'Onlook <[email protected]>',
+        from: `Onlook <${SUPPORT_EMAIL}>`,
         to: inviteeEmail,
         subject: `Join ${invitedByName ?? invitedByEmail} on Onlook`,
         react: InviteUserEmail(inviteParams),