Remove getServiceAccount from ScimUser

indigo-iam · Sep 20, 2024 · 0445451 · 0445451
1 parent c23f974
commit 0445451
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 15 deletions.
diff --git a/iam-login-service/src/main/java/it/infn/mw/iam/api/scim/converter/UserConverter.java b/iam-login-service/src/main/java/it/infn/mw/iam/api/scim/converter/UserConverter.java
@@ -91,8 +91,8 @@ public IamAccount entityFromDto(ScimUser scimUser) {
       account.setActive(scimUser.getActive());
     }
 
-    if (scimUser.getServiceAccount() != null) {
-      account.setServiceAccount(scimUser.getServiceAccount());
+    if (scimUser.hasServiceAccountStatus()) {
+      account.setServiceAccount(scimUser.getIndigoUser().getServiceAccount());
     }
 
     if (scimUser.getPassword() != null) {

diff --git a/iam-login-service/src/main/java/it/infn/mw/iam/api/scim/model/ScimUser.java b/iam-login-service/src/main/java/it/infn/mw/iam/api/scim/model/ScimUser.java
@@ -216,12 +216,7 @@ public Boolean getActive() {
 
     return active;
   }
-
-  public Boolean getServiceAccount() {
-
-    return indigoUser != null && indigoUser.getServiceAccount() != null && indigoUser.getServiceAccount();
-  }
-
+
   public List<ScimEmail> getEmails() {
 
     return emails;

diff --git a/...e/src/main/java/it/infn/mw/iam/api/scim/updater/factory/DefaultAccountUpdaterFactory.java b/...e/src/main/java/it/infn/mw/iam/api/scim/updater/factory/DefaultAccountUpdaterFactory.java
@@ -209,7 +209,7 @@ private void prepareReplacers(List<AccountUpdater> updaters, ScimUser user, IamA
     addUpdater(updaters, Objects::nonNull, user::getActive, replace::active);
 
     if (user.hasServiceAccountStatus()) {
-      addUpdater(updaters, Objects::nonNull, user::getServiceAccount, replace::serviceAccount); 
+      addUpdater(updaters, Objects::nonNull, user.getIndigoUser()::getServiceAccount, replace::serviceAccount); 
     }
 
     if (user.hasEmails()) {

diff --git a/...board-app/components/user/request-aup-signature/user.request-aup-signature.component.html b/...board-app/components/user/request-aup-signature/user.request-aup-signature.component.html
@@ -15,7 +15,7 @@
     limitations under the License.
 
 -->
-<button ng-if="$ctrl.aupIsEnabled() && !$ctrl.user.serviceAccount && !$ctrl.isMe()"
+<button ng-if="$ctrl.aupIsEnabled() && !$ctrl.indigoUser().serviceAccount && !$ctrl.isMe()"
     class="btn btn-warning btn-block"
     style="margin-top: 5px" 
     ng-click="$ctrl.openRequestAupSignatureModal()" 

diff --git a/...shboard-app/components/user/request-aup-signature/user.request-aup-signature.component.js b/...shboard-app/components/user/request-aup-signature/user.request-aup-signature.component.js
@@ -29,6 +29,9 @@
     self.aupIsEnabled = function () {
       return self.aup !== null;
     };
+    self.indigoUser = function () {
+      return self.user['urn:indigo-dc:scim:schemas:IndigoUser'];
+    };
 
     self.openRequestAupSignatureModal = function() {
       self.enabled = false;

diff --git a/...am/apps/dashboard-app/components/user/service-account/user.service.account.component.html b/...am/apps/dashboard-app/components/user/service-account/user.service.account.component.html
@@ -18,7 +18,7 @@
 <!-- Set user as service account button -->
 <button class="btn btn-primary btn-block"
     style="margin-top: 5px"
-    ng-if="!$ctrl.user.serviceAccount && !$ctrl.isMe()" 
+    ng-if="!$ctrl.indigoUser().serviceAccount && !$ctrl.isMe()" 
     ng-click="$ctrl.openDialog()" 
     ng-enabled="$ctrl.enabled"
     name="disable-user-btn">
@@ -28,7 +28,7 @@
 
 <!-- Revoke user as service account button -->
 <button class="btn btn-primary btn-block" 
-    ng-if="$ctrl.user.serviceAccount && !$ctrl.isMe()"
+    ng-if="$ctrl.indigoUser().serviceAccount && !$ctrl.isMe()"
     style="margin-top: 5px" 
     ng-click="$ctrl.openDialog()" 
     ng-enabled="$ctrl.enabled"

diff --git a/.../iam/apps/dashboard-app/components/user/service-account/user.service.account.component.js b/.../iam/apps/dashboard-app/components/user/service-account/user.service.account.component.js
@@ -31,7 +31,7 @@
     self.handleSuccess = function() {
       self.enabled = true;
       self.userCtrl.loadUser().then(function(user) {
-        if (user.serviceAccount) {
+        if (self.indigoUser().serviceAccount) {
           toaster.pop({
             type: 'success',
             body:
@@ -64,7 +64,7 @@
       var modalOptions = null;
       var updateServiceAccountStatusFunc = null;
 
-      if (self.user.serviceAccount) {
+      if (self.indigoUser().serviceAccount) {
         modalOptions = {
           closeButtonText: 'Cancel',
           actionButtonText: 'Revoke service account status',
@@ -94,6 +94,7 @@
 
 
     self.isMe = function() { return Utils.isMe(self.user.id); };
+    self.indigoUser = function() { return self.userCtrl.indigoUser(); };
   }
 
   angular.module('dashboardApp').component('userServiceAccount', {

diff --git a/.../iam/apps/dashboard-app/components/user/sign-on-behalf/user.sign-on-behalf.component.html b/.../iam/apps/dashboard-app/components/user/sign-on-behalf/user.sign-on-behalf.component.html
@@ -15,7 +15,7 @@
     limitations under the License.
 
 -->
-<button ng-if="$ctrl.aupIsEnabled() && !$ctrl.user.serviceAccount && !$ctrl.isMe()"
+<button ng-if="$ctrl.aupIsEnabled() && !$ctrl.indigoUser().serviceAccount && !$ctrl.isMe()"
     class="btn btn-success btn-block"
     style="margin-top: 5px" 
     ng-click="$ctrl.openSignAupOnBehalfModal()" 

diff --git a/...es/iam/apps/dashboard-app/components/user/sign-on-behalf/user.sign-on-behalf.component.js b/...es/iam/apps/dashboard-app/components/user/sign-on-behalf/user.sign-on-behalf.component.js
@@ -29,6 +29,9 @@
     self.aupIsEnabled = function () {
       return self.aup !== null;
     };
+    self.indigoUser = function () {
+      return self.user['urn:indigo-dc:scim:schemas:IndigoUser'];
+    };
 
 
     self.openSignAupOnBehalfModal = function() {

diff --git a/...ervice/src/main/webapp/resources/iam/apps/dashboard-app/components/user/user.component.js b/...ervice/src/main/webapp/resources/iam/apps/dashboard-app/components/user/user.component.js
@@ -46,6 +46,10 @@
             return Utils.isMe(self.user.id);
         };
 
+        self.indigoUser = function () {
+            return self.user['urn:indigo-dc:scim:schemas:IndigoUser'];
+        };
+
         self.canManageLinkedAccounts = function () {
             if (!self.accountLinkingEnabled) {
                 return self.isVoAdmin();