Fix tests

airtai · Sep 3, 2024 · 889dabb · 889dabb
1 parent 2deabc8
commit 889dabb
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 20 deletions.
diff --git a/app/src/client/app/layout/ChatLayout.tsx b/app/src/client/app/layout/ChatLayout.tsx
@@ -36,11 +36,12 @@ const ChatLayout: FC<Props> = ({
   useEffect(() => {
     if (!user) {
       history.push('/login');
-    } else {
-      if (!user.hasPaid && user.isSignUpComplete) {
-        history.push('/pricing');
-      }
     }
+    // else {
+    //   if (!user.hasPaid && user.isSignUpComplete) {
+    //     history.push('/pricing');
+    //   }
+    // }
   }, [user, history]);
 
   useSocketListener('newMessageFromTeam', () => setShouldAutoScroll(true));

diff --git a/app/src/client/auth/LoginSignupForm.tsx b/app/src/client/auth/LoginSignupForm.tsx
@@ -154,7 +154,7 @@ export const LoginSignupForm = ({
           handleTocChange={handleTocChange}
           marketingEmailsChecked={marketingEmailsChecked}
           handleMarketingEmailsChange={handleMarketingEmailsChange}
-          errorMessage={errorMessage}
+          errorMessage={null}
         />
       )}
       <SocialAuth>

diff --git a/app/src/client/components/DropdownUser.tsx b/app/src/client/components/DropdownUser.tsx
@@ -7,7 +7,7 @@ import { AuthUser } from 'wasp/auth';
 
 const DropdownUser = ({ user }: { user: AuthUser }) => {
   const [dropdownOpen, setDropdownOpen] = useState(false);
-  const username = user.username || user.identities.username?.id;
+  const username = user.username || user.identities?.username?.id;
 
   const trigger = useRef<any>(null);
   const dropdown = useRef<any>(null);

diff --git a/app/src/client/components/TosAndMarketingEmails.tsx b/app/src/client/components/TosAndMarketingEmails.tsx
@@ -57,15 +57,15 @@ const TosAndMarketingEmails: React.FC<TosAndMarketingEmailsProps> = ({
         <span className='checkmark'></span>
       </label>
     </div>
-    {/* {errorMessage && (
+    {errorMessage && (
       <div className='text-sm'>
         <MessageError>
           {errorMessage.title}
           {errorMessage.description && ': '}
           {errorMessage.description}
         </MessageError>
       </div>
-    )} */}
+    )}
   </div>
 );
 

diff --git a/app/src/client/tests/App.test.tsx b/app/src/client/tests/App.test.tsx
@@ -41,6 +41,9 @@ function setupMocks(mockUser: any, pathName = '/') {
   // Always mock useAuth with provided user data
   vi.doMock('wasp/client/auth', () => ({ useAuth: () => mockUser }));
 
+  // Mock Wasp API and handleApiError functions
+  vi.doMock('wasp/client/api', () => ({ api: () => vi.fn(), handleApiError: () => vi.fn() }));
+
   // Correctly mock useLocation to consistently return a pathname
   vi.doMock('react-router-dom', () => ({
     ...vi.importActual('react-router-dom'), // Maintain other hooks and routing components

diff --git a/app/src/server/actions.ts b/app/src/server/actions.ts
@@ -285,9 +285,9 @@ export const createNewChat: CreateNewChat<any, Chat> = async (args, context) =>
     throw new HttpError(401);
   }
 
-  if (!context.user.hasPaid) {
-    throw new HttpError(500, 'No Subscription Found');
-  }
+  // if (!context.user.hasPaid) {
+  //   throw new HttpError(500, 'No Subscription Found');
+  // }
 
   const chat = await context.entities.Chat.create({
     data: {
@@ -422,9 +422,9 @@ export const createNewAndReturnAllConversations: CreateNewAndReturnAllConversati
     throw new HttpError(401);
   }
 
-  if (!context.user.hasPaid) {
-    throw new HttpError(500, 'No Subscription Found');
-  }
+  // if (!context.user.hasPaid) {
+  //   throw new HttpError(500, 'No Subscription Found');
+  // }
 
   await context.entities.Conversation.create({
     data: {
@@ -454,9 +454,9 @@ export const createNewAndReturnLastConversation: CreateNewAndReturnLastConversat
     throw new HttpError(401);
   }
 
-  if (!context.user.hasPaid) {
-    throw new HttpError(500, 'No Subscription Found');
-  }
+  // if (!context.user.hasPaid) {
+  //   throw new HttpError(500, 'No Subscription Found');
+  // }
 
   return await context.entities.Conversation.create({
     data: {

diff --git a/app/src/server/auth/setUsername.ts b/app/src/server/auth/setUsername.ts
@@ -11,7 +11,7 @@ export const getGoogleUserFields = defineUserSignupFields({
   },
   email: (data: any) => data.profile.email,
   isAdmin: (data: any) => adminEmails.includes(data.profile.email),
-  hasPaid: () => true,
+  // hasPaid: () => true,
   isSetUpComplete: () => false,
 });
 

diff --git a/app/src/server/websocket/webSocket.js b/app/src/server/websocket/webSocket.js
@@ -52,10 +52,10 @@ export const socketFn = (io, context) => {
   // When a new user is connected
   io.on('connection', async (socket) => {
     if (socket.data.user) {
-      const userEmail = socket.data.user.email;
+      const username = socket.data.user.username || socket.data.user.identities.username.id;
       const userUUID = socket.data.user.uuid;
       console.log('========');
-      console.log('a user connected: ', userEmail);
+      console.log('a user connected: ', username);
 
       socket.on(
         'sendMessageToTeam',