Merge pull request #30 from vanthaita/feat-auth

feat: add middleware, update message component type
TDevUIT · Sep 12, 2024 · 0c36de1 · 0c36de1
2 parents cf20a04 + 225667a
commit 0c36de1
Show file tree

Hide file tree

Showing 15 changed files with 131 additions and 310 deletions.
diff --git a/Server/src/Gateway/chat.gateway.ts b/Server/src/Gateway/chat.gateway.ts
@@ -71,15 +71,14 @@ export class ChatGateway implements OnGatewayConnection, OnGatewayDisconnect {
     );
 
     try {
-      //  console.log('Content: ', message);
       const sending = await this.chatService.sendMessage(
         parseInt(message.roomId, 10),
         userProfile.id,
         message.message,
       );
 
       this.server.to(message.roomId).emit('receiveMessage', {
-        id: userProfile.id + message.roomId + message.message.length,
+        id: sending.id,
         createdAt: sending.createdAt,
         roomId: 1,
         message: message.message,
@@ -151,4 +150,4 @@ export class ChatGateway implements OnGatewayConnection, OnGatewayDisconnect {
       client.emit('error', { message: 'Failed to leave room' });
     }
   }
-}
+}
diff --git a/Server/src/auth/auth.controller.ts b/Server/src/auth/auth.controller.ts
@@ -30,10 +30,11 @@ export class AuthController {
     const authRes = await this.authService.authenticate(googleToken);
 
     res.cookie('access_token', authRes.access_token, { httpOnly: true });
-    res.send({
-      message: 'Successfully logged in',
-      access_token: authRes.access_token,
-    });
+    res.redirect(`${process.env.Client_URL}/messages`);
+    // res.send({
+    //   message: 'Successfully logged in',
+    //   access_token: authRes.access_token,
+    // });
   }
 
   @UseGuards(JWTAuthGuard)

diff --git a/Server/src/chat/chat.controller.ts b/Server/src/chat/chat.controller.ts
@@ -1,4 +1,4 @@
-import { Controller, Get, Post, Body, Patch, Param, Delete } from '@nestjs/common';
+import { Controller, Get, Post, Body, Patch, Param, Delete, Query } from '@nestjs/common';
 import { ChatService } from './chat.service';
 import { CreateChatDto } from './dto/create-chat.dto';
 import { UpdateChatDto } from './dto/update-chat.dto';
@@ -17,7 +17,7 @@ export class ChatController {
   }
 
   @Get(':roomId')
-  async getMessagesByRoom(@Param('roomId') roomId: number) {
+  async getMessagesByRoom(@Query('roomId') roomId: number) {
     return this.chatService.getMessagesByRoom(roomId);
   }
 }
diff --git a/client/src/app/chat/Chat.module.css b/client/src/app/chat/Chat.module.css
diff --git a/client/src/app/chat/chat.tsx b/client/src/app/chat/chat.tsx
diff --git a/client/src/app/chat/page.tsx b/client/src/app/chat/page.tsx
diff --git a/client/src/app/error.tsx b/client/src/app/error.tsx
@@ -2,6 +2,7 @@
 
 import Link from "next/link";
 import ButtonSupport from "@/components/ButtonSupport";
+import { Button } from "@/components/ui/button";
 // A simple error boundary to show a nice error page if something goes wrong (Error Boundary)
 // Users can contanct support, go to the main page or try to reset/refresh to fix the error
 export default function Error({
@@ -151,22 +152,24 @@ export default function Error({
             </svg>
             Refresh
           </button>
-          <ButtonSupport />
-          <Link href="/" className="btn btn-sm">
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              viewBox="0 0 20 20"
-              fill="currentColor"
-              className="w-5 h-5"
-            >
-              <path
-                fillRule="evenodd"
-                d="M9.293 2.293a1 1 0 011.414 0l7 7A1 1 0 0117 11h-1v6a1 1 0 01-1 1h-2a1 1 0 01-1-1v-3a1 1 0 00-1-1H9a1 1 0 00-1 1v3a1 1 0 01-1 1H5a1 1 0 01-1-1v-6H3a1 1 0 01-.707-1.707l7-7z"
-                clipRule="evenodd"
-              />
-            </svg>
-            Home
+          <Link href="/">
+            <Button className="flex justify-center items-center">
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                viewBox="0 0 20 20"
+                fill="currentColor"
+                className="w-5 h-5"
+              >
+                <path
+                  fillRule="evenodd"
+                  d="M9.293 2.293a1 1 0 011.414 0l7 7A1 1 0 0117 11h-1v6a1 1 0 01-1 1h-2a1 1 0 01-1-1v-3a1 1 0 00-1-1H9a1 1 0 00-1 1v3a1 1 0 01-1 1H5a1 1 0 01-1-1v-6H3a1 1 0 01-.707-1.707l7-7z"
+                  clipRule="evenodd"
+                />
+              </svg>
+              <span className="ml-2">Home</span>
+            </Button>
           </Link>
+          <ButtonSupport />
         </div>
       </div>
     </>