Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop to master #526

Merged
merged 13 commits into from
Sep 30, 2024
Merged

Develop to master #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1c5b9a9
update hds-react to 3.9.0
henrinie-nc Aug 29, 2024
ffd71cb
introduce login and apiToken handling with hds-react LoginProvider
henrinie-nc Sep 5, 2024
0a13454
clear old auth implementation, remove oidc-client & redux-oidc
henrinie-nc Sep 5, 2024
f61c6a6
add custom auth hook, add tests
henrinie-nc Sep 13, 2024
7772e65
move user in redux store under auth, fix some tests
henrinie-nc Sep 13, 2024
4c14f01
Configure Keycloak
henrinie-nc Sep 17, 2024
d7a73d1
auth reducer use empty string as default
henrinie-nc Sep 18, 2024
09b8218
fix rerender on token renewal
henrinie-nc Sep 18, 2024
91b68ba
fix isRenewing in useAuth
henrinie-nc Sep 18, 2024
fe60dd1
add failsafe for user returning with errored callback url in login
henrinie-nc Sep 19, 2024
2bb10de
refactor redirect logic after login
henrinie-nc Sep 19, 2024
d665904
discard known HANDLING_LOGIN_CALLBACK error in hds-react
henrinie-nc Sep 19, 2024
7a6710e
refactor sso provider selection
henrinie-nc Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,18 @@
VITE_API_URL=https://mvj.dev.hel.ninja/v1
VITE_STORAGE_PREFIX=MVJ
PORT=3000
# The SSO OpenId Connect settings
# Helsinki Tunnistamo (legacy)
VITE_OPENID_CONNECT_API_TOKEN_KEY=https://api.hel.fi/auth/mvj
VITE_OPENID_CONNECT_API_TOKEN_URL=https://api.hel.fi/sso/api-tokens/
VITE_OPENID_CONNECT_AUTHORITY_URL=https://api.hel.fi/sso/openid/
VITE_OPENID_CONNECT_CLIENT_ID=https://api.hel.fi/auth/mvj
VITE_OPENID_CONNECT_SCOPE=openid profile mvj https://api.hel.fi/auth/mvj
VITE_OPENID_CONNECT_SCOPE=openid profile mvj https://api.hel.fi/auth/mvj
# Helsinki Tunnistus
VITE_TUNNISTUS_OIDC_CLIENT_ID=mvj-admin-ui-dev
VITE_TUNNISTUS_OIDC_AUTHORITY_URL=https://tunnistus.test.hel.ninja/auth/realms/helsinki-tunnistus
VITE_TUNNISTUS_OIDC_SCOPE=openid profile
VITE_TUNNISTUS_OIDC_API_AUDIENCE=mvj-api-dev
VITE_TUNNISTUS_OIDC_API_TOKEN_URL=https://tunnistus.test.hel.ninja/auth/realms/helsinki-tunnistus/protocol/openid-connect/token
# Use legacy Tunnistamo SSO, or Tunnistus SSO?
# Options: "tunnistamo", "tunnistus"
VITE_OIDC_PROVIDER=tunnistamo
5 changes: 2 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"file-saver": "^2.0.5",
"font-awesome": "^4.7.0",
"foundation-sites": "6.5.3",
"hds-react": "^3.8.0",
"hds-react": "^3.9.0",
"history": "^4.9.0",
"leaflet": "^1.5.1",
"leaflet-draw": "^1.0.4",
Expand All @@ -36,7 +36,6 @@
"leaflet-zoombox": "^0.5.1",
"lodash": "^4.17.21",
"normalize.css": "^8.0.1",
"oidc-client": "^1.8.2",
"proj4": "^2.5.0",
"proj4leaflet": "^1.0.2",
"prop-types": "^15.7.2",
Expand All @@ -59,7 +58,6 @@
"redux": "^4.0.4",
"redux-actions": "^2.6.5",
"redux-form": "^8.2.5",
"redux-oidc": "^3.1.4",
"redux-saga": "^1.0.5",
"utility-types": "^3.11.0",
"whatwg-fetch": "^3.0.0"
Expand All @@ -72,6 +70,7 @@
"@babel/preset-react": "^7.24.7",
"@eslint/js": "^9.9.0",
"@rollup/plugin-babel": "^6.0.4",
"@testing-library/react-hooks": "^8.0.1",
"@types/history": "^5.0.0",
"@types/leaflet": "^1.5.23",
"@types/leaflet-draw": "^1.0.11",
Expand Down
20 changes: 20 additions & 0 deletions public/silent_renew.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>Silent renewal</title>
</head>
<body>
<script
src="https://cdnjs.cloudflare.com/ajax/libs/oidc-client-ts/2.2.2/browser/oidc-client-ts.min.js"
integrity="sha512-pt8b5O4w5Y9/xZpIhPN8Soo/YbC95SxHn0P/Mu39iYB2Ih/09TMS3Id5XPqve2f8DPC6voXOzgQNojCuqO6A4w=="
crossorigin="anonymous"
referrerpolicy="no-referrer"
></script>
<script>
var mgr = new oidc.UserManager({});
mgr.signinSilentCallback().catch(error => {
console.error('silent_renew.html error', error);
});
</script>
</body>
</html>
Loading
Loading