feat: make settings url configurable

geonetwork · Nov 27, 2024 · f19ce2e · f19ce2e
1 parent 9b86248
commit f19ce2e
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 4 deletions.
diff --git a/apps/metadata-editor/src/app/app.module.ts b/apps/metadata-editor/src/app/app.module.ts
@@ -27,6 +27,7 @@ import { EditorRouterService } from './router.service'
 import {
   LOGIN_URL,
   LOGOUT_URL,
+  SETTINGS_URL,
   provideGn4,
   provideRepositoryUrl,
 } from '@geonetwork-ui/api/repository'
@@ -75,6 +76,10 @@ import { FeatureEditorModule } from '@geonetwork-ui/feature/editor'
       provide: LOGOUT_URL,
       useFactory: () => getGlobalConfig().LOGOUT_URL,
     },
+    {
+      provide: SETTINGS_URL,
+      useFactory: () => getGlobalConfig().SETTINGS_URL,
+    },
   ],
   bootstrap: [AppComponent],
 })

diff --git a/apps/metadata-editor/src/app/dashboard/sidebar/sidebar.component.ts b/apps/metadata-editor/src/app/dashboard/sidebar/sidebar.component.ts
@@ -32,10 +32,7 @@ export class SidebarComponent implements OnInit {
   organisations$: Observable<Organization[]>
 
   get settingsUrl() {
-    return (
-      this.authService.loginUrl.split('/catalog')[0] +
-      '/admin.console#/organization/users?userOrGroup='
-    )
+    return this.authService.settingsUrl
   }
 
   constructor(

diff --git a/conf/default.toml b/conf/default.toml
@@ -24,6 +24,7 @@ proxy_path = ""
 # Example to use the georchestra login page:
 # login_url = "/cas/login?service=${current_url}"
 # logout_url = "/geonetwork/signout"
+# settings_url = "/geonetwork/srv/\${lang3}/admin.console#/organization/users?userOrGroup="
 # This optional URL should point to the static html page wc-embedder.html which allows to display a web component (like chart and table) via a permalink.
 # URLs can be indicated from the root of the same server starting with a "/" or as an external URL. Be conscious of potential CORS issues when using an external URL.
 # The default location in the dockerized datahub app for example is "/datahub/wc-embedder.html".

diff --git a/libs/api/repository/src/lib/gn4/auth/auth.service.spec.ts b/libs/api/repository/src/lib/gn4/auth/auth.service.spec.ts
@@ -91,4 +91,14 @@ describe('AuthService', () => {
       expect(service.logoutUrl).toEqual('/geonetwork/signout')
     })
   })
+  describe('Settings', () => {
+    beforeEach(() => {
+      service = TestBed.inject(AuthService)
+    })
+    it('should return the logout url', () => {
+      expect(service.settingsUrl).toEqual(
+        '/geonetwork/srv/fre/admin.console#/organization/users?userOrGroup='
+      )
+    })
+  })
 })
diff --git a/libs/api/repository/src/lib/gn4/auth/auth.service.ts b/libs/api/repository/src/lib/gn4/auth/auth.service.ts
@@ -8,12 +8,17 @@ export const LOGIN_URL = new InjectionToken<string>('loginUrl')
 export const DEFAULT_GN4_LOGOUT_URL = `/geonetwork/signout`
 export const LOGOUT_URL = new InjectionToken<string>('logoutUrl')
 
+export const DEFAULT_GN4_SETTINGS_URL = `/geonetwork/srv/\${lang3}/admin.console#/organization/users?userOrGroup=`
+export const SETTINGS_URL = new InjectionToken<string>('settingsUrl')
+
 @Injectable({
   providedIn: 'root',
 })
 export class AuthService {
   baseLoginUrl = this.baseLoginUrlToken || DEFAULT_GN4_LOGIN_URL
   baseLogoutUrl = this.baseLogoutUrlToken || DEFAULT_GN4_LOGOUT_URL
+  baseSettingsUrl = this.baseSettingsUrlToken || DEFAULT_GN4_SETTINGS_URL
+
   get loginUrl() {
     let baseUrl = this.baseLoginUrl
     const locationHasQueryParams = !!window.location.search
@@ -34,9 +39,18 @@ export class AuthService {
     return this.baseLogoutUrl
   }
 
+  get settingsUrl() {
+    let baseUrl = this.baseSettingsUrl
+    return baseUrl.replace(
+      '${lang3}',
+      LANG_2_TO_3_MAPPER[this.translateService.currentLang]
+    )
+  }
+
   constructor(
     @Optional() @Inject(LOGIN_URL) private baseLoginUrlToken: string,
     @Optional() @Inject(LOGOUT_URL) private baseLogoutUrlToken: string,
+    @Optional() @Inject(SETTINGS_URL) private baseSettingsUrlToken: string,
     private translateService: TranslateService
   ) {}
 }
diff --git a/libs/util/app-config/src/lib/app-config.ts b/libs/util/app-config/src/lib/app-config.ts
@@ -126,6 +126,7 @@ export function loadAppConfig() {
                 : undefined,
               LOGIN_URL: parsedGlobalSection.login_url,
               LOGOUT_URL: parsedGlobalSection.logout_url,
+              SETTINGS_URL: parsedGlobalSection.settings_url,
               WEB_COMPONENT_EMBEDDER_URL:
                 parsedGlobalSection.web_component_embedder_url,
               LANGUAGES: parsedGlobalSection.languages,

diff --git a/libs/util/app-config/src/lib/model.ts b/libs/util/app-config/src/lib/model.ts
@@ -7,6 +7,7 @@ export interface GlobalConfig {
   METADATA_LANGUAGE?: string
   LOGIN_URL?: string
   LOGOUT_URL?: string
+  SETTINGS_URL?: string
   WEB_COMPONENT_EMBEDDER_URL?: string
   LANGUAGES?: string[]
   CONTACT_EMAIL?: string