From c3d03d71622cfa97e2d41a0778fc6120a348d73d Mon Sep 17 00:00:00 2001
From: Mir Arif Hasan <arif.ishan05@gmail.com>
Date: Sat, 29 Jul 2023 15:02:54 +0600
Subject: [PATCH] fix: provider return type in SSO guards

---
 .../hoppscotch-backend/src/auth/guards/github-sso.guard.ts | 7 +++++--
 .../hoppscotch-backend/src/auth/guards/google-sso.guard.ts | 7 +++++--
 .../src/auth/guards/microsoft-sso-.guard.ts                | 7 +++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/packages/hoppscotch-backend/src/auth/guards/github-sso.guard.ts b/packages/hoppscotch-backend/src/auth/guards/github-sso.guard.ts
index 7eb935956..744bb3935 100644
--- a/packages/hoppscotch-backend/src/auth/guards/github-sso.guard.ts
+++ b/packages/hoppscotch-backend/src/auth/guards/github-sso.guard.ts
@@ -1,14 +1,17 @@
 import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
 import { AuthProvider, authProviderCheck, throwHTTPErr } from '../helper';
+import { Observable } from 'rxjs';
 
 @Injectable()
 export class GithubSSOGuard extends AuthGuard('github') implements CanActivate {
-  canActivate(context: ExecutionContext): boolean {
+  canActivate(
+    context: ExecutionContext,
+  ): boolean | Promise<boolean> | Observable<boolean> {
     if (!authProviderCheck(AuthProvider.GITHUB))
       throwHTTPErr({ message: 'GitHub auth is not enabled', statusCode: 404 });
 
-    return true;
+    return super.canActivate(context);
   }
 
   getAuthenticateOptions(context: ExecutionContext) {
diff --git a/packages/hoppscotch-backend/src/auth/guards/google-sso.guard.ts b/packages/hoppscotch-backend/src/auth/guards/google-sso.guard.ts
index c238231c6..437c2785a 100644
--- a/packages/hoppscotch-backend/src/auth/guards/google-sso.guard.ts
+++ b/packages/hoppscotch-backend/src/auth/guards/google-sso.guard.ts
@@ -1,14 +1,17 @@
 import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
 import { AuthProvider, authProviderCheck, throwHTTPErr } from '../helper';
+import { Observable } from 'rxjs';
 
 @Injectable()
 export class GoogleSSOGuard extends AuthGuard('google') implements CanActivate {
-  canActivate(context: ExecutionContext): boolean {
+  canActivate(
+    context: ExecutionContext,
+  ): boolean | Promise<boolean> | Observable<boolean> {
     if (!authProviderCheck(AuthProvider.GOOGLE))
       throwHTTPErr({ message: 'Google auth is not enabled', statusCode: 404 });
 
-    return true;
+    return super.canActivate(context);
   }
 
   getAuthenticateOptions(context: ExecutionContext) {
diff --git a/packages/hoppscotch-backend/src/auth/guards/microsoft-sso-.guard.ts b/packages/hoppscotch-backend/src/auth/guards/microsoft-sso-.guard.ts
index 07d2940ab..18e9691d4 100644
--- a/packages/hoppscotch-backend/src/auth/guards/microsoft-sso-.guard.ts
+++ b/packages/hoppscotch-backend/src/auth/guards/microsoft-sso-.guard.ts
@@ -1,20 +1,23 @@
 import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
 import { AuthProvider, authProviderCheck, throwHTTPErr } from '../helper';
+import { Observable } from 'rxjs';
 
 @Injectable()
 export class MicrosoftSSOGuard
   extends AuthGuard('microsoft')
   implements CanActivate
 {
-  canActivate(context: ExecutionContext): boolean {
+  canActivate(
+    context: ExecutionContext,
+  ): boolean | Promise<boolean> | Observable<boolean> {
     if (!authProviderCheck(AuthProvider.MICROSOFT))
       throwHTTPErr({
         message: 'Microsoft auth is not enabled',
         statusCode: 404,
       });
 
-    return true;
+    return super.canActivate(context);
   }
 
   getAuthenticateOptions(context: ExecutionContext) {