fixed build

vzakharchenko · Jul 18, 2021 · 9a66e87 · 9a66e87
1 parent 8911b7c
commit 9a66e87
Show file tree

Hide file tree

Showing 28 changed files with 38 additions and 35 deletions.
diff --git a/Adapter.ts b/Adapter.ts
@@ -2,12 +2,12 @@ import {
   AdapterDependencies,
   AdapterContent,
   updateOptions,
-} from './typescript/Options';
-import { SecurityAdapter } from './typescript/adapters/SecurityAdapter';
-import { ApigatewayAdapter, DefaultApigatewayAdapter } from './typescript/adapters/ApigatewayAdapter';
-import { ServiceAccount } from './typescript/serviceaccount/ServiceAccount';
-import { DefaultMiddlewareAdapter, MiddlewareAdapter } from './typescript/adapters/MiddlewareAdapter';
-import { JWKS } from './typescript/jwks/JWKS';
+} from './src/Options';
+import {SecurityAdapter} from './src/adapters/SecurityAdapter';
+import {ApigatewayAdapter, DefaultApigatewayAdapter} from './src/adapters/ApigatewayAdapter';
+import {ServiceAccount} from './src/serviceaccount/ServiceAccount';
+import {DefaultMiddlewareAdapter, MiddlewareAdapter} from './src/adapters/MiddlewareAdapter';
+import {JWKS} from './src/jwks/JWKS';
 
 export interface KeycloakAdapter {
     getDefaultAdapter(): SecurityAdapter;
@@ -23,33 +23,33 @@ export interface KeycloakAdapter {
 }
 
 export default class DefaultKeycloakAdapter implements KeycloakAdapter {
-    options: AdapterContent;
+  options: AdapterContent;
 
-    constructor(options: AdapterDependencies) {
-      this.options = updateOptions(options);
-    }
+  constructor(options: AdapterDependencies) {
+    this.options = updateOptions(options);
+  }
 
-    getJWKS(): JWKS {
-      return this.options.jwks;
-    }
+  getJWKS(): JWKS {
+    return this.options.jwks;
+  }
 
-    getServiceAccount(): ServiceAccount {
-      return this.options.serviceAccount;
-    }
+  getServiceAccount(): ServiceAccount {
+    return this.options.serviceAccount;
+  }
 
-    getAPIGateWayAdapter(): ApigatewayAdapter {
-      return new DefaultApigatewayAdapter(this.options);
-    }
+  getAPIGateWayAdapter(): ApigatewayAdapter {
+    return new DefaultApigatewayAdapter(this.options);
+  }
 
-    getAWSLambdaAdapter(): ApigatewayAdapter {
-      return this.getAPIGateWayAdapter();
-    }
+  getAWSLambdaAdapter(): ApigatewayAdapter {
+    return this.getAPIGateWayAdapter();
+  }
 
-    getDefaultAdapter(): SecurityAdapter {
-      return this.options.securityAdapter;
-    }
+  getDefaultAdapter(): SecurityAdapter {
+    return this.options.securityAdapter;
+  }
 
-    getExpressMiddlewareAdapter(): MiddlewareAdapter {
-      return new DefaultMiddlewareAdapter(this.options);
-    }
+  getExpressMiddlewareAdapter(): MiddlewareAdapter {
+    return new DefaultMiddlewareAdapter(this.options);
+  }
 }
diff --git a/examples/keycloak-authorizer/serverless-jwks/handler.ts b/examples/keycloak-authorizer/serverless-jwks/handler.ts
@@ -2,9 +2,9 @@ import fs from 'fs';
 
 import jsonwebtoken from 'jsonwebtoken';
 import KeycloakAdapter from 'keycloak-lambda-authorizer';
+import {AdapterContent, KeycloakJsonStructure, RequestContent} from "keycloak-lambda-authorizer/dist/src/Options";
 
 import {getAuthentication} from '../serverless/authorizerUtil';
-import {AdapterContent, KeycloakJsonStructure, RequestContent} from "../../../typescript/Options";
 
 import {publicKey, privateKey} from './rsaUtils';
 

diff --git a/examples/keycloak-authorizer/serverless/handler.ts b/examples/keycloak-authorizer/serverless/handler.ts
@@ -2,8 +2,7 @@ import fs from 'fs';
 
 import jsonwebtoken from 'jsonwebtoken';
 import KeycloakAdapter from 'keycloak-lambda-authorizer';
-
-import {AdapterContent, KeycloakJsonStructure, RequestContent} from '../../../typescript/Options';
+import {AdapterContent, KeycloakJsonStructure, RequestContent} from 'keycloak-lambda-authorizer/dist/src/Options';
 
 import {getAuthentication} from './authorizerUtil';
 

diff --git a/examples/keycloak-authorizer/ui/index.ts b/examples/keycloak-authorizer/ui/index.ts
@@ -44,7 +44,9 @@ app.set('views', path.join(__dirname, 'views'));
 
 function renderUI(request:any, response:any, data:any) {
   response.render('home', {
+    // eslint-disable-next-line no-process-env
     host: process.env.LAMBDA_URL,
+    // eslint-disable-next-line no-process-env
     hostJwks: process.env.LAMBDA_JWKS_URL,
     ...data,
   });
@@ -75,6 +77,7 @@ app.post('/lambda', keycloak.protect(), keycloak.enforcer(['uiResource']), async
   try {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
+    // eslint-disable-next-line no-process-env
     const res = await fetchData(process.env.LAMBDA_URL, 'GET', {
       Authorization: `Bearer ${lambdaJWT.access_token}`,
     });
@@ -98,6 +101,7 @@ app.post('/lambdaEnt', keycloak.protect(), keycloak.enforcer(['uiResource']), as
   try {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
+    // eslint-disable-next-line no-process-env
     const res = await fetchData(process.env.LAMBDA_URL, 'GET', {
       Authorization: `Bearer ${lambdaJWT.access_token}`,
     });
@@ -121,6 +125,7 @@ app.post('/lambdaJwks', keycloak.protect(), keycloak.enforcer(['uiResource']), a
   try {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
+    // eslint-disable-next-line no-process-env
     const res = await fetchData(process.env.LAMBDA_JWKS_URL, 'GET', {
       Authorization: `Bearer ${lambdaJWT.access_token}`,
     });
@@ -143,6 +148,7 @@ app.post('/lambdaJwksEnt', keycloak.protect(), keycloak.enforcer(['uiResource'])
   try {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
+    // eslint-disable-next-line no-process-env
     const res = await fetchData(process.env.LAMBDA_JWKS_URL, 'GET', {
       Authorization: `Bearer ${lambdaJWT.access_token}`,
     });

diff --git a/package.json b/package.json
@@ -12,8 +12,8 @@
   "scripts": {
     "test": "jest --verbose --maxWorkers=2 --coverage --coverageDirectory=.coverage/",
     "build": "tsc --build",
-    "lint": "eslint --quiet --ext .ts typescript",
-    "lint:fix": "eslint --fix --quiet --ext .ts  typescript"
+    "lint": "eslint --quiet --ext .ts src",
+    "lint:fix": "eslint --fix --quiet --ext .ts  src"
   },
   "repository": {
     "type": "git",

diff --git a/typescript/Options.test.ts → src/Options.test.ts b/typescript/Options.test.ts → src/Options.test.ts
diff --git a/typescript/Options.ts → src/Options.ts b/typescript/Options.ts → src/Options.ts
diff --git a/typescript/adapters/ApigatewayAdapter.ts → src/adapters/ApigatewayAdapter.ts b/typescript/adapters/ApigatewayAdapter.ts → src/adapters/ApigatewayAdapter.ts
diff --git a/typescript/adapters/DefaultAdapter.ts → src/adapters/DefaultAdapter.ts b/typescript/adapters/DefaultAdapter.ts → src/adapters/DefaultAdapter.ts
diff --git a/typescript/adapters/MiddlewareAdapter.ts → src/adapters/MiddlewareAdapter.ts b/typescript/adapters/MiddlewareAdapter.ts → src/adapters/MiddlewareAdapter.ts
diff --git a/typescript/adapters/SecurityAdapter.ts → src/adapters/SecurityAdapter.ts b/typescript/adapters/SecurityAdapter.ts → src/adapters/SecurityAdapter.ts
diff --git a/typescript/cache/AdapterCache.ts → src/cache/AdapterCache.ts b/typescript/cache/AdapterCache.ts → src/cache/AdapterCache.ts
diff --git a/typescript/cache/DefaultCache.ts → src/cache/DefaultCache.ts b/typescript/cache/DefaultCache.ts → src/cache/DefaultCache.ts
diff --git a/typescript/clients/ClientAuthorization.ts → src/clients/ClientAuthorization.ts b/typescript/clients/ClientAuthorization.ts → src/clients/ClientAuthorization.ts
diff --git a/typescript/enforcer/ClientRoleEnforcer.ts → src/enforcer/ClientRoleEnforcer.ts b/typescript/enforcer/ClientRoleEnforcer.ts → src/enforcer/ClientRoleEnforcer.ts
diff --git a/typescript/enforcer/Enforcer.ts → src/enforcer/Enforcer.ts b/typescript/enforcer/Enforcer.ts → src/enforcer/Enforcer.ts
diff --git a/typescript/enforcer/RealmRoleEnforcer.ts → src/enforcer/RealmRoleEnforcer.ts b/typescript/enforcer/RealmRoleEnforcer.ts → src/enforcer/RealmRoleEnforcer.ts
diff --git a/typescript/enforcer/ResourceEnforcer.ts → src/enforcer/ResourceEnforcer.ts b/typescript/enforcer/ResourceEnforcer.ts → src/enforcer/ResourceEnforcer.ts
diff --git a/typescript/enforcer/resource/Resource.ts → src/enforcer/resource/Resource.ts b/typescript/enforcer/resource/Resource.ts → src/enforcer/resource/Resource.ts
diff --git a/typescript/jwks/JWKS.ts → src/jwks/JWKS.ts b/typescript/jwks/JWKS.ts → src/jwks/JWKS.ts
diff --git a/typescript/serviceaccount/ServiceAccount.ts → src/serviceaccount/ServiceAccount.ts b/typescript/serviceaccount/ServiceAccount.ts → src/serviceaccount/ServiceAccount.ts
diff --git a/typescript/uma/UmaConfiguration.ts → src/uma/UmaConfiguration.ts b/typescript/uma/UmaConfiguration.ts → src/uma/UmaConfiguration.ts
diff --git a/typescript/utils/DefaultRestCalls.ts → src/utils/DefaultRestCalls.ts b/typescript/utils/DefaultRestCalls.ts → src/utils/DefaultRestCalls.ts
diff --git a/typescript/utils/KeycloakUtils.ts → src/utils/KeycloakUtils.ts b/typescript/utils/KeycloakUtils.ts → src/utils/KeycloakUtils.ts
diff --git a/typescript/utils/TokenUtils.test.ts → src/utils/TokenUtils.test.ts b/typescript/utils/TokenUtils.test.ts → src/utils/TokenUtils.test.ts
diff --git a/typescript/utils/TokenUtils.ts → src/utils/TokenUtils.ts b/typescript/utils/TokenUtils.ts → src/utils/TokenUtils.ts
diff --git a/typescript/utils/restCalls.ts → src/utils/restCalls.ts b/typescript/utils/restCalls.ts → src/utils/restCalls.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -70,8 +70,6 @@
   },
   "exclude": [
     "examples/**",
-    "example/**",
-    "src",
     "__tests__",
   ]
 }