1 files changed, 15 insertions, 60 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/roles/RoleValidator.java b/vid-app-common/src/main/java/org/onap/vid/roles/RoleValidator.java
index 315e22dd7..d37477610 100644
--- a/vid-app-common/src/main/java/org/onap/vid/roles/RoleValidator.java
+++ b/vid-app-common/src/main/java/org/onap/vid/roles/RoleValidator.java
@@ -3,13 +3,14 @@
  * VID
  * ================================================================================
  * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2018 - 2019 Nokia. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,70 +21,24 @@
 
 package org.onap.vid.roles;
 
-import org.onap.vid.mso.rest.RequestDetails;
-
 import java.util.List;
-import java.util.Map;
+import org.apache.commons.lang3.StringUtils;
+import org.onap.portalsdk.core.util.SystemProperties;
 
-/**
- * Created by Oren on 7/12/17.
- */
-public class RoleValidator {
+public interface RoleValidator {
 
-    private boolean disableRoles = true;
-    private List<Role> userRoles;
+    static RoleValidator by(List<Role> roles) {
+        boolean disableRoles =
+            StringUtils.equals(SystemProperties.getProperty("role_management_activated"), "false");
 
-    public RoleValidator(List<Role> roles) {
-        this.userRoles = roles;
+        return disableRoles
+            ? new AlwaysValidRoleValidator()
+            : new RoleValidatorByRoles(roles);
     }
 
-    public boolean isSubscriberPermitted(String subscriberName) {
-        if (this.disableRoles) return true;
-
-        for (Role role : userRoles) {
-            if (role.getSubscribeName().equals(subscriberName))
-                return true;
-        }
-        return false;
-    }
-
-    public boolean isServicePermitted(String subscriberName, String serviceType) {
-        if (this.disableRoles) return true;
-
-        for (Role role : userRoles) {
-            if (role.getSubscribeName().equals(subscriberName) && role.getServiceType().equals(serviceType))
-                return true;
-        }
-        return false;
-    }
+    boolean isSubscriberPermitted(String subscriberName);
 
-    public boolean isMsoRequestValid(RequestDetails mso_request) {
-        if (this.disableRoles) return true;
+    boolean isServicePermitted(String subscriberName, String serviceType);
 
-        try {
-            String globalSubscriberIdRequested = (String) ((Map) ((Map) mso_request.getAdditionalProperties().get("requestDetails")).get("subscriberInfo")).get("globalSubscriberId");
-            String serviceType = (String) ((Map) ((Map) mso_request.getAdditionalProperties().get("requestDetails")).get("requestParameters")).get("subscriptionServiceType");
-            return isServicePermitted(globalSubscriberIdRequested, serviceType);
-        } catch (Exception e) {
-            //Until we'll get the exact information regarding the tenants and the global customer id, we'll return true on unknown requests to mso
-            return true;
-        }
-    }
-
-    public boolean isTenantPermitted(String globalCustomerId, String serviceType, String tenantName) {
-        if (this.disableRoles) return true;
-
-        for (Role role : userRoles) {
-            if (role.getSubscribeName().equals(globalCustomerId)
-                    && role.getServiceType().equals(serviceType)
-                    && (role.getTenant() == null || role.getTenant().equalsIgnoreCase(tenantName))) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    void enableRoles() {
-        this.disableRoles = false;
-    }
+    boolean isTenantPermitted(String globalCustomerId, String serviceType, String tenantName);
 }