Merge branch 'master' into OZG-2737_Link_auf_usermanager

Jenkinsfile

@@ -623,7 +623,7 @@ String generateCypressConfig(String stage, String bezeichner, String testFolder)
 String getKeycloakUuid(realm, userName) {
     def shScript = """curl -H 'Content-Type: application/json' \
                         -H 'Authorization: bearer ${getKeycloakAccessToken()}' \
-                        'https://sso.dev.ozg-sh.de/auth/admin/realms/${realm}/users'
+                        'https://sso.dev.ozg-sh.de/admin/realms/${realm}/users'
                     """
 
 	def users = readJSON text: sh(script: shScript, returnStdout: true)
@@ -637,7 +637,7 @@ String getKeycloakUuid(realm, userName) {
 
 String getKeycloakAccessToken() {
 	withCredentials([usernamePassword(credentialsId: 'keycloak-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
-		def token = readJSON text: sh (script: 'curl -d "client_id=admin-cli" -d "username=$USER" -d "password=$PASSWORD" -d "grant_type=password" "https://sso.dev.ozg-sh.de/auth/realms/master/protocol/openid-connect/token"', returnStdout: true)
+		def token = readJSON text: sh (script: 'curl -d "client_id=admin-cli" -d "username=$USER" -d "password=$PASSWORD" -d "grant_type=password" "https://sso.dev.ozg-sh.de/realms/master/protocol/openid-connect/token"', returnStdout: true)
 
 		return token.access_token
 	}

goofy-client/apps/goofy-e2e/deployment-values/goofy/ea-values.yaml

 sso:
-  serverUrl: 'https://sso.dev.ozg-sh.de/auth'
+  serverUrl: 'https://sso.dev.ozg-sh.de'
   role_einheitlicher_ansprechpartner: true
   apiPassword: "Goofy1234!"
 env:

goofy-client/apps/goofy-e2e/deployment-values/goofy/values.yaml

 sso:
-  serverUrl: 'https://sso.dev.ozg-sh.de/auth'
+  serverUrl: 'https://sso.dev.ozg-sh.de'
   apiPassword: "Goofy1234!"
 env:
   overrideSpringProfiles: 'oc, dev, e2e'

goofy-client/apps/goofy-e2e/src/support/commands.ts

@@ -91,5 +91,5 @@ Cypress.Commands.add('logout', () => {
 })
 
 function getKeycloakBaseRealmUrl(): string {
-	return `${Cypress.env("keycloakUrl")}auth/realms/${Cypress.env("keycloakRealm")}/protocol/openid-connect`;
+	return `${Cypress.env("keycloakUrl")}realms/${Cypress.env("keycloakRealm")}/protocol/openid-connect`;
 }
\ No newline at end of file

goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-forwarding/historie-item-forwarding.component.scss

+@import "expansion-panel"
\ No newline at end of file

goofy-server/src/main/resources/application-dev.yml

@@ -2,7 +2,7 @@ goofy:
   production: false
 
 keycloak:
-  auth-server-url: https://sso.dev.ozg-sh.de/auth
+  auth-server-url: https://sso.dev.ozg-sh.de
   realm: sh-kiel-dev
   resource: sh-kiel-dev-goofy
 

goofy-server/src/main/resources/application-local.yml

@@ -7,7 +7,7 @@ goofy:
   production: false
     
 keycloak:
-  auth-server-url: http://localhost:8088/auth
+  auth-server-url: http://localhost:8088
   realm: sh-kiel-dev
   resource: sh-kiel-dev-goofy
 

goofy-server/src/main/resources/application-remotekc.yml

 keycloak: 
-  auth-server-url: https://sso.dev.ozg-sh.de/auth 
   realm: sh-kiel-dev
   resource: sh-kiel-dev-goofy
   public-client: true
   use-resource-role-mappings: true
+  auth-server-url: https://sso.dev.ozg-sh.de

goofy-server/src/main/resources/application.yml

@@ -52,7 +52,7 @@ goofy:
   production: true
       
 keycloak:
-  auth-server-url: http://localhost:8088/auth 
+  auth-server-url: http://localhost:8088
   realm: sh-kiel-dev
   resource: sh-kiel-dev-goofy
   public-client: true