-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
12 changed files
with
259 additions
and
121 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,4 @@ | ||
| # SPDX-FileCopyrightText: 2021 - 2023 Dusan Mijatovic (dv4all) | ||
| # SPDX-FileCopyrightText: 2021 - 2023 dv4all | ||
| # SPDX-FileCopyrightText: 2021 - 2024 Ewan Cahen (Netherlands eScience Center) <[email protected]> | ||
| # SPDX-FileCopyrightText: 2021 - 2024 Netherlands eScience Center | ||
| # SPDX-FileCopyrightText: 2022 - 2024 Christian Meeßen (GFZ) <[email protected]> | ||
| # SPDX-FileCopyrightText: 2022 - 2024 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences | ||
| # SPDX-FileCopyrightText: 2022 Helmholtz Centre for Environmental Research (UFZ) | ||
| # SPDX-FileCopyrightText: 2022 Matthias Rüster (GFZ) <[email protected]> | ||
| # SPDX-FileCopyrightText: 2023 - 2024 Dusan Mijatovic (Netherlands eScience Center) | ||
| # SPDX-FileCopyrightText: 2023 Dusan Mijatovic (dv4all) (dv4all) | ||
| # | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # THIS DOCKER FILE REQUIRES .env FILE | ||
|
|
||
| # version: "3.0" | ||
|
|
||
|
|
@@ -50,7 +39,7 @@ services: | |
| - net | ||
|
|
||
| auth: | ||
| image: ghcr.io/research-software-directory/rsd-saas/auth:v2.17.0 | ||
| image: ghcr.io/research-software-directory/rsd-saas/auth:v2.28.0 | ||
| ports: | ||
| - 5005:5005 | ||
| expose: | ||
|
|
@@ -65,28 +54,22 @@ services: | |
| - SURFCONEXT_CLIENT_ID | ||
| - SURFCONEXT_REDIRECT | ||
| - SURFCONEXT_WELL_KNOWN_URL | ||
| - SURFCONEXT_SCOPES | ||
| - HELMHOLTZID_CLIENT_ID | ||
| - HELMHOLTZID_REDIRECT | ||
| - HELMHOLTZID_WELL_KNOWN_URL | ||
| - HELMHOLTZID_SCOPES | ||
| - HELMHOLTZID_USE_ALLOW_LIST | ||
| - HELMHOLTZID_ALLOW_LIST | ||
| - ORCID_CLIENT_ID | ||
| - ORCID_REDIRECT | ||
| - ORCID_REDIRECT_COUPLE | ||
| - ORCID_WELL_KNOWN_URL | ||
| - ORCID_SCOPES | ||
| - AZURE_CLIENT_ID | ||
| - AZURE_REDIRECT | ||
| - AZURE_WELL_KNOWN_URL | ||
| - AZURE_SCOPES | ||
| - AZURE_ORGANISATION | ||
| - HELMHOLTZID_ALLOW_EXTERNAL_USERS | ||
| - LINKEDIN_CLIENT_ID | ||
| - LINKEDIN_REDIRECT | ||
| - LINKEDIN_WELL_KNOWN_URL | ||
| - AUTH_SURFCONEXT_CLIENT_SECRET | ||
| - AUTH_HELMHOLTZID_CLIENT_SECRET | ||
| - AUTH_ORCID_CLIENT_SECRET | ||
| - AUTH_AZURE_CLIENT_SECRET | ||
| - AUTH_LINKEDIN_CLIENT_SECRET | ||
| - PGRST_JWT_SECRET | ||
| depends_on: | ||
| - database | ||
|
|
@@ -127,7 +110,7 @@ services: | |
| # dockerfile to use for build | ||
| dockerfile: Dockerfile | ||
| # update version number to correspond to frontend/package.json | ||
| image: kin-rpd/frontend:0.0.1 | ||
| image: kin-rpd/frontend:0.0.2 | ||
| environment: | ||
| # it uses values from .env file | ||
| - POSTGREST_URL | ||
|
|
@@ -142,11 +125,6 @@ services: | |
| - SURFCONEXT_WELL_KNOWN_URL | ||
| - SURFCONEXT_SCOPES | ||
| - SURFCONEXT_RESPONSE_MODE | ||
| - HELMHOLTZID_CLIENT_ID | ||
| - HELMHOLTZID_REDIRECT | ||
| - HELMHOLTZID_WELL_KNOWN_URL | ||
| - HELMHOLTZID_SCOPES | ||
| - HELMHOLTZID_RESPONSE_MODE | ||
| - ORCID_CLIENT_ID | ||
| - ORCID_REDIRECT | ||
| - ORCID_REDIRECT_COUPLE | ||
|
|
@@ -159,12 +137,18 @@ services: | |
| - AZURE_LOGIN_PROMPT | ||
| - AZURE_DISPLAY_NAME | ||
| - AZURE_DESCRIPTION_HTML | ||
| - LINKEDIN_CLIENT_ID | ||
| - LINKEDIN_REDIRECT | ||
| - LINKEDIN_WELL_KNOWN_URL | ||
| - CROSSREF_CONTACT_EMAIL | ||
| expose: | ||
| - 3000 | ||
| depends_on: | ||
| - database | ||
| - backend | ||
| - auth | ||
| volumes: | ||
| - ./frontend/public:/app/public | ||
| # volumes: | ||
| # - ./deployment/hmz/styles:/app/public/styles | ||
| # - ./deployment/hmz/data:/app/public/data | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| // SPDX-FileCopyrightText: 2024 - 2025 Dusan Mijatovic (Netherlands eScience Center) | ||
| // SPDX-FileCopyrightText: 2024 - 2025 Netherlands eScience Center | ||
| // SPDX-FileCopyrightText: 2025 Ewan Cahen (Netherlands eScience Center) <[email protected]> | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| import logger from '~/utils/logger' | ||
| import {getAuthorisationEndpoint} from './authHelpers' | ||
|
|
||
| type providers = 'surfconext'|'helmholtzid'|'orcid'|'azure'|'linkedin' | ||
| // how often we refresh auth endpoint | ||
| const refreshInterval = 60*60*1000 | ||
| // save timer as public variable | ||
| let timer:NodeJS.Timeout | ||
| // save authorisation endpoint info | ||
| const cache:{ | ||
| [key:string]:{ | ||
| authEndpoint?: string | ||
| wellknownUrl: string | ||
| } | ||
| }={} | ||
|
|
||
| /** | ||
| * We save authorization_endpoint in memory to avoid repeating calls | ||
| * refreshInterval defined how often we refresh auth endpoint info. | ||
| * | ||
| */ | ||
| export async function getAuthEndpoint(wellknownUrl:string,provider:providers){ | ||
| try{ | ||
| // if already present return existing value | ||
| if (cache?.[provider]?.authEndpoint) { | ||
| // console.log('getAuthEndpoint...CACHE used...', new Date()) | ||
| return cache[provider].authEndpoint | ||
| } | ||
| // if not present request endpoint info | ||
| cache[provider] = { | ||
| wellknownUrl, | ||
| authEndpoint: await getAuthorisationEndpoint(wellknownUrl) | ||
| } | ||
| // we set timer only in the production because hot-reloading creates multiple instances | ||
| if (process.env.NODE_ENV==='production'){ | ||
| // clear previous timer to avoid mem leaks | ||
| if (timer){ | ||
| // console.log('getAuthEndpoint...CLEAR INTERVAL...', new Date()) | ||
| clearInterval(timer) | ||
| } | ||
| // create refresh interval and store it | ||
| timer = setInterval(async()=>{ | ||
| // console.log('getAuthEndpoint...REFRESH INFO...', new Date()) | ||
| // refresh all cached providers | ||
| const providers = Object.keys(cache) | ||
| const requests = providers.map(provider=>{ | ||
| return getAuthorisationEndpoint(cache[provider].wellknownUrl) | ||
| }) | ||
| // perform all requests in parallel | ||
| const endpoints = await Promise.all(requests) | ||
| // update all providers | ||
| providers.forEach((provider,pos)=>{ | ||
| // update only if there is info | ||
| if (endpoints[pos]) { | ||
| // console.log(`getAuthEndpoint...${provider}...`, endpoints[pos]) | ||
| cache[provider].authEndpoint = endpoints[pos] | ||
| } | ||
| }) | ||
| },refreshInterval) | ||
| } | ||
| // console.log('getAuthEndpoint...REQUEST made...', new Date()) | ||
| return cache[provider]?.authEndpoint | ||
| }catch(e:any){ | ||
| logger(`getAuthEndpoint: ${e.message}`, 'error') | ||
| return undefined | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| // SPDX-FileCopyrightText: 2022 - 2023 Netherlands eScience Center | ||
| // SPDX-FileCopyrightText: 2022 - 2025 Ewan Cahen (Netherlands eScience Center) <[email protected]> | ||
| // SPDX-FileCopyrightText: 2022 - 2025 Netherlands eScience Center | ||
| // SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all) | ||
| // SPDX-FileCopyrightText: 2022 Ewan Cahen (Netherlands eScience Center) <[email protected]> | ||
| // SPDX-FileCopyrightText: 2022 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences | ||
| // SPDX-FileCopyrightText: 2022 Matthias Rüster (GFZ) <[email protected]> | ||
| // SPDX-FileCopyrightText: 2022 dv4all | ||
| // SPDX-FileCopyrightText: 2023 Dusan Mijatovic (Netherlands eScience Center) | ||
| // SPDX-FileCopyrightText: 2023 - 2024 Dusan Mijatovic (Netherlands eScience Center) | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
|
|
@@ -15,18 +15,19 @@ | |
|
|
||
| // Next.js API route support: https://nextjs.org/docs/api-routes/introduction | ||
| import type {NextApiRequest, NextApiResponse} from 'next' | ||
| import {getAuthorisationEndpoint, RedirectToProps, getRedirectUrl} from '~/auth/api/authHelpers' | ||
| import logger from '~/utils/logger' | ||
| import {RedirectToProps, getRedirectUrl} from '~/auth/api/authHelpers' | ||
| import {getAuthEndpoint} from '~/auth/api/authEndpoint' | ||
| import {Provider, ApiError} from '.' | ||
|
|
||
| type Data = Provider | ApiError | ||
|
|
||
| export async function azureRedirectProps() { | ||
| // extract wellknow url from env | ||
| // extract wellknown url from env | ||
| const wellknownUrl = process.env.AZURE_WELL_KNOWN_URL ?? null | ||
| if (wellknownUrl) { | ||
| // extract authorisation endpoint from wellknow response | ||
| const authorization_endpoint = await getAuthorisationEndpoint(wellknownUrl) | ||
| // get (cached) authorisation endpoint from wellknown url | ||
| const authorization_endpoint = await getAuthEndpoint(wellknownUrl, 'azure') | ||
| if (authorization_endpoint) { | ||
| // construct all props needed for redirectUrl | ||
| const props: RedirectToProps = { | ||
|
|
@@ -51,7 +52,7 @@ export async function azureRedirectProps() { | |
| } | ||
|
|
||
| export async function azureInfo() { | ||
| // extract all props from env and wellknow endpoint | ||
| // extract all props from env and wellknown endpoint | ||
| const redirectProps = await azureRedirectProps() | ||
| if (redirectProps) { | ||
| // create return url and the name to use in login button | ||
|
|
@@ -71,7 +72,7 @@ export default async function handler( | |
| res: NextApiResponse<Data> | ||
| ) { | ||
| try { | ||
| // extract all props from env and wellknow endpoint | ||
| // extract all props from env and wellknown endpoint | ||
| // and create return url and the name to use in login button | ||
| const loginInfo = await azureInfo() | ||
| if (loginInfo) { | ||
|
|
||
Oops, something went wrong.