PR updates

PR updates

fix failing test

plugins/auth-backend/src/lib/oauth/OAuthAdapter.test.ts

@@ -172,7 +172,7 @@ describe('OAuthAdapter', () => {
 
     const mockResponse = ({
       cookie: jest.fn().mockReturnThis(),
-      json: jest.fn().mockReturnThis(),
+      send: jest.fn().mockReturnThis(),
       status: jest.fn().mockReturnThis(),
     } as unknown) as express.Response;
 
@@ -206,8 +206,6 @@ describe('OAuthAdapter', () => {
     } as unknown) as express.Response;
 
     await oauthProvider.refresh(mockRequest, mockResponse);
-    expect(mockResponse.status).toHaveBeenCalledTimes(1);
-    expect(mockResponse.status).toHaveBeenCalledWith(200);
     expect(mockResponse.json).toHaveBeenCalledTimes(1);
     expect(mockResponse.json).toHaveBeenCalledWith({
       ...mockResponseData,
@@ -233,14 +231,13 @@ describe('OAuthAdapter', () => {
     } as unknown) as express.Request;
 
     const mockResponse = ({
-      json: jest.fn().mockReturnThis(),
+      send: jest.fn().mockReturnThis(),
       status: jest.fn().mockReturnThis(),
     } as unknown) as express.Response;
 
     await oauthProvider.refresh(mockRequest, mockResponse);
-    expect(mockResponse.status).toHaveBeenCalledWith(406);
-    expect(mockResponse.json).toHaveBeenCalledTimes(1);
-    expect(mockResponse.json).toHaveBeenCalledWith(
+    expect(mockResponse.send).toHaveBeenCalledTimes(1);
+    expect(mockResponse.send).toHaveBeenCalledWith(
       'Refresh token not supported for provider: test-provider',
     );
   });

plugins/auth-backend/src/lib/oauth/OAuthAdapter.ts

@@ -155,7 +155,7 @@ export class OAuthAdapter implements AuthProviderRouteHandlers {
       // remove refresh token cookie before logout
       this.removeRefreshTokenCookie(res);
     }
-    res.status(204).json('logout!');
+    res.status(200).send('logout!');
   }
 
   async refresh(req: express.Request, res: express.Response): Promise<void> {
@@ -166,8 +166,8 @@ export class OAuthAdapter implements AuthProviderRouteHandlers {
 
     if (!this.handlers.refresh || this.options.disableRefresh) {
       res
-        .status(406)
-        .json(
+        .status(400)
+        .send(
           `Refresh token not supported for provider: ${this.options.providerId}`,
         );
       return;
@@ -202,7 +202,7 @@ export class OAuthAdapter implements AuthProviderRouteHandlers {
 
       res.status(200).json(response);
     } catch (error) {
-      res.status(401).json(`${error.message}`);
+      res.status(401).send(`${error.message}`);
     }
   }
 

plugins/auth-backend/src/providers/aws-alb/provider.test.ts

@@ -88,6 +88,7 @@ describe('AwsALBAuthProvider', () => {
     }),
   } as unknown) as express.Request;
   const mockResponse = ({
+    end: jest.fn(),
     header: () => jest.fn(),
     json: jest.fn().mockReturnThis(),
     status: jest.fn(),
@@ -173,6 +174,7 @@ describe('AwsALBAuthProvider', () => {
       await provider.refresh(mockRequest, mockResponse);
 
       expect(mockResponse.status).toHaveBeenCalledWith(401);
+      expect(mockResponse.end).toHaveBeenCalledTimes(1);
     });
   });
 });

plugins/auth-backend/src/providers/aws-alb/provider.ts

@@ -82,9 +82,11 @@ export class AwsAlbAuthProvider implements AuthProviderRouteHandlers {
       } catch (e) {
         this.logger.error('exception occurred during JWT processing', e);
         res.status(401);
+        res.end();
       }
     } else {
       res.status(401);
+      res.end();
     }
   }
 

plugins/auth-backend/src/providers/saml/provider.ts

@@ -104,7 +104,7 @@ export class SamlAuthProvider implements AuthProviderRouteHandlers {
   }
 
   async logout(_req: express.Request, res: express.Response): Promise<void> {
-    res.json('noop');
+    res.send('noop');
   }
 
   identifyEnv(): string | undefined {