Rename oxTrust UMA properties #407:

#407
GluuFederation · Dec 28, 2016 · df93632 · df93632
1 parent f1f5072
commit df93632
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/configuration/oxtrust-config.json b/configuration/oxtrust-config.json
@@ -108,10 +108,10 @@
     "logoutRedirectUrl":"${config.host.schema}://${config.host.idp_name}${config.oxtrust.web_context}/authentication/finishlogout",
 
     "umaIssuer":"${config.uma.issuer}",
-    "umaClientId":"${config.uma.client_id}",
-    "umaClientKeyId":"${config.uma.client_key_id}",
-    "umaResourceId":"${config.uma.resource_id}",
-    "umaScope":"${config.uma.scope}",
+    "scimUmaClientId":"${config.uma.client_id}",
+    "scimUmaClientKeyId":"${config.uma.client_key_id}",
+    "scimUmaResourceId":"${config.uma.resource_id}",
+    "scimUmaScope":"${config.uma.scope}",
 
     "cssLocation":"/identity/stylesheet",
     "jsLocation":"/identity/js",

diff --git a/server/src/main/java/org/gluu/oxtrust/service/uma/ScimUmaProtectionService.java b/server/src/main/java/org/gluu/oxtrust/service/uma/ScimUmaProtectionService.java
@@ -37,27 +37,27 @@ public class ScimUmaProtectionService extends BaseUmaProtectionService implement
 	private ApplianceService applianceService;
 
 	protected String getClientId() {
-		return applicationConfiguration.getUmaClientId();
+		return applicationConfiguration.getScimUmaClientId();
 	}
 
 	protected String getClientKeyStorePassword() {
-		return applicationConfiguration.getUmaClientKeyStorePassword();
+		return applicationConfiguration.getScimUmaClientKeyStorePassword();
 	}
 
 	protected String getClientKeyStoreFile() {
-		return applicationConfiguration.getUmaClientKeyStoreFile();
+		return applicationConfiguration.getScimUmaClientKeyStoreFile();
 	}
 
 	protected String getClientKeyId() {
-		return applicationConfiguration.getUmaClientKeyId();
+		return applicationConfiguration.getScimUmaClientKeyId();
 	}
 
 	public String getUmaResourceId() {
-		return applicationConfiguration.getUmaResourceId();
+		return applicationConfiguration.getScimUmaResourceId();
 	}
 
 	public String getUmaScope() {
-		return applicationConfiguration.getUmaScope();
+		return applicationConfiguration.getScimUmaScope();
 	}
 
 	public boolean isEnabled() {

diff --git a/static/src/main/resources/META-INF/resources/schema/oxtrust.properties.json b/static/src/main/resources/META-INF/resources/schema/oxtrust.properties.json
@@ -362,32 +362,32 @@
             "type": "string",
             "minLength": 1
         },
-        "umaClientId": {
+        "scimUmaClientId": {
             "id": "umaClientId",
             "type": "string",
             "minLength": 1
         },
-        "umaClientKeyId": {
+        "scimUmaClientKeyId": {
             "id": "umaClientKeyId",
             "type": "string",
             "minLength": 1
         },
-        "umaResourceId": {
+        "scimUmaResourceId": {
             "id": "umaResourceId",
             "type": "string",
             "minLength": 1
         },
-        "umaScope": {
+        "scimUmaScope": {
             "id": "umaScope",
             "type": "string",
             "minLength": 1
         },
-        "umaClientKeyStoreFile": {
+        "scimUmaClientKeyStoreFile": {
             "id": "umaClientKeyStoreFile",
             "type": "string",
             "minLength": 1
         },
-        "umaClientKeyStorePassword": {
+        "scimUmaClientKeyStorePassword": {
             "id": "umaClientKeyStorePassword",
             "type": "string",
             "minLength": 1
@@ -614,12 +614,12 @@
         "oxAuthIssuer",
         "ignoreValidation",
         "umaIssuer",
-        "umaClientId",
-        "umaClientKeyId",
-        "umaResourceId",
-        "umaScope",
-        "umaClientKeyStoreFile",
-        "umaClientKeyStorePassword",
+        "scimUmaClientId",
+        "scimUmaClientKeyId",
+        "scimUmaResourceId",
+        "scimUmaScope",
+        "scimUmaClientKeyStoreFile",
+        "scimUmaClientKeyStorePassword",
         "passportUmaClientId",
         "passportUmaClientKeyId",
         "passportUmaResourceId",