diff --git a/app/package-lock.json b/app/package-lock.json index fec1e8d..310520e 100644 --- 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.19", + "@authorizerdev/authorizer-react": "^1.2.0", "@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.2.18", - "resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-1.2.18.tgz", - "integrity": "sha512-9j5U/4lqaaEcG78Zli+TtLJ0migSKhFwnXXunulAGTZOzQSTCJ/CSSPip5wWNa/Mkr6gdEMwk1HYfhIdk2A9Mg==", + "version": "2.0.0-beta.3", + "resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-2.0.0-beta.3.tgz", + "integrity": "sha512-cEzEVe7AewvOwOwoettiKRCq1e5Y33k9g8fJjqAoe3B/36iNN8wnZ5qgsPPZkqhv+Cvn6huj+YWtRimfVJ6d0w==", "dependencies": { "cross-fetch": "^3.1.5" }, @@ -41,11 +41,11 @@ } }, "node_modules/@authorizerdev/authorizer-react": { - "version": "1.1.19", - "resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-1.1.19.tgz", - "integrity": "sha512-hbId4mtzeWke1uUFAZrPwT45UmxgTp0QHAAsQvl/I0+mgoCJlJdAnUBCiJD6d5lVHJk41nx/ePYG4rw2Aj6HTw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-1.2.0.tgz", + "integrity": "sha512-MtunZgh30rzY9jSADVP1DRC4sOBC82zx/yhK8O/1ufOAi7vTDZwPjDHIMrG/xWPNUYTCeFPEKpZlKyB+TH/M1w==", "dependencies": { - "@authorizerdev/authorizer-js": "^1.2.18", + "@authorizerdev/authorizer-js": "^2.0.0-beta.3", "validator": "^13.11.0" }, "engines": { diff --git a/app/package.json b/app/package.json index 95fb694..413e6c2 100644 --- a/app/package.json +++ b/app/package.json @@ -12,7 +12,7 @@ "author": "Lakhan Samani", "license": "ISC", "dependencies": { - "@authorizerdev/authorizer-react": "^1.1.19", + "@authorizerdev/authorizer-react": "^1.2.0", "@types/react": "^17.0.15", "@types/react-dom": "^17.0.9", "esbuild": "^0.12.17", diff --git a/app/src/App.tsx b/app/src/App.tsx index 56527c7..aa8df40 100644 --- a/app/src/App.tsx +++ b/app/src/App.tsx @@ -27,13 +27,13 @@ export default function App() { if (redirectURL) { urlProps.redirectURL = redirectURL; } else { - urlProps.redirectURL = window.location.origin + '/app'; + urlProps.redirectURL = window.location.href; } const globalState: Record = { ...window['__authorizer__'], ...urlProps, }; - + console.log({ globalState }); return (
{ 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}`; + // let params = `access_token=${token.access_token}&id_token=${token.id_token}&expires_in=${token.expires_in}&state=${globalState.state}`; + // Note: If OIDC breaks in the future, use the above params + let params = `state=${globalState.state}`; if (code !== '') { params += `&code=${code}`; diff --git a/app/src/pages/login.tsx b/app/src/pages/login.tsx index 42e38a5..1689de2 100644 --- a/app/src/pages/login.tsx +++ b/app/src/pages/login.tsx @@ -71,6 +71,9 @@ export default function Login({ urlProps }: { urlProps: Record }) { ...urlProps, redirect_uri: `${window.location.origin}/app/reset-password`, }} + onPasswordReset={() => { + setView(VIEW_TYPES.LOGIN); + }} />