Merge pull request #72 from SAMAHAN-Systems-Development/fix/get-session

Fix/get session
SAMAHAN-Systems-Development · Oct 27, 2024 · 211c523 · 211c523
2 parents 7b5871e + 30356ac
commit 211c523
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/src/auth/auth.controller.ts b/src/auth/auth.controller.ts
@@ -30,9 +30,21 @@ export class AuthController {
     }
   }
 
+  @Post('logout')
+  async logout(@Response() res: Res) {
+    try {
+      await this.authService.signOut();
+      return res.status(HttpStatus.OK).json({ message: 'Logout successful' });
+    } catch (error) {
+      return res
+        .status(HttpStatus.INTERNAL_SERVER_ERROR)
+        .json({ message: error.message || 'Failed to logout' });
+    }
+  }
+
   @Get('user')
   async getUser() {
-    const user = await this.supabaseService.getCurrentUser();
+    const user = await this.supabaseService.getCurrentSession();
     return user;
   }
 }
diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts
@@ -37,6 +37,11 @@ export class AuthService {
     return;
   }
 
+  async signOut() {
+    await this.supabaseService.signOutSupabaseUser();
+    return;
+  }
+
   async getUserInfoBySupabaseUserId(
     supabaseUserId: string,
   ): Promise<{ email: string; userType: string }> {

diff --git a/supabase/supabase.service.ts b/supabase/supabase.service.ts
@@ -54,6 +54,14 @@ export class SupabaseService {
     return user;
   }
 
+  async getCurrentSession() {
+    const { data, error } = await this.supabase.auth.getSession();
+    if (error) {
+      throw new HttpException('Invalid Credentials', HttpStatus.FORBIDDEN);
+    }
+    return data;
+  }
+
   async createSupabaseUser(email: string, password: string): Promise<any> {
     const { data, error } = await this.supabase.auth.signUp({
       email,