Revert "Merge branch 'main' of https://github.com/manojown/authorizer into feat/couchbase-db-support"

This reverts commit 2052b850a3, reversing changes made to fe862a50e5.
2022-12-29 20:14:06 +05:30
parent 2052b850a3
commit 303c59ac91
45 changed files with 2439 additions and 2002 deletions
--- a/app/.prettierrc.json
+++ b/app/.prettierrc.json
@@ -2,5 +2,5 @@
 	"tabWidth": 2,
 	"singleQuote": true,
 	"trailingComma": "all",
-	"useTabs": true
+	"useTabs": false
 }
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -9,7 +9,7 @@
 			"version": "1.0.0",
 			"license": "ISC",
 			"dependencies": {
-				"@authorizerdev/authorizer-react": "^1.1.4",
+				"@authorizerdev/authorizer-react": "^1.1.2",
 				"@types/react": "^17.0.15",
 				"@types/react-dom": "^17.0.9",
 				"esbuild": "^0.12.17",
@@ -27,9 +27,9 @@
 			}
 		},
 		"node_modules/@authorizerdev/authorizer-js": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-1.1.2.tgz",
-			"integrity": "sha512-22qoqBaCNMn3QRWdJXmwAZeb5X9lwhZF3y23loY0eO3xUUzBaJiltENjHynbLGCg8LGgn7UaJEKDqGfL6Rzwvg==",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-1.1.0.tgz",
+			"integrity": "sha512-MdEw1SjhIm7pXq20AscHSbnAta2PC3w7GNBY52/OzmlBXUGH3ooUQX/aszbYOse3FlhapcrGrRvg4sNM7faGAg==",
 			"dependencies": {
 				"cross-fetch": "^3.1.5"
 			},
@@ -38,11 +38,14 @@
 			}
 		},
 		"node_modules/@authorizerdev/authorizer-react": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-1.1.4.tgz",
-			"integrity": "sha512-FBH2igXFM8+TdA2hl1S/HMzt1+OL5wWUow3+Zyiq+IkG9nIjWFlM7ebo4D0zJd875IJiabYFnXqstRABo0ysIQ==",
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-1.1.2.tgz",
+			"integrity": "sha512-uBmuKnOVX8gp8CEUuGJuz04ep+8qMEzJXWd5leEGKYMIgolHpu/lOinnMUXhjh8YL3pA4+EhvB+hQXxUX+rRHQ==",
 			"dependencies": {
-				"@authorizerdev/authorizer-js": "^1.1.2"
+				"@authorizerdev/authorizer-js": "^1.1.0",
+				"final-form": "^4.20.2",
+				"react-final-form": "^6.5.3",
+				"styled-components": "^5.3.0"
 			},
 			"engines": {
 				"node": ">=10"
@@ -466,6 +469,18 @@
 				"node": ">=0.8.0"
 			}
 		},
+		"node_modules/final-form": {
+			"version": "4.20.4",
+			"resolved": "https://registry.npmjs.org/final-form/-/final-form-4.20.4.tgz",
+			"integrity": "sha512-hyoOVVilPLpkTvgi+FSJkFZrh0Yhy4BhE6lk/NiBwrF4aRV8/ykKEyXYvQH/pfUbRkOosvpESYouFb+FscsLrw==",
+			"dependencies": {
+				"@babel/runtime": "^7.10.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/final-form"
+			}
+		},
 		"node_modules/globals": {
 			"version": "11.12.0",
 			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -658,6 +673,33 @@
 				"react": "17.0.2"
 			}
 		},
+		"node_modules/react-final-form": {
+			"version": "6.5.7",
+			"resolved": "https://registry.npmjs.org/react-final-form/-/react-final-form-6.5.7.tgz",
+			"integrity": "sha512-o7tvJXB+McGiXOILqIC8lnOcX4aLhIBiF/Xi9Qet35b7XOS8R7KL8HLRKTfnZWQJm6MCE15v1U0SFive0NcxyA==",
+			"dependencies": {
+				"@babel/runtime": "^7.15.4"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/final-form"
+			},
+			"peerDependencies": {
+				"final-form": "4.20.4",
+				"react": "^16.8.0 || ^17.0.0"
+			}
+		},
+		"node_modules/react-final-form/node_modules/@babel/runtime": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
+			"integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
+			"dependencies": {
+				"regenerator-runtime": "^0.13.4"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
 		"node_modules/react-is": {
 			"version": "17.0.2",
 			"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
@@ -834,19 +876,22 @@
 	},
 	"dependencies": {
 		"@authorizerdev/authorizer-js": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-1.1.2.tgz",
-			"integrity": "sha512-22qoqBaCNMn3QRWdJXmwAZeb5X9lwhZF3y23loY0eO3xUUzBaJiltENjHynbLGCg8LGgn7UaJEKDqGfL6Rzwvg==",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-1.1.0.tgz",
+			"integrity": "sha512-MdEw1SjhIm7pXq20AscHSbnAta2PC3w7GNBY52/OzmlBXUGH3ooUQX/aszbYOse3FlhapcrGrRvg4sNM7faGAg==",
 			"requires": {
 				"cross-fetch": "^3.1.5"
 			}
 		},
 		"@authorizerdev/authorizer-react": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-1.1.4.tgz",
-			"integrity": "sha512-FBH2igXFM8+TdA2hl1S/HMzt1+OL5wWUow3+Zyiq+IkG9nIjWFlM7ebo4D0zJd875IJiabYFnXqstRABo0ysIQ==",
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-1.1.2.tgz",
+			"integrity": "sha512-uBmuKnOVX8gp8CEUuGJuz04ep+8qMEzJXWd5leEGKYMIgolHpu/lOinnMUXhjh8YL3pA4+EhvB+hQXxUX+rRHQ==",
 			"requires": {
-				"@authorizerdev/authorizer-js": "^1.1.2"
+				"@authorizerdev/authorizer-js": "^1.1.0",
+				"final-form": "^4.20.2",
+				"react-final-form": "^6.5.3",
+				"styled-components": "^5.3.0"
 			}
 		},
 		"@babel/code-frame": {
@@ -1186,6 +1231,14 @@
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
 			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
 		},
+		"final-form": {
+			"version": "4.20.4",
+			"resolved": "https://registry.npmjs.org/final-form/-/final-form-4.20.4.tgz",
+			"integrity": "sha512-hyoOVVilPLpkTvgi+FSJkFZrh0Yhy4BhE6lk/NiBwrF4aRV8/ykKEyXYvQH/pfUbRkOosvpESYouFb+FscsLrw==",
+			"requires": {
+				"@babel/runtime": "^7.10.0"
+			}
+		},
 		"globals": {
 			"version": "11.12.0",
 			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -1334,6 +1387,24 @@
 				"scheduler": "^0.20.2"
 			}
 		},
+		"react-final-form": {
+			"version": "6.5.7",
+			"resolved": "https://registry.npmjs.org/react-final-form/-/react-final-form-6.5.7.tgz",
+			"integrity": "sha512-o7tvJXB+McGiXOILqIC8lnOcX4aLhIBiF/Xi9Qet35b7XOS8R7KL8HLRKTfnZWQJm6MCE15v1U0SFive0NcxyA==",
+			"requires": {
+				"@babel/runtime": "^7.15.4"
+			},
+			"dependencies": {
+				"@babel/runtime": {
+					"version": "7.16.7",
+					"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
+					"integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
+					"requires": {
+						"regenerator-runtime": "^0.13.4"
+					}
+				}
+			}
+		},
 		"react-is": {
 			"version": "17.0.2",
 			"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
--- a/app/package.json
+++ b/app/package.json
@@ -6,13 +6,13 @@
 	"scripts": {
 		"build": "rm -rf build && NODE_ENV=production node ./esbuild.config.js",
 		"start": "NODE_ENV=development node ./esbuild.config.js",
-		"format": "prettier --write 'src/**/*.(ts|tsx|js|jsx)'"
+		"format": "prettier --write --use-tabs 'src/**/*.(ts|tsx|js|jsx)'"
 	},
 	"keywords": [],
 	"author": "Lakhan Samani",
 	"license": "ISC",
 	"dependencies": {
-		"@authorizerdev/authorizer-react": "^1.1.4",
+		"@authorizerdev/authorizer-react": "^1.1.2",
 		"@types/react": "^17.0.15",
 		"@types/react-dom": "^17.0.9",
 		"esbuild": "^0.12.17",
--- a/app/src/Root.tsx
+++ b/app/src/Root.tsx
@@ -38,8 +38,6 @@ export default function Root({
 	const scope = searchParams.get('scope')
 		? searchParams.get('scope')?.toString().split(' ')
 		: ['openid', 'profile', 'email'];
-	const code = searchParams.get('code') || '';
-	const nonce = searchParams.get('nonce') || '';

 	const urlProps: Record<string, any> = {
 		state,
@@ -60,19 +58,9 @@ export default function Root({
 		if (token) {
 			let redirectURL = config.redirectURL || '/app';
 			let params = `access_token=${token.access_token}&id_token=${token.id_token}&expires_in=${token.expires_in}&state=${globalState.state}`;
-
-			if (code !== '') {
-				params += `&code=${code}`;
-			}
-
-			if (nonce !== '') {
-				params += `&nonce=${nonce}`;
-			}
-
 			if (token.refresh_token) {
 				params += `&refresh_token=${token.refresh_token}`;
 			}
-
 			const url = new URL(redirectURL);
 			if (redirectURL.includes('?')) {
 				redirectURL = `${redirectURL}&${params}`;
@@ -86,7 +74,7 @@ export default function Root({
 			}
 		}
 		return () => {};
-	}, [token, config]);
+	}, [token]);

 	if (loading) {
 		return <h1>Loading...</h1>;
@@ -112,7 +100,7 @@ export default function Root({
 						<Route path="/app" exact>
 							<Login urlProps={urlProps} />
 						</Route>
-						<Route path="/app/signup">
+						<Route path="/app/signup" exact>
 							<SignUp urlProps={urlProps} />
 						</Route>
 						<Route path="/app/reset-password">