Merge 4229137 into c331661

examples/crossTenantReactJSExample/tenantSelectorApp/index.ts

@@ -136,14 +136,14 @@ app.get('/', keycloak.protect(), keycloak.enforcer(['Tenant-List']), async (requ
         return clients.length > 0 &&
                     clients[0].clientAuthenticatorType === 'client-jwt' &&
                     (clients[0].clientId === request.query.app);
-      } catch (e) {
+      } catch (e:any) {
         throw new Error(e);
       }
     });
     renderUI(request, response, {
       tenants,
     });
-  } catch (e) {
+  } catch (e:any) {
     renderUI(request, response, {
       tenants: [{name: e}],
     });

examples/multiTenantReactJSExample/tenantSelectorApp/index.ts

@@ -69,14 +69,14 @@ app.get('/', async (request:any, response) => {
         return clients.length > 0 &&
                     clients[0].clientAuthenticatorType === 'client-jwt' &&
                     (clients[0].clientId === request.query.app);
-      } catch (e) {
+      } catch (e:any) {
         throw new Error(e);
       }
     });
     renderUI(request, response, {
       tenants,
     });
-  } catch (e) {
+  } catch (e:any) {
     renderUI(request, response, {
       tenants: [{name: e}],
     });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "keycloak-api-gateway",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -34,23 +34,23 @@
     "@shopify/eslint-plugin": "^40.4.0",
     "@types/cookie": "^0.4.1",
     "@types/cookie-parser": "^1.4.2",
-    "@types/jest": "^26.0.24",
-    "@types/jsonwebtoken": "^8.5.4",
+    "@types/jest": "^27.0.2",
+    "@types/jsonwebtoken": "^8.5.5",
     "@types/uuid": "^8.3.1",
-    "@typescript-eslint/eslint-plugin": "^4.28.4",
-    "@typescript-eslint/parser": "^4.28.4",
+    "@typescript-eslint/eslint-plugin": "^4.32.0",
+    "@typescript-eslint/parser": "^4.32.0",
     "coveralls": "^3.1.1",
-    "eslint": "^7.31.0",
+    "eslint": "^7.32.0",
     "eslint-plugin-no-loops": "^0.3.0",
-    "jest": "^27.0.6",
-    "ts-jest": "^27.0.4",
-    "typescript": "^4.3.5"
+    "jest": "^27.2.2",
+    "ts-jest": "^27.0.5",
+    "typescript": "^4.4.3"
   },
   "dependencies": {
-    "aws-sdk": "^2.953.0",
+    "aws-sdk": "^2.996.0",
     "jsonwebtoken": "^8.5.1",
     "jws": "^4.0.0",
-    "keycloak-lambda-authorizer": "1.0.6",
+    "keycloak-lambda-authorizer": "1.0.7",
     "uuid": "^8.3.2"
   },
   "optionalDependencies": {

src/apigateway/ApiGateway.test.ts

@@ -184,7 +184,7 @@ describe('ApiGateway tests', () => {
 
       });
       throw new Error("test not valid");
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('LogoutObject is undefined');
     }
 
@@ -202,7 +202,7 @@ describe('ApiGateway tests', () => {
 
       });
       throw new Error("test not valid");
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('jwks is undefined');
     }
 
@@ -220,7 +220,7 @@ describe('ApiGateway tests', () => {
 
       });
       throw new Error("test not valid");
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('callback is undefined');
     }
 
@@ -240,7 +240,7 @@ describe('ApiGateway tests', () => {
 
       });
       throw new Error("test not valid");
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('singleTenantAdapter is undefined');
     }
 
@@ -264,7 +264,7 @@ describe('ApiGateway tests', () => {
 
       });
       throw new Error("test not valid");
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('Single tenant configuration does not defined');
     }
 
@@ -289,7 +289,7 @@ describe('ApiGateway tests', () => {
 
       });
       throw new Error("test not valid");
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('singleTenant');
     }
 
@@ -325,7 +325,7 @@ describe('ApiGateway tests', () => {
 
       });
       throw new Error("test not valid");
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('public');
     }
 
@@ -361,7 +361,7 @@ describe('ApiGateway tests', () => {
 
       });
       throw new Error("test not valid");
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('single');
     }
 
@@ -387,7 +387,7 @@ describe('ApiGateway tests', () => {
 
       });
       throw new Error("test not valid");
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('multiTenantOptions does not defined');
     }
 
@@ -427,7 +427,7 @@ describe('ApiGateway tests', () => {
 
       });
       throw new Error("test not valid");
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('multi-tenant');
     }
 
@@ -457,7 +457,7 @@ describe('ApiGateway tests', () => {
 
       });
       throw new Error("test not valid");
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('singleTenant');
     }
 
@@ -485,7 +485,7 @@ describe('ApiGateway tests', () => {
 
       });
       throw new Error("test not valid");
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('tenant');
     }
 
@@ -514,7 +514,7 @@ describe('ApiGateway tests', () => {
 
       });
       throw new Error("test not valid");
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('logout');
     }
 
@@ -543,7 +543,7 @@ describe('ApiGateway tests', () => {
 
       });
       throw new Error("test not valid");
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('jwks');
     }
 
@@ -572,7 +572,7 @@ describe('ApiGateway tests', () => {
 
       });
       throw new Error("test not valid");
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('callback');
     }
 

src/callback/Callback.test.ts

@@ -125,7 +125,7 @@ describe('Callback tests', () => {
     try {
       await defaultCallback.callback(request, response);
       throw new Error("Wrong test");
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('sessionManager is not defined');
     }
   });

src/callback/Callback.ts

@@ -86,7 +86,7 @@ export class DefaultCallback implements Callback {
       }
       res.cookie(getSessionName(this.options), sessionId);
       res.redirect(302, url);
-    } catch (e) {
+    } catch (e:any) {
             // eslint-disable-next-line no-console
       console.log(`error: ${e}`);
       res.redirect(302, `/error?message=${e.message}`);

src/handlers/MultiTenantUrlPageHandler.test.ts

@@ -162,7 +162,7 @@ describe('MultiTenantUrlPageHandler tests', () => {
                   throw new Error('next invoked');
                 }
                 , customPageHandlerContext);
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('multiTenantOptions does not defined');
       error = true;
     }
@@ -188,7 +188,7 @@ describe('MultiTenantUrlPageHandler tests', () => {
                   throw new Error('next invoked');
                 }
                 , customPageHandlerContext);
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('multiTenantOptions does not defined');
       error = true;
     }

src/handlers/SingleTenantUrlPageHandler.test.ts

@@ -151,7 +151,7 @@ describe('SingleTenantUrlPageHandler tests', () => {
             throw new Error('next invoked');
           }
           , customPageHandlerContext);
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('singleTenantOptions does not defined');
       error = true;
     }
@@ -177,7 +177,7 @@ describe('SingleTenantUrlPageHandler tests', () => {
             throw new Error('next invoked');
           }
           , customPageHandlerContext);
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('singleTenantAdapter does not defined');
       error = true;
     }

src/handlers/TenantInternalPage.test.ts

@@ -140,7 +140,7 @@ describe('TenantInternalPage tests', () => {
       await tenantInternalPage.execute(request, response, () => {
         next = true;
       }, customPageHandlerContext);
-    } catch (e) {
+    } catch (e:any) {
       error = true;
       expect(e.message).toEqual("multiTenantOptions does not defined");
     }
@@ -164,7 +164,7 @@ describe('TenantInternalPage tests', () => {
       await tenantInternalPage.execute(request, response, () => {
         next = true;
       }, customPageHandlerContext);
-    } catch (e) {
+    } catch (e:any) {
       error = true;
       expect(e.message).toEqual("multiTenantOptions does not defined");
     }

src/handlers/TokenPageHandler.test.ts

@@ -201,7 +201,7 @@ describe('TokenPageHandler tests', () => {
           () => {
             next = true;
           }, clonePageHandlerContext);
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('sessionToken does not defined');
       error = true;
     }
@@ -236,7 +236,7 @@ describe('TokenPageHandler tests', () => {
           () => {
             next = true;
           }, clonePageHandlerContext);
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('multiTenantOptions does not defined');
       error = true;
     }
@@ -273,7 +273,7 @@ describe('TokenPageHandler tests', () => {
           () => {
             next = true;
           }, clonePageHandlerContext);
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('multiTenantOptions does not defined');
       error = true;
     }
@@ -319,7 +319,7 @@ describe('TokenPageHandler tests', () => {
           () => {
             next = true;
           }, clonePageHandlerContext);
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('singleTenantOptions does not defined');
       error = true;
     }
@@ -365,7 +365,7 @@ describe('TokenPageHandler tests', () => {
           () => {
             next = true;
           }, clonePageHandlerContext);
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual('singleTenantAdapter does not defined');
       error = true;
     }

src/lambdaedge/LambdaEdgeAdapter.ts

@@ -117,7 +117,7 @@ export class DefaultLambdaEdgeAdapter implements LambdaEdgeAdapter {
       delete responseData.headers.via;
       delete responseData.headers.warning;
       return state ? event.Records[0].cf.request : responseData;
-    } catch (e) {
+    } catch (e:any) {
       // eslint-disable-next-line no-console
       console.log(`Error ${e.message}`);
       // eslint-disable-next-line no-console

src/logout/Logout.test.ts

@@ -133,7 +133,7 @@ describe('Logout tests', () => {
     let error = false;
     try {
       await logout.redirectDefaultLogout(request, response);
-    } catch (e) {
+    } catch (e:any) {
       error = true;
     }
     if (!error) {
@@ -184,7 +184,7 @@ describe('Logout tests', () => {
     let error = false;
     try {
       await logout.logout(request, response);
-    } catch (e) {
+    } catch (e:any) {
       error = true;
     }
     if (!error) {

src/multitenants/Multi-tenant-adapter.ts

@@ -117,7 +117,7 @@ export class DefaultMultiTenantAdapter implements MultiTenantAdapter {
           tokenString: token.access_token,
         }, enforcerFunc);
         return token;
-      } catch (e) {
+      } catch (e:any) {
         returnToken = await this.securityAdapter.refreshToken({
           realm: sessionToken.tenant,
           token,
@@ -149,7 +149,7 @@ export class DefaultMultiTenantAdapter implements MultiTenantAdapter {
         }
         const token = await this.tenantCheckToken(req, res, sessionToken, enforcerFunc);
         return token;
-      } catch (e) {
+      } catch (e:any) {
         await sessionManager.deleteSession(sessionToken.jti);
                     // eslint-disable-next-line no-console
         console.log(`Error: ${e}`);

src/session/SessionManager.test.ts

@@ -183,7 +183,7 @@ describe('SessionManager tests', () => {
     try {
             // @ts-ignore
       const sessionId = await sessionManager.createSession(request, keycloakState, {access_token: null, refresh_token: 'r'});
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual("accessToken or refreshToken does not exists");
       error = true;
     }
@@ -201,7 +201,7 @@ describe('SessionManager tests', () => {
     try {
             // @ts-ignore
       const sessionId = await sessionManager.createSession(request, keycloakState, {access_token: 'a', refresh_token: null});
-    } catch (e) {
+    } catch (e:any) {
       expect(e.message).toEqual("accessToken or refreshToken does not exists");
       error = true;
     }

src/session/SessionManager.ts

@@ -35,7 +35,7 @@ export function getSessionToken(sessionTokenString: string,
       ...decodeToken,
       ...(addTokenString ? {token: sessionTokenString} : {}),
     } as SessionToken : null;
-  } catch (e) {
+  } catch (e:any) {
         // eslint-disable-next-line no-console
     console.log(`error ${e}`);
     return null;