Skip to content

Commit 6da5159

Browse files
e-halinenahjyrkia
andauthored
Push login provider changes (#143)
* 25226: react-map-gl switched to maplibre-gl (#130) * react-map-gl switched to maplibre-gl * lint fixes * more lint errors fixed * zoneSymbols bit more responsive * build and style fix * yarn.lock update * AB#28974: Represent zone symbols correctly in UI in regards to prints * zone symbol sizing * lint fixes * resize symbols on all zoom events * Bump hsl-map-style version to 1.1.3 (#133) * AB#35806: Fix crashing coordinate input fields (#134) * AB#48634: Bump hsl-map-style to 1.2.0 (#135) * WIP: AB#34322: Fix marker glitching when dragging stops (#136) * AB#53258: Fix map generator appearing in google search results (#138) * AB#56575: Add version numbering and check against prod (#140) * AB#56568: Change license to AGPL-3.0-only (#141) * React updates (#132) * react updates * lint fixes * v1.1.0 * Update login providers, make login provider configurable --------- Co-authored-by: Anton Jyrkiäinen <anton.jyrkiainen@helsinki.fi>
1 parent e8add7a commit 6da5159

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

.env.dev

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ API_URL=https://dev.kartat.hsl.fi/routemap-api
33
GENERATE_API_URL=https://dev.kartat.hsl.fi/map-generator
44
PORT=3000
55
REACT_APP_CLIENT_ID=7833861618225795
6+
REACT_APP_LOGIN_PROVIDER_URI=https://hslid-uat.cinfra.fi
67
REACT_APP_REDIRECT_URI=https://dev.kartat.hsl.fi/kartta
78
NAMESPACE=hsl-kartta
89

@@ -12,4 +13,4 @@ DIGITRANSIT_APIKEY=
1213
CYPRESS_TESTING_HSLID_USERNAME=
1314
CYPRESS_TESTING_HSLID_PASSWORD=
1415
CYPRESS_HSLID_CLIENT_ID=
15-
CYPRESS_HSLID_CLIENT_SECRET=
16+
CYPRESS_HSLID_CLIENT_SECRET=

.env.prod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ NODE_ENV=production
22
API_URL=https://kartat.hsl.fi/routemap-api
33
GENERATE_API_URL=https://kartat.hsl.fi/map-generator
44
PORT=3000
5-
REACT_APP_CLIENT_ID=7833861618225795
5+
REACT_APP_CLIENT_ID=0704589208046070
6+
REACT_APP_LOGIN_PROVIDER_URI=https://id.hsl.fi
67
REACT_APP_REDIRECT_URI=https://kartat.hsl.fi/kartta
78
NAMESPACE=hsl-kartta
89

app/components/Login.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const LightTooltip = withStyles((theme) => ({
2121

2222
const openLoginForm = () => {
2323
window.location.replace(
24-
`https://hslid-uat.cinfra.fi/openid/auth?client_id=${process.env.REACT_APP_CLIENT_ID}&redirect_uri=${process.env.REACT_APP_REDIRECT_URI}&response_type=code&scope=email+https://oneportal.trivore.com/scope/groups.readonly`
24+
`${process.env.REACT_APP_LOGIN_PROVIDER_URI}/openid/auth?client_id=${process.env.REACT_APP_CLIENT_ID}&redirect_uri=${process.env.REACT_APP_REDIRECT_URI}&response_type=code&scope=email+https://oneportal.trivore.com/scope/groups.readonly`
2525
);
2626
};
2727

0 commit comments

Comments
 (0)