Merge pull request #57 from Onlineberatung/develop

merge os
virtualidentityag · May 14, 2024 · e146121 · e146121
2 parents 508f9d0 + 7c43a94
commit e146121
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/com/vi/migrationtool/keycloak/KeycloakService.java b/src/main/java/com/vi/migrationtool/keycloak/KeycloakService.java
@@ -295,8 +295,6 @@ private UsersWithRole addCustomAttributeToUsersWithRole(
 
     var httpHeaders = new HttpHeaders();
     httpHeaders.setContentType(MediaType.APPLICATION_JSON);
-    KeycloakLoginResponseDTO loginResponse = keycloakLoginService.loginAdminUser();
-    httpHeaders.setBearerAuth(loginResponse.getAccessToken());
 
     Optional<RoleRepresentation> role = getRoleBy(roleName, httpHeaders);
     if (role.isEmpty()) {
@@ -310,6 +308,8 @@ private UsersWithRole addCustomAttributeToUsersWithRole(
     var pageNumber = 1;
     var users = getUsersWithRoleName(roleName, getFirstElementIndex(pageNumber));
     while (!users.isEmpty()) {
+      KeycloakLoginResponseDTO loginResponse = keycloakLoginService.loginAdminUser();
+      httpHeaders.setBearerAuth(loginResponse.getAccessToken());
       var migratedUsersPage =
           addCustomAttributeToUsers(customAttribute, value, httpHeaders, restTemplate, users);
       pageNumber++;

diff --git a/src/main/resources/weblate/mailing.json b/src/main/resources/weblate/mailing.json
@@ -5,7 +5,7 @@
   "name": "mailing",
   "slug": "mailing",
   "repo": "https://github.com/virtualidentityag/vi-saas-mailService.git",
-  "template": "src/main/resources/i18n/mailservice.en.json",
+  "template": "src/main/resources/i18n/mailing.en.json",
   "new_base": "",
   "vcs": "git",
   "manage_units": true,