From 4e65edee49beaa5e9f50a4c5a7ba9b9ba6d1895f Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 22 Feb 2022 16:32:02 +0100
Subject: [PATCH] OZG-1889 realm roles to client roles
---
Jenkinsfile | 4 ++--
goofy-client/apps/goofy-e2e/src/fixtures/user/user_emil.json | 2 +-
goofy-client/apps/goofy-e2e/src/fixtures/user/user_peter.json | 2 +-
.../apps/goofy-e2e/src/fixtures/user/user_sabine.json | 2 +-
goofy-client/apps/goofy-e2e/src/fixtures/user/user_zonk.json | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 3b86a6e609..0f538540d7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -425,8 +425,8 @@ Void generateKeycloakUserYaml(String namespace) {
newUserYaml.spec.user.lastName = userJson.lastName
}
- if(userJson.realmRoles) {
- newUserYaml.spec.user.realmRoles += userJson.realmRoles
+ if(userJson.clientRoles) {
+ newUserYaml.spec.user.clientRoles = [namespace+"-goofy": userJson.clientRoles]
}
if(userJson.groups) {
diff --git a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_emil.json b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_emil.json
index 0b284ad000..88c3037b16 100644
--- a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_emil.json
+++ b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_emil.json
@@ -6,5 +6,5 @@
"fullName": "Emil Ernst",
"initials": "EE",
"dataTestId": "Emil_Ernst",
- "realmRoles": ["EINHEITLICHER_ANSPRECHPARTNER"]
+ "clientRoles": ["EINHEITLICHER_ANSPRECHPARTNER"]
}
\ No newline at end of file
diff --git a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_peter.json b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_peter.json
index 3cceba561f..c2a6a8b4b3 100644
--- a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_peter.json
+++ b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_peter.json
@@ -3,5 +3,5 @@
"password": "Y9nk43yrQ_zzIPpfFU-I",
"firstName": "Peter",
"lastName": "von der Post",
- "realmRoles": ["VERWALTUNG_POSTSTELLE"]
+ "clientRoles": ["VERWALTUNG_POSTSTELLE"]
}
\ No newline at end of file
diff --git a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_sabine.json b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_sabine.json
index 011c6fd50f..98eea79ac9 100644
--- a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_sabine.json
+++ b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_sabine.json
@@ -6,6 +6,6 @@
"fullName": "Sabine Solala",
"initials": "SS",
"dataTestId": "Sabine_Solala",
- "realmRoles": ["VERWALTUNG_USER"],
+ "clientRoles": ["VERWALTUNG_USER"],
"groups": ["E2E Tests"]
}
\ No newline at end of file
diff --git a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_zonk.json b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_zonk.json
index 21efc90fa0..3a7afe8144 100644
--- a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_zonk.json
+++ b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_zonk.json
@@ -1,5 +1,5 @@
{
"name": "zonk",
"password": "Zonk4Nothing",
- "realmRoles": ["VERWALTUNG_USER"]
+ "clientRoles": ["VERWALTUNG_USER"]
}
\ No newline at end of file
--
GitLab