Merge pull request #12 from vzakharchenko/resourceHandler

Resource Handler
vzakharchenko · Jun 26, 2020 · 262cd18 · 262cd18
2 parents 497d53c + db02092
commit 262cd18
Show file tree

Hide file tree

Showing 25 changed files with 99 additions and 76 deletions.
diff --git a/README.md b/README.md
@@ -689,4 +689,28 @@ keycloakJson,
   }
 }
 );
+
+```
+## 14. Resource Handler
+
+```js
+    const keycloakJSON = ...; // read Keycloak.json
+  apigateway.awsHandler(event, keycloakJSON, {
+    enforce: {
+      enabled: true,
+      resource: {
+        name: 'SOME_RESOURCE',
+        uri: 'RESOURCE_URI',
+        matchingUri: true,
+      },
+      resourceHandler:(resourceJson, options)=>{
+      console.log('resource: ' + JSON.stringify(resourceJson));
+      }
+    },
+  }).then((token)=>{
+      // Success
+  }).catch((e)=>{
+    // Failed
+  });
+}
 ```
diff --git a/__tests__/src/umaConfigurationTest.js b/__tests__/src/umaConfigurationTest.js
@@ -99,6 +99,24 @@ describe('testing umaConfiguration', () => {
     });
   });
 
+  test('test enforceResource Handler success', async () => {
+    await enforce(token, {
+      cache,
+      keycloakJson,
+      enforce: {
+        enabled: true,
+        resource: {
+          name: 'resource',
+          uri: '/test',
+          matchingUri: true,
+        },
+        resourceHandler: (resourceJson) => {
+          expect(resourceJson).toEqual(['resourceId']);
+        },
+      },
+    });
+  });
+
   test('test enforceResource denied', async () => {
     try {
       await enforce(token, {

diff --git a/example/keycloak-authorizer/serverless-jwks/handler.js b/example/keycloak-authorizer/serverless-jwks/handler.js
@@ -13,7 +13,6 @@ function getKeycloakJSON() {
   }));
 }
 
-
 function getToken(event) {
   const tokenString = event.authorizationToken || event.headers.Authorization;
   if (!tokenString) {
@@ -27,7 +26,6 @@ function getToken(event) {
   return jsonwebtoken.decode(tokenStringValue);
 }
 
-
 export function hello(event, context, callback) {
   const token = getToken(event);
   callback(null, {

diff --git a/example/keycloak-authorizer/serverless/handler.js b/example/keycloak-authorizer/serverless/handler.js
@@ -13,7 +13,6 @@ function getKeycloakJSON() {
   }));
 }
 
-
 function getToken(event) {
   const tokenString = event.authorizationToken || event.headers.Authorization;
   if (!tokenString) {
@@ -27,7 +26,6 @@ function getToken(event) {
   return jsonwebtoken.decode(tokenStringValue);
 }
 
-
 export function hello(event, context, callback) {
   const token = getToken(event);
   callback(null, {

diff --git a/example/keycloak-authorizer/serverless/package.json b/example/keycloak-authorizer/serverless/package.json
@@ -14,16 +14,16 @@
   "author": "vzakharchenko",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@babel/core": "^7.9.6",
-    "@babel/plugin-proposal-decorators": "^7.8.3",
-    "@babel/plugin-proposal-object-rest-spread": "^7.9.6",
-    "@babel/plugin-transform-async-to-generator": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.9.6",
-    "@babel/preset-env": "^7.9.6",
+    "@babel/core": "^7.10.3",
+    "@babel/plugin-proposal-decorators": "^7.10.3",
+    "@babel/plugin-proposal-object-rest-spread": "^7.10.3",
+    "@babel/plugin-transform-async-to-generator": "^7.10.1",
+    "@babel/plugin-transform-runtime": "^7.10.3",
+    "@babel/preset-env": "^7.10.3",
     "@babel/preset-es2015": "^7.0.0-beta.53",
-    "@babel/register": "^7.9.0",
+    "@babel/register": "^7.10.3",
     "babel-loader": "^8.1.0",
-    "@babel/runtime": "^7.9.6",
+    "@babel/runtime": "^7.10.3",
     "copy-webpack-plugin": "*",
     "eslint": "*",
     "eslint-config-airbnb": "*",
@@ -33,7 +33,7 @@
     "serverless-offline": "*",
     "serverless-webpack": "*",
     "webpack": "^4.43.0",
-    "webpack-cli": "^3.3.11"
+    "webpack-cli": "^3.3.12"
   },
   "dependencies": {
     "keycloak-lambda-authorizer": "*"

diff --git a/example/keycloak-authorizer/ui/index.js b/example/keycloak-authorizer/ui/index.js
@@ -20,14 +20,12 @@ app.use(session({
   store: memoryStore,
 }));
 
-
 const keycloak = new Keycloak({
   store: memoryStore,
 });
 
 app.use(keycloak.middleware());
 
-
 app.use(bodyParser.urlencoded({ extended: true }));
 
 app.engine('.hbs', exphbs({
@@ -69,7 +67,6 @@ async function clientToRPTExchange(request, clientId) {
   }
 }
 
-
 app.post('/lambda', keycloak.protect(), keycloak.enforcer(['uiResource']), async (request, response) => {
   try {
     const lambdaJWT = await clientToRPTExchange(request, 'lambda');
@@ -94,7 +91,6 @@ app.post('/lambdaJwks', keycloak.protect(), keycloak.enforcer(['uiResource']), a
   }
 });
 
-
 app.get('/', keycloak.protect(), keycloak.enforcer(['uiResource']), (request, response) => {
   renderUI(request, response, '', '');
 });

diff --git a/example/keycloak-cloudfront-portal/keycloak-cloudfront-cdk/index.js b/example/keycloak-cloudfront-portal/keycloak-cloudfront-cdk/index.js
@@ -14,7 +14,6 @@ class KeycloakCloudFrontExampleStack extends cdk.Stack {
   constructor(parent, id, props) {
     super(parent, id, props);
 
-
     const role = iam.Role.fromRoleArn(this, `Role ${bucketName}`, roleArn, { mutable: false });
     const bucket = new s3.Bucket(this, 'lambda-edge-bucket', {
       accessControl: s3.BucketAccessControl.AUTHENTICATED_READ,

diff --git a/example/keycloak-cloudfront-portal/lambda-edge-example/src/index.js b/example/keycloak-cloudfront-portal/lambda-edge-example/src/index.js
@@ -9,7 +9,6 @@ import {
   tenantOptions,
 } from './Tentants';
 
-
 lamdaEdge.routes.addJwksEndpoint('/cert', publicKey.key);
 
 function tenantResponseHandler(request, options) {

diff --git a/example/keycloak-cloudfront-portal/lambda-edge-example/src/sessionKeys.js b/example/keycloak-cloudfront-portal/lambda-edge-example/src/sessionKeys.js
@@ -1,4 +1,3 @@
-
 const publicKey = '-----BEGIN CERTIFICATE-----\n'
     + 'MIIDgzCCAmugAwIBAgIJAJTi4Mu+7fIMMA0GCSqGSIb3DQEBCwUAMFgxCzAJBgNV\n'
     + 'BAYTAlVTMQ8wDQYDVQQIDAZEZW5pYWwxFDASBgNVBAcMC1NwcmluZ2ZpZWxkMQww\n'

diff --git a/example/keycloak-cloudfront-portal/lambdaEdgeProxy.js b/example/keycloak-cloudfront-portal/lambdaEdgeProxy.js
@@ -76,7 +76,6 @@ function transformResponse(response, res, next) {
   }
 }
 
-
 module.exports.middleware = async (req, res, next) => {
   const cb = function callback(error, r) {
     if (error) {

diff --git a/example/keycloak-cloudfront-portal/package.json b/example/keycloak-cloudfront-portal/package.json
@@ -13,44 +13,44 @@
   "author": "vzakharchenko",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@babel/core": "^7.10.2",
+    "@babel/core": "^7.10.3",
     "@babel/plugin-proposal-class-properties": "^7.10.1",
-    "@babel/plugin-proposal-decorators": "^7.10.1",
+    "@babel/plugin-proposal-decorators": "^7.10.3",
     "@babel/plugin-proposal-do-expressions": "^7.10.1",
     "@babel/plugin-proposal-export-default-from": "^7.10.1",
     "@babel/plugin-proposal-function-sent": "^7.10.1",
-    "@babel/plugin-proposal-object-rest-spread": "^7.10.1",
-    "@babel/plugin-proposal-optional-chaining": "^7.10.1",
+    "@babel/plugin-proposal-object-rest-spread": "^7.10.3",
+    "@babel/plugin-proposal-optional-chaining": "^7.10.3",
     "@babel/plugin-proposal-partial-application": "^7.10.1",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-object-assign": "^7.10.1",
-    "@babel/plugin-transform-react-jsx": "^7.10.1",
-    "@babel/plugin-transform-runtime": "^7.10.1",
-    "@babel/preset-env": "^7.10.2",
+    "@babel/plugin-transform-object-assign": "^7.10.3",
+    "@babel/plugin-transform-react-jsx": "^7.10.3",
+    "@babel/plugin-transform-runtime": "^7.10.3",
+    "@babel/preset-env": "^7.10.3",
     "@babel/preset-flow": "^7.10.1",
     "@babel/preset-react": "^7.10.1",
-    "@babel/register": "^7.10.1",
+    "@babel/register": "^7.10.3",
     "@material-ui/styles": "^4.10.0",
     "babel-eslint": "^10.1.0",
     "babel-loader": "^8.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
-    "css-loader": "^3.5.3",
-    "eslint": "^7.1.0",
-    "eslint-plugin-import": "^2.20.2",
-    "eslint-plugin-jsx-a11y": "^6.2.3",
+    "css-loader": "^3.6.0",
+    "eslint": "^7.3.1",
+    "eslint-plugin-import": "^2.21.2",
+    "eslint-plugin-jsx-a11y": "^6.3.1",
     "eslint-plugin-react": "^7.20.0",
     "file-loader": "^6.0.0",
     "html-webpack-plugin": "^4.3.0",
     "lambda-edge-example": "./lambda-edge-example",
     "progress-bar-webpack-plugin": "^2.1.0",
     "style-loader": "^1.2.1",
     "webpack": "^4.43.0",
-    "webpack-cli": "^3.3.11",
+    "webpack-cli": "^3.3.12",
     "webpack-dev-server": "^3.11.0"
   },
   "dependencies": {
     "@babel/polyfill": "^7.10.1",
-    "@material-ui/core": "^4.10.1",
+    "@material-ui/core": "^4.10.2",
     "@material-ui/icons": "^4.9.1",
     "axios": "^0.19.2",
     "browserify": "^16.5.1",

diff --git a/example/keycloak-cloudfront-portal/src/components/App.js b/example/keycloak-cloudfront-portal/src/components/App.js
@@ -30,12 +30,10 @@ async function fetchData(url, method = 'GET', headers) {
   return ret.data;
 }
 
-
 export default
 class App extends React.Component {
   // eslint-disable-next-line class-methods-use-this
 
-
   async componentDidMount() {
     const tenants = getTenants();
     // eslint-disable-next-line no-plusplus

diff --git a/example/keycloak-cloudfront-portal/src/components/Header.js b/example/keycloak-cloudfront-portal/src/components/Header.js
@@ -53,7 +53,6 @@ class Header extends React.Component {
       this.setState({ anchorEl: event.currentTarget });
     };
 
-
     handleClose = () => {
       this.setState({ anchorEl: null });
     };

diff --git a/example/keycloak-cloudfront-portal/src/index.js b/example/keycloak-cloudfront-portal/src/index.js
@@ -5,7 +5,6 @@ import ReactDOM from 'react-dom';
 import App from './components/App';
 import Header from './components/Header';
 
-
 const Index = () => (
         <div>
             <Header />

diff --git a/example/keycloak-cloudfront/keycloak-cloudfront-cdk/index.js b/example/keycloak-cloudfront/keycloak-cloudfront-cdk/index.js
@@ -14,7 +14,6 @@ class KeycloakCloudFrontExampleStack extends cdk.Stack {
   constructor(parent, id, props) {
     super(parent, id, props);
 
-
     const role = iam.Role.fromRoleArn(this, `Role ${bucketName}`, roleArn, { mutable: false });
     const bucket = new s3.Bucket(this, 'lambda-edge-bucket', {
       accessControl: s3.BucketAccessControl.AUTHENTICATED_READ,

diff --git a/example/keycloak-cloudfront/lambda-edge-example/src/Tentants.js b/example/keycloak-cloudfront/lambda-edge-example/src/Tentants.js
@@ -22,7 +22,6 @@ export const tenant1Options = {
   },
 };
 
-
 export const tenant2KeycloakJson = {
   realm: 'Tenant2',
   'auth-server-url': 'http://localhost:8090/auth',

diff --git a/example/keycloak-cloudfront/lambda-edge-example/src/sessionKeys.js b/example/keycloak-cloudfront/lambda-edge-example/src/sessionKeys.js
@@ -1,4 +1,3 @@
-
 const publicKey = '-----BEGIN CERTIFICATE-----\n'
     + 'MIIDgzCCAmugAwIBAgIJAJTi4Mu+7fIMMA0GCSqGSIb3DQEBCwUAMFgxCzAJBgNV\n'
     + 'BAYTAlVTMQ8wDQYDVQQIDAZEZW5pYWwxFDASBgNVBAcMC1NwcmluZ2ZpZWxkMQww\n'

diff --git a/example/keycloak-cloudfront/lambdaEdgeProxy.js b/example/keycloak-cloudfront/lambdaEdgeProxy.js
@@ -76,7 +76,6 @@ function transformResponse(response, res, next) {
   }
 }
 
-
 module.exports.middleware = async (req, res, next) => {
   const cb = function callback(error, r) {
     if (error) {

diff --git a/example/keycloak-cloudfront/package.json b/example/keycloak-cloudfront/package.json
@@ -13,50 +13,50 @@
   "author": "vzakharchenko",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@babel/core": "^7.9.6",
-    "@babel/plugin-proposal-class-properties": "^7.8.3",
-    "@babel/plugin-proposal-decorators": "^7.8.3",
-    "@babel/plugin-proposal-do-expressions": "^7.8.3",
-    "@babel/plugin-proposal-export-default-from": "^7.8.3",
-    "@babel/plugin-proposal-function-sent": "^7.8.3",
-    "@babel/plugin-proposal-object-rest-spread": "^7.9.6",
-    "@babel/plugin-proposal-optional-chaining": "^7.9.0",
-    "@babel/plugin-proposal-partial-application": "^7.8.3",
+    "@babel/core": "^7.10.3",
+    "@babel/plugin-proposal-class-properties": "^7.10.1",
+    "@babel/plugin-proposal-decorators": "^7.10.3",
+    "@babel/plugin-proposal-do-expressions": "^7.10.1",
+    "@babel/plugin-proposal-export-default-from": "^7.10.1",
+    "@babel/plugin-proposal-function-sent": "^7.10.1",
+    "@babel/plugin-proposal-object-rest-spread": "^7.10.3",
+    "@babel/plugin-proposal-optional-chaining": "^7.10.3",
+    "@babel/plugin-proposal-partial-application": "^7.10.1",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-object-assign": "^7.8.3",
-    "@babel/plugin-transform-react-jsx": "^7.9.4",
-    "@babel/plugin-transform-runtime": "^7.9.6",
-    "@babel/preset-env": "^7.9.6",
-    "@babel/preset-flow": "^7.9.0",
-    "@babel/preset-react": "^7.9.4",
-    "@babel/register": "^7.9.0",
-    "@material-ui/styles": "^4.9.14",
+    "@babel/plugin-transform-object-assign": "^7.10.3",
+    "@babel/plugin-transform-react-jsx": "^7.10.3",
+    "@babel/plugin-transform-runtime": "^7.10.3",
+    "@babel/preset-env": "^7.10.3",
+    "@babel/preset-flow": "^7.10.1",
+    "@babel/preset-react": "^7.10.1",
+    "@babel/register": "^7.10.3",
+    "@material-ui/styles": "^4.10.0",
     "babel-eslint": "^10.1.0",
     "babel-loader": "^8.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
-    "css-loader": "^3.5.3",
-    "eslint": "^7.0.0",
-    "eslint-plugin-import": "^2.20.2",
-    "eslint-plugin-jsx-a11y": "^6.2.3",
+    "css-loader": "^3.6.0",
+    "eslint": "^7.3.1",
+    "eslint-plugin-import": "^2.21.2",
+    "eslint-plugin-jsx-a11y": "^6.3.1",
     "eslint-plugin-react": "^7.20.0",
     "file-loader": "^6.0.0",
     "html-webpack-plugin": "^4.3.0",
     "lambda-edge-example": "./lambda-edge-example",
     "progress-bar-webpack-plugin": "^2.1.0",
     "style-loader": "^1.2.1",
     "webpack": "^4.43.0",
-    "webpack-cli": "^3.3.11",
+    "webpack-cli": "^3.3.12",
     "webpack-dev-server": "^3.11.0"
   },
   "dependencies": {
-    "@babel/polyfill": "^7.8.7",
-    "@material-ui/core": "^4.9.14",
+    "@babel/polyfill": "^7.10.1",
+    "@material-ui/core": "^4.10.2",
     "@material-ui/icons": "^4.9.1",
     "axios": "^0.19.2",
     "browserify": "^16.5.1",
     "js-cookie": "^2.2.1",
-    "keycloak-lambda-cloudfront-ui": "^0.1.4",
-    "mobx-utils": "^5.5.7",
+    "keycloak-lambda-cloudfront-ui": "^0.1.6",
+    "mobx-utils": "^5.6.1",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "typeface-roboto": "0.0.75",

diff --git a/example/keycloak-cloudfront/src/components/App.js b/example/keycloak-cloudfront/src/components/App.js
@@ -29,12 +29,10 @@ async function fetchData(url, method = 'GET', headers) {
   return ret.data;
 }
 
-
 export default
 class App extends React.Component {
   // eslint-disable-next-line class-methods-use-this
 
-
   async componentDidMount() {
     const tenants = getTenants();
     // eslint-disable-next-line no-plusplus

diff --git a/example/keycloak-cloudfront/src/components/Header.js b/example/keycloak-cloudfront/src/components/Header.js
@@ -51,7 +51,6 @@ class Header extends React.Component {
       this.setState({ anchorEl: event.currentTarget });
     };
 
-
     handleClose = () => {
       this.setState({ anchorEl: null });
     };