feat: the rest of the owl

packages/lib/constants/feature-flags.ts

@@ -25,6 +25,7 @@ export const LOCAL_FEATURE_FLAGS: Record<string, boolean> = {
   app_teams: true,
   app_document_page_view_history_sheet: false,
   marketing_header_single_player_mode: false,
+  marketing_profiles_announcement_bar: true,
 } as const;
 
 /**

packages/lib/errors/app-error.ts

@@ -19,6 +19,7 @@ export enum AppErrorCode {
   'SCHEMA_FAILED' = 'SchemaFailed',
   'TOO_MANY_REQUESTS' = 'TooManyRequests',
   'PROFILE_URL_TAKEN' = 'ProfileUrlTaken',
+  'PREMIUM_PROFILE_URL' = 'PremiumProfileUrl',
 }
 
 const genericErrorCodeToTrpcErrorCodeMap: Record<string, TRPCError['code']> = {
@@ -34,6 +35,7 @@ const genericErrorCodeToTrpcErrorCodeMap: Record<string, TRPCError['code']> = {
   [AppErrorCode.SCHEMA_FAILED]: 'INTERNAL_SERVER_ERROR',
   [AppErrorCode.TOO_MANY_REQUESTS]: 'TOO_MANY_REQUESTS',
   [AppErrorCode.PROFILE_URL_TAKEN]: 'BAD_REQUEST',
+  [AppErrorCode.PREMIUM_PROFILE_URL]: 'BAD_REQUEST',
 };
 
 export const ZAppErrorJsonSchema = z.object({

packages/lib/server-only/user/create-user.ts

@@ -7,15 +7,17 @@ import { IdentityProvider, Prisma, TeamMemberInviteStatus } from '@documenso/pri
 
 import { IS_BILLING_ENABLED } from '../../constants/app';
 import { SALT_ROUNDS } from '../../constants/auth';
+import { AppError, AppErrorCode } from '../../errors/app-error';
 
 export interface CreateUserOptions {
   name: string;
   email: string;
   password: string;
   signature?: string | null;
+  url?: string;
 }
 
-export const createUser = async ({ name, email, password, signature }: CreateUserOptions) => {
+export const createUser = async ({ name, email, password, signature, url }: CreateUserOptions) => {
   const hashedPassword = await hash(password, SALT_ROUNDS);
 
   const userExists = await prisma.user.findFirst({
@@ -28,6 +30,22 @@ export const createUser = async ({ name, email, password, signature }: CreateUse
     throw new Error('User already exists');
   }
 
+  if (url) {
+    const urlExists = await prisma.user.findFirst({
+      where: {
+        url,
+      },
+    });
+
+    if (urlExists) {
+      throw new AppError(
+        AppErrorCode.PROFILE_URL_TAKEN,
+        'Profile username is taken',
+        'The profile username is already taken',
+      );
+    }
+  }
+
   const user = await prisma.user.create({
     data: {
       name,
@@ -35,6 +53,7 @@ export const createUser = async ({ name, email, password, signature }: CreateUse
       password: hashedPassword,
       signature,
       identityProvider: IdentityProvider.DOCUMENSO,
+      url,
     },
   });
 

packages/lib/server-only/user/update-public-profile.ts

@@ -23,8 +23,8 @@ export const updatePublicProfile = async ({ userId, url }: UpdatePublicProfileOp
   if (isUrlTaken) {
     throw new AppError(
       AppErrorCode.PROFILE_URL_TAKEN,
-      'Profile URL is taken',
-      'The profile URL is already taken',
+      'Profile username is taken',
+      'The profile username is already taken',
     );
   }
 

packages/trpc/server/auth-router/router.ts

@@ -1,6 +1,8 @@
 import { TRPCError } from '@trpc/server';
 import { env } from 'next-runtime-env';
 
+import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { ErrorCode } from '@documenso/lib/next-auth/error-codes';
 import { compareSync } from '@documenso/lib/server-only/auth/hash';
 import { createUser } from '@documenso/lib/server-only/user/create-user';
@@ -21,14 +23,29 @@ export const authRouter = router({
         });
       }
 
-      const { name, email, password, signature } = input;
+      const { name, email, password, signature, url } = input;
 
-      const user = await createUser({ name, email, password, signature });
+      if ((true || IS_BILLING_ENABLED()) && url && url.length <= 6) {
+        throw new AppError(
+          AppErrorCode.PREMIUM_PROFILE_URL,
+          'Only subscribers can have a username shorter than 6 characters',
+        );
+      }
+
+      const user = await createUser({ name, email, password, signature, url });
 
       await sendConfirmationToken({ email: user.email });
 
       return user;
     } catch (err) {
+      console.log(err);
+
+      const error = AppError.parseError(err);
+
+      if (error.code !== AppErrorCode.UNKNOWN_ERROR) {
+        throw AppError.parseErrorToTRPCError(error);
+      }
+
       let message =
         'We were unable to create your account. Please review the information you provided and try again.';
 

packages/trpc/server/auth-router/schema.ts

@@ -21,6 +21,7 @@ export const ZSignUpMutationSchema = z.object({
   email: z.string().email(),
   password: ZPasswordSchema,
   signature: z.string().min(1, { message: 'A signature is required.' }),
+  url: z.string().optional(),
 });
 
 export type TSignUpMutationSchema = z.infer<typeof ZSignUpMutationSchema>;

packages/trpc/server/profile-router/router.ts

@@ -1,6 +1,8 @@
 import { TRPCError } from '@trpc/server';
 
+import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { getSubscriptionsByUserId } from '@documenso/lib/server-only/subscription/get-subscriptions-by-user-id';
 import { deleteUser } from '@documenso/lib/server-only/user/delete-user';
 import { findUserSecurityAuditLogs } from '@documenso/lib/server-only/user/find-user-security-audit-logs';
 import { forgotPassword } from '@documenso/lib/server-only/user/forgot-password';
@@ -11,6 +13,7 @@ import { updatePassword } from '@documenso/lib/server-only/user/update-password'
 import { updateProfile } from '@documenso/lib/server-only/user/update-profile';
 import { updatePublicProfile } from '@documenso/lib/server-only/user/update-public-profile';
 import { extractNextApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
+import { SubscriptionStatus } from '@documenso/prisma/client';
 
 import { adminProcedure, authenticatedProcedure, procedure, router } from '../trpc';
 import {
@@ -83,6 +86,21 @@ export const profileRouter = router({
       try {
         const { url } = input;
 
+        if (IS_BILLING_ENABLED() && url.length <= 6) {
+          const subscriptions = await getSubscriptionsByUserId({
+            userId: ctx.user.id,
+          }).then((subscriptions) =>
+            subscriptions.filter((s) => s.status === SubscriptionStatus.ACTIVE),
+          );
+
+          if (subscriptions.length === 0) {
+            throw new AppError(
+              AppErrorCode.PREMIUM_PROFILE_URL,
+              'Only subscribers can have a username shorter than 6 characters',
+            );
+          }
+        }
+
         const user = await updatePublicProfile({
           userId: ctx.user.id,
           url,

packages/trpc/server/profile-router/schema.ts

@@ -17,7 +17,14 @@ export const ZUpdateProfileMutationSchema = z.object({
 });
 
 export const ZUpdatePublicProfileMutationSchema = z.object({
-  url: z.string().min(1),
+  url: z
+    .string()
+    .trim()
+    .toLowerCase()
+    .min(1, { message: 'Please enter a valid username.' })
+    .regex(/^[a-z0-9-]+$/, {
+      message: 'Username can only container alphanumeric characters and dashes.',
+    }),
 });
 
 export const ZUpdatePasswordMutationSchema = z.object({

packages/ui/primitives/announcement-bar.tsx

@@ -1,32 +0,0 @@
-import Link from 'next/link';
-
-import { cn } from '../lib/utils';
-
-interface AnnouncementBarProps {
-  isShown: boolean;
-  className: string;
-}
-
-export const AnnouncementBar: React.FC<AnnouncementBarProps> = ({ isShown, className }) => {
-  return (
-    isShown && (
-      <div
-        className={cn(
-          'flex h-full w-full items-center justify-center gap-4 border-b-2 p-1',
-          className,
-        )}
-      >
-        <div className="text-center">
-          <span className="text-sm text-white">Claim your documenso public profile URL now!</span>{' '}
-          <span className="text-sm font-medium text-white">documenso.com/u/yourname</span>
-        </div>
-
-        <div className="flex items-center justify-center gap-4 rounded-lg bg-white px-3 py-1">
-          <div className="text-xs text-gray-900">
-            <Link href="https://app.documenso.com">Claim now</Link>
-          </div>
-        </div>
-      </div>
-    )
-  );
-};