enhance sso errors fixes

Author: ArtemHoruzhenko

redisinsight/api/src/constants/custom-error-codes.ts

@@ -13,6 +13,7 @@ export enum CustomErrorCodes {
   CloudOauthUnknownAuthorizationRequest = 11_007,
   CloudOauthUnexpectedError = 11_008,
   CloudOauthMissedRequiredData = 11_009,
+  CloudOauthCanceled = 11_010,
   CloudCapiUnauthorized = 11_021,
   CloudCapiKeyUnauthorized = 11_022,
   CloudCapiKeyNotFound = 11_023,

redisinsight/api/src/constants/error-messages.ts

@@ -83,6 +83,7 @@ export default {
 
   CLOUD_CAPI_KEY_UNAUTHORIZED: 'Unable to authorize such CAPI key',
 
+  CLOUD_OAUTH_CANCELED: 'Authorization request was canceled.',
   CLOUD_OAUTH_MISCONFIGURATION: 'Authorization server misconfiguration.',
   CLOUD_OAUTH_GITHUB_EMAIL_PERMISSION: 'Unable to get an email from the GitHub account. Make sure that it is available.',
   CLOUD_OAUTH_MISSED_REQUIRED_DATA: 'Unable to get required data from the user profile.',

redisinsight/api/src/modules/cloud/auth/cloud-auth.service.ts

@@ -8,8 +8,10 @@ import { CloudSessionService } from 'src/modules/cloud/session/cloud-session.ser
 import { GithubIdpCloudAuthStrategy } from 'src/modules/cloud/auth/auth-strategy/github-idp.cloud.auth-strategy';
 import { wrapHttpError } from 'src/common/utils';
 import {
+  CloudOauthCanceledException,
   CloudOauthGithubEmailPermissionException,
   CloudOauthMisconfigurationException, CloudOauthMissedRequiredDataException,
+  CloudOauthUnexpectedErrorException,
   CloudOauthUnknownAuthorizationRequestException,
 } from 'src/modules/cloud/auth/exceptions';
 import { CloudAuthRequestInfo, CloudAuthResponse, CloudAuthStatus } from 'src/modules/cloud/auth/models';
@@ -37,6 +39,10 @@ export class CloudAuthService {
     query: { error_description: string, error: string },
     authRequest?: CloudAuthRequest,
   ) {
+    if (query?.error_description?.indexOf('canceled') > -1) {
+      return new CloudOauthCanceledException();
+    }
+
     if (
       query?.error_description?.indexOf('propert') > -1
       && query?.error_description?.indexOf('required') > -1
@@ -52,7 +58,7 @@ export class CloudAuthService {
         });
     }
 
-    return new CloudOauthMisconfigurationException(undefined, {
+    return new CloudOauthUnexpectedErrorException(undefined, {
       description: query.error_description,
     });
   }

redisinsight/api/src/modules/cloud/auth/exceptions/cloud-oauth.canceled.exception.ts

@@ -0,0 +1,16 @@
+import { HttpException, HttpExceptionOptions } from '@nestjs/common';
+import { CustomErrorCodes } from 'src/constants';
+import ERROR_MESSAGES from 'src/constants/error-messages';
+
+export class CloudOauthCanceledException extends HttpException {
+  constructor(message = ERROR_MESSAGES.CLOUD_OAUTH_CANCELED, options?: HttpExceptionOptions) {
+    const response = {
+      message,
+      statusCode: 499,
+      error: 'CloudOauthCanceled',
+      errorCode: CustomErrorCodes.CloudOauthCanceled,
+    };
+
+    super(response, response.statusCode, options);
+  }
+}

redisinsight/api/src/modules/cloud/auth/exceptions/index.ts

@@ -1,3 +1,4 @@
+export * from './cloud-oauth.canceled.exception';
 export * from './cloud-oauth.misconfiguration.exception';
 export * from './cloud-oauth.github-email-permission.exception';
 export * from './cloud-oauth.missed-required-data.exception';

redisinsight/desktop/src/lib/cloud/cloud-oauth.handlers.ts

@@ -15,9 +15,7 @@ export const getOauthIpcErrorResponse = (error: any): { status: CloudAuthStatus.
 
   if (error?.getResponse) {
     errorResponse = error.getResponse()
-  }
-
-  if (error instanceof Error) {
+  } else if (error instanceof Error) {
     errorResponse = new CloudOauthUnexpectedErrorException(error.message).getResponse()
   }