From 11f3ab16e70efa07a4b61c70878c29fb57d107ec Mon Sep 17 00:00:00 2001 From: "m.usman" Date: Mon, 28 Oct 2024 17:34:40 +0100 Subject: [PATCH 1/5] fix: rename statuscall url label and introduced auth url field --- src/assets/locales/de/main.json | 8 ++++++-- src/assets/locales/en/main.json | 8 ++++++-- .../OnboardingServiceProvider.tsx | 20 +++++++++++++------ 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/assets/locales/de/main.json b/src/assets/locales/de/main.json index 2e38d65f9..a13473e83 100644 --- a/src/assets/locales/de/main.json +++ b/src/assets/locales/de/main.json @@ -2261,8 +2261,12 @@ "success": "OSP-Rückruf erfolgreich konfiguriert", "callbackUrlError": "Fehler beim Konfigurieren des OSP-Rückrufs", "callbackUrl": { - "name": "Rückruf-URL", - "hint": "Geben Sie die Rückruf-URL Ihres IDP ein, die mit „/.well-known/openid-configuration“ endet'" + "name": "Configure Registration Status Callback", + "hint": "Rückruf-URL ist obligatorisch" + }, + "authUrl": { + "name": "Auth URL", + "hint": "Auth-URL ist obligatorisch" }, "clientId": { "name": "Kunden-ID", diff --git a/src/assets/locales/en/main.json b/src/assets/locales/en/main.json index 8ce25b01e..bde6f8f29 100644 --- a/src/assets/locales/en/main.json +++ b/src/assets/locales/en/main.json @@ -2235,8 +2235,12 @@ "success": "Successfully configured OSP callback", "callbackUrlError": "Failed configuring OSP callback", "callbackUrl": { - "name": "Callback URL", - "hint": "Enter the callback URL from your IDP that ends with '/.well-known/openid-configuration'" + "name": "Configure Registration Status Callback", + "hint": "Status Callback Url is mandatory" + }, + "authUrl": { + "name": "Auth URL", + "hint": "Auth Url is mandatory" }, "clientId": { "name": "Client ID", diff --git a/src/components/pages/OnboardingServiceProvider/OnboardingServiceProvider.tsx b/src/components/pages/OnboardingServiceProvider/OnboardingServiceProvider.tsx index 686fb9d9c..b2ef1f684 100644 --- a/src/components/pages/OnboardingServiceProvider/OnboardingServiceProvider.tsx +++ b/src/components/pages/OnboardingServiceProvider/OnboardingServiceProvider.tsx @@ -97,9 +97,6 @@ const OnboardingServiceProvider = () => { ) } - const isWellknownMetadata = (expr: string) => - isURL(expr) && expr.endsWith('.well-known/openid-configuration') - const updateCallbackIDP = async () => { if (!(data && callbackData)) return setLoading(true) @@ -127,7 +124,7 @@ const OnboardingServiceProvider = () => { callbackUrl: current.callbackUrl, clientId: current.clientId, clientSecret: current.clientSecret, - authUrl: '', + authUrl: current.authUrl, } : undefined ) @@ -172,13 +169,24 @@ const OnboardingServiceProvider = () => { 'content.onboardingServiceProvider.callbackUrl.name' )} value={data?.callbackUrl} - validate={(expr) => isWellknownMetadata(expr)} + validate={(expr) => isURL(expr)} hint={t('content.onboardingServiceProvider.callbackUrl.hint')} debounceTime={0} onValid={checkValidData} /> -
+
+ isURL(expr)} + hint={t('content.onboardingServiceProvider.authUrl.hint')} + debounceTime={0} + onValid={checkValidData} + /> +
+
Date: Tue, 29 Oct 2024 11:25:00 +0100 Subject: [PATCH 2/5] chore: updated idp translations --- src/assets/locales/de/main.json | 6 +++--- src/assets/locales/en/main.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/assets/locales/de/main.json b/src/assets/locales/de/main.json index a13473e83..3814b698f 100644 --- a/src/assets/locales/de/main.json +++ b/src/assets/locales/de/main.json @@ -2261,12 +2261,12 @@ "success": "OSP-Rückruf erfolgreich konfiguriert", "callbackUrlError": "Fehler beim Konfigurieren des OSP-Rückrufs", "callbackUrl": { - "name": "Configure Registration Status Callback", - "hint": "Rückruf-URL ist obligatorisch" + "name": "Statusrückruf URL", + "hint": "Statusrückruf URL ist verpflichtend" }, "authUrl": { "name": "Auth URL", - "hint": "Auth-URL ist obligatorisch" + "hint": "Statusrückruf URL ist verpflichtend" }, "clientId": { "name": "Kunden-ID", diff --git a/src/assets/locales/en/main.json b/src/assets/locales/en/main.json index bde6f8f29..ee23553a1 100644 --- a/src/assets/locales/en/main.json +++ b/src/assets/locales/en/main.json @@ -2235,12 +2235,12 @@ "success": "Successfully configured OSP callback", "callbackUrlError": "Failed configuring OSP callback", "callbackUrl": { - "name": "Configure Registration Status Callback", - "hint": "Status Callback Url is mandatory" + "name": "Callback URL", + "hint": "Status callback URL is mandatory" }, "authUrl": { "name": "Auth URL", - "hint": "Auth Url is mandatory" + "hint": "Auth URL is mandatory" }, "clientId": { "name": "Client ID", From 1f4ad1613a072f153b7ba05f6d540c3d46e38c34 Mon Sep 17 00:00:00 2001 From: "m.usman" Date: Wed, 30 Oct 2024 09:55:17 +0100 Subject: [PATCH 3/5] chore: removed extra spaces --- .../OnboardingServiceProvider/OnboardingServiceProvider.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/pages/OnboardingServiceProvider/OnboardingServiceProvider.tsx b/src/components/pages/OnboardingServiceProvider/OnboardingServiceProvider.tsx index b2ef1f684..58ab85e1a 100644 --- a/src/components/pages/OnboardingServiceProvider/OnboardingServiceProvider.tsx +++ b/src/components/pages/OnboardingServiceProvider/OnboardingServiceProvider.tsx @@ -132,7 +132,7 @@ const OnboardingServiceProvider = () => { } return ( -
+
Date: Wed, 30 Oct 2024 10:38:52 +0100 Subject: [PATCH 4/5] chore: updated dependency --- DEPENDENCIES | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index da27e2af0..3eb862d7a 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -446,7 +446,7 @@ npm/npmjs/-/resolve/1.22.8, MIT AND ISC, approved, #15315 npm/npmjs/-/resolve/2.0.0-next.5, MIT AND ISC, approved, #3078 npm/npmjs/-/reusify/1.0.4, MIT, approved, clearlydefined npm/npmjs/-/rimraf/3.0.2, ISC, approved, clearlydefined -npm/npmjs/-/rollup/4.24.0, MIT, approved, clearlydefined +npm/npmjs/-/rollup/4.24.0, MIT AND (ISC AND MIT), approved, #16917 npm/npmjs/-/run-parallel/1.2.0, MIT, approved, clearlydefined npm/npmjs/-/safe-array-concat/1.1.2, MIT, approved, clearlydefined npm/npmjs/-/safe-regex-test/1.0.3, MIT, approved, clearlydefined @@ -690,22 +690,22 @@ npm/npmjs/@react-hook/latest/1.0.3, MIT, approved, clearlydefined npm/npmjs/@reduxjs/toolkit/2.2.7, MIT AND (BSD-2-Clause AND ISC AND MIT) AND Apache-2.0, approved, #14170 npm/npmjs/@remix-run/router/1.19.2, MIT, approved, clearlydefined npm/npmjs/@rollup/pluginutils/5.1.2, MIT, approved, #16428 -npm/npmjs/@rollup/rollup-android-arm-eabi/4.24.0, MIT, approved, clearlydefined -npm/npmjs/@rollup/rollup-android-arm64/4.24.0, MIT, approved, clearlydefined -npm/npmjs/@rollup/rollup-darwin-arm64/4.24.0, MIT, approved, clearlydefined -npm/npmjs/@rollup/rollup-darwin-x64/4.24.0, MIT, approved, clearlydefined -npm/npmjs/@rollup/rollup-linux-arm-gnueabihf/4.24.0, MIT, approved, clearlydefined -npm/npmjs/@rollup/rollup-linux-arm-musleabihf/4.24.0, MIT, approved, clearlydefined -npm/npmjs/@rollup/rollup-linux-arm64-gnu/4.24.0, MIT, approved, clearlydefined -npm/npmjs/@rollup/rollup-linux-arm64-musl/4.24.0, MIT, approved, clearlydefined -npm/npmjs/@rollup/rollup-linux-powerpc64le-gnu/4.24.0, MIT, approved, clearlydefined -npm/npmjs/@rollup/rollup-linux-riscv64-gnu/4.24.0, MIT, approved, clearlydefined -npm/npmjs/@rollup/rollup-linux-s390x-gnu/4.24.0, MIT, approved, clearlydefined -npm/npmjs/@rollup/rollup-linux-x64-gnu/4.24.0, MIT, approved, clearlydefined -npm/npmjs/@rollup/rollup-linux-x64-musl/4.24.0, MIT, approved, clearlydefined -npm/npmjs/@rollup/rollup-win32-arm64-msvc/4.24.0, MIT, approved, clearlydefined -npm/npmjs/@rollup/rollup-win32-ia32-msvc/4.24.0, MIT, approved, clearlydefined -npm/npmjs/@rollup/rollup-win32-x64-msvc/4.24.0, MIT, approved, clearlydefined +npm/npmjs/@rollup/rollup-android-arm-eabi/4.24.0, MIT AND (ISC AND MIT), approved, #16904 +npm/npmjs/@rollup/rollup-android-arm64/4.24.0, MIT AND (ISC AND MIT), approved, #16918 +npm/npmjs/@rollup/rollup-darwin-arm64/4.24.0, MIT AND (ISC AND MIT), approved, #16908 +npm/npmjs/@rollup/rollup-darwin-x64/4.24.0, MIT AND (ISC AND MIT), approved, #16901 +npm/npmjs/@rollup/rollup-linux-arm-gnueabihf/4.24.0, MIT AND (ISC AND MIT), approved, #16906 +npm/npmjs/@rollup/rollup-linux-arm-musleabihf/4.24.0, MIT AND (ISC AND MIT), approved, #16914 +npm/npmjs/@rollup/rollup-linux-arm64-gnu/4.24.0, MIT AND (ISC AND MIT), approved, #16910 +npm/npmjs/@rollup/rollup-linux-arm64-musl/4.24.0, MIT AND (ISC AND MIT), approved, #16912 +npm/npmjs/@rollup/rollup-linux-powerpc64le-gnu/4.24.0, MIT AND (ISC AND MIT), approved, #16916 +npm/npmjs/@rollup/rollup-linux-riscv64-gnu/4.24.0, MIT AND (ISC AND MIT), approved, #16907 +npm/npmjs/@rollup/rollup-linux-s390x-gnu/4.24.0, MIT AND (ISC AND MIT), approved, #16919 +npm/npmjs/@rollup/rollup-linux-x64-gnu/4.24.0, MIT AND (ISC AND MIT), approved, #16915 +npm/npmjs/@rollup/rollup-linux-x64-musl/4.24.0, MIT AND (ISC AND MIT), approved, #16911 +npm/npmjs/@rollup/rollup-win32-arm64-msvc/4.24.0, MIT AND (ISC AND MIT), approved, #16909 +npm/npmjs/@rollup/rollup-win32-ia32-msvc/4.24.0, MIT AND (ISC AND MIT), approved, #16913 +npm/npmjs/@rollup/rollup-win32-x64-msvc/4.24.0, MIT AND (ISC AND MIT), approved, #16902 npm/npmjs/@rtsao/scc/1.1.0, MIT, approved, clearlydefined npm/npmjs/@sinclair/typebox/0.27.8, MIT, approved, clearlydefined npm/npmjs/@sinonjs/commons/3.0.1, BSD-3-Clause, approved, #12905 @@ -779,4 +779,4 @@ npm/npmjs/@typescript-eslint/utils/7.18.0, BSD-2-Clause AND MIT AND (BSD-2-Claus npm/npmjs/@typescript-eslint/visitor-keys/6.21.0, MIT, approved, clearlydefined npm/npmjs/@typescript-eslint/visitor-keys/7.18.0, MIT, approved, clearlydefined npm/npmjs/@ungap/structured-clone/1.2.0, ISC, approved, clearlydefined -npm/npmjs/@vitejs/plugin-react/4.3.2, MIT, approved, #14877 +npm/npmjs/@vitejs/plugin-react/4.3.2, MIT, approved, #14877 \ No newline at end of file From 531abeb7feff75a62c662c84ea19dfee06dda29b Mon Sep 17 00:00:00 2001 From: "m.usman" Date: Wed, 30 Oct 2024 11:31:26 +0100 Subject: [PATCH 5/5] chore: updated dependency --- DEPENDENCIES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 3eb862d7a..ecc509099 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -779,4 +779,4 @@ npm/npmjs/@typescript-eslint/utils/7.18.0, BSD-2-Clause AND MIT AND (BSD-2-Claus npm/npmjs/@typescript-eslint/visitor-keys/6.21.0, MIT, approved, clearlydefined npm/npmjs/@typescript-eslint/visitor-keys/7.18.0, MIT, approved, clearlydefined npm/npmjs/@ungap/structured-clone/1.2.0, ISC, approved, clearlydefined -npm/npmjs/@vitejs/plugin-react/4.3.2, MIT, approved, #14877 \ No newline at end of file +npm/npmjs/@vitejs/plugin-react/4.3.2, MIT, approved, #14877