feat: add organisations (#1820)

packages/auth/server/lib/session/session.ts

@@ -22,8 +22,6 @@ export type SessionUser = Pick<
   | 'twoFactorEnabled'
   | 'roles'
   | 'signature'
-  | 'url'
-  | 'customerId'
 >;
 
 export type SessionValidationResult =
@@ -99,8 +97,6 @@ export const validateSessionToken = async (token: string): Promise<SessionValida
           twoFactorEnabled: true,
           roles: true,
           signature: true,
-          url: true,
-          customerId: true,
         },
       },
     },

packages/auth/server/lib/utils/handle-oauth-callback-url.ts

@@ -2,7 +2,6 @@ import { UserSecurityAuditLogType } from '@prisma/client';
 import { OAuth2Client, decodeIdToken } from 'arctic';
 import type { Context } from 'hono';
 import { deleteCookie } from 'hono/cookie';
-import { nanoid } from 'nanoid';
 
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { onCreateUserHook } from '@documenso/lib/server-only/user/create-user';
@@ -54,7 +53,7 @@ export const handleOAuthCallbackUrl = async (options: HandleOAuthCallbackUrlOpti
   let [redirectState, redirectPath] = storedRedirectPath.split(' ');
 
   if (redirectState !== storedState || !redirectPath) {
-    redirectPath = '/documents';
+    redirectPath = '/';
   }
 
   const tokens = await oAuthClient.validateAuthorizationCode(
@@ -164,7 +163,6 @@ export const handleOAuthCallbackUrl = async (options: HandleOAuthCallbackUrlOpti
         email: email,
         name: name,
         emailVerified: new Date(),
-        url: nanoid(17),
       },
     });
 

packages/auth/server/lib/utils/redirect.ts

@@ -11,17 +11,17 @@ export const handleRequestRedirect = (redirectUrl?: string) => {
   const url = new URL(redirectUrl, NEXT_PUBLIC_WEBAPP_URL());
 
   if (url.origin !== NEXT_PUBLIC_WEBAPP_URL()) {
-    window.location.href = '/documents';
+    window.location.href = '/';
   } else {
     window.location.href = redirectUrl;
   }
 };
 
-export const handleSignInRedirect = (redirectUrl: string = '/documents') => {
+export const handleSignInRedirect = (redirectUrl: string = '/') => {
   const url = new URL(redirectUrl, NEXT_PUBLIC_WEBAPP_URL());
 
   if (url.origin !== NEXT_PUBLIC_WEBAPP_URL()) {
-    window.location.href = '/documents';
+    window.location.href = '/';
   } else {
     window.location.href = redirectUrl;
   }

packages/auth/server/routes/email-password.ts

@@ -5,7 +5,6 @@ import { Hono } from 'hono';
 import { DateTime } from 'luxon';
 import { z } from 'zod';
 
-import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
 import { EMAIL_VERIFICATION_STATE } from '@documenso/lib/constants/email';
 import { AppError } from '@documenso/lib/errors/app-error';
 import { jobsClient } from '@documenso/lib/jobs/client';
@@ -148,15 +147,12 @@ export const emailPasswordRoute = new Hono<HonoAuthContext>()
       });
     }
 
-    const { name, email, password, signature, url } = c.req.valid('json');
+    const { name, email, password, signature } = c.req.valid('json');
 
-    if (IS_BILLING_ENABLED() && url && url.length < 6) {
-      throw new AppError('PREMIUM_PROFILE_URL', {
-        message: 'Only subscribers can have a username shorter than 6 characters',
-      });
-    }
-
-    const user = await createUser({ name, email, password, signature, url });
+    const user = await createUser({ name, email, password, signature }).catch((err) => {
+      console.error(err);
+      throw err;
+    });
 
     await jobsClient.triggerJob({
       name: 'send.signup.confirmation.email',

packages/auth/server/routes/passkey.ts

@@ -114,7 +114,7 @@ export const passkeyRoute = new Hono<HonoAuthContext>()
 
     return c.json(
       {
-        url: '/documents',
+        url: '/',
       },
       200,
     );

packages/auth/server/types/email-password.ts

@@ -37,15 +37,6 @@ export const ZSignUpSchema = z.object({
   email: z.string().email(),
   password: ZPasswordSchema,
   signature: z.string().nullish(),
-  url: z
-    .string()
-    .trim()
-    .toLowerCase()
-    .min(1)
-    .regex(/^[a-z0-9-]+$/, {
-      message: 'Username can only container alphanumeric characters and dashes.',
-    })
-    .optional(),
 });
 
 export type TSignUpSchema = z.infer<typeof ZSignUpSchema>;