chore: naming conformance #159

Author: jgomer2001

app/src/main/java/org/gluu/casa/core/ConfigurationHandler.java

@@ -99,9 +99,9 @@ void init() {
                 //This is a trick so the timer event logic can be coded inside this managed bean
                 timerService.addListener(this, acrQuartzJobName);
                 /*
-                 A gap of 5 seconds is enough for the RestEasy scanning process to take place (in case oxAuth is already up and running)
+                 A gap of 5 seconds is enough for the RestEasy scanning process to take place (in case AS is already up and running)
                  RETRIES*RETRY_INTERVAL seconds gives room to recover the acr list. This big amount of time may be required
-                 in cases where casa service starts too soon (even before oxAuth itself)
+                 in cases where casa service starts too soon (even before AS itself)
                 */
                 timerService.schedule(acrQuartzJobName, 5, RETRIES, RETRY_INTERVAL);
             } else {

app/src/main/java/org/gluu/casa/core/PersistenceService.java

@@ -27,8 +27,8 @@
 
 import org.gluu.casa.model.ApplicationConfiguration;
 import org.gluu.casa.core.model.CustomScript;
-import org.gluu.casa.core.model.GluuOrganization;
-import org.gluu.casa.core.model.oxAuthConfiguration;
+import org.gluu.casa.core.model.JansOrganization;
+import org.gluu.casa.core.model.ASConfiguration;
 import org.gluu.casa.core.model.Person;
 import org.gluu.casa.misc.Utils;
 import org.gluu.casa.service.IPersistenceService;
@@ -57,9 +57,9 @@ public class PersistenceService implements IPersistenceService {
 
     private String rootDn;
 
-    private JsonNode oxAuthConfDynamic;
+    private JsonNode dynamicConfig;
 
-    private JsonNode oxAuthConfStatic;
+    private JsonNode staticConfig;
 
     private Set<String> personCustomObjectClasses;
 
@@ -192,39 +192,39 @@ public String getPersonDn(String id) {
     }
 
     public String getPeopleDn() {
-        return jsonProperty(oxAuthConfStatic, "baseDn", "people");
+        return jsonProperty(staticConfig, "baseDn", "people");
     }
 
     public String getGroupsDn() {
-        return jsonProperty(oxAuthConfStatic, "baseDn", "groups");
+        return jsonProperty(staticConfig, "baseDn", "groups");
     }
 
     public String getClientsDn() {
-        return jsonProperty(oxAuthConfStatic, "baseDn", "clients");
+        return jsonProperty(staticConfig, "baseDn", "clients");
     }
 
     public String getScopesDn() {
-        return jsonProperty(oxAuthConfStatic, "baseDn", "scopes");
+        return jsonProperty(staticConfig, "baseDn", "scopes");
     }
 
     public String getCustomScriptsDn() {
-        return jsonProperty(oxAuthConfStatic, "baseDn", "scripts");
+        return jsonProperty(staticConfig, "baseDn", "scripts");
     }
 
-    public GluuOrganization getOrganization() {
-        return get(GluuOrganization.class, rootDn);
+    public JansOrganization getOrganization() {
+        return get(JansOrganization.class, rootDn);
     }
 
     public String getIssuerUrl() {
-        return jsonProperty(oxAuthConfDynamic, "issuer");
+        return jsonProperty(dynamicConfig, "issuer");
     }
 
     public Set<String> getPersonOCs() {
         return personCustomObjectClasses;
     }
 
     public boolean isAdmin(String userId) {
-        GluuOrganization organization = getOrganization();
+        JansOrganization organization = getOrganization();
         List<String> dns = organization.getManagerGroups();
 
         Person personMember = get(Person.class, getPersonDn(userId));
@@ -234,23 +234,23 @@ public boolean isAdmin(String userId) {
     }
 
     public String getIntrospectionEndpoint() {
-        return jsonProperty(oxAuthConfDynamic, "introspectionEndpoint");
+        return jsonProperty(dynamicConfig, "introspectionEndpoint");
     }
 
     public String getAuthorizationEndpoint() {
-        return jsonProperty(oxAuthConfDynamic, "authorizationEndpoint");
+        return jsonProperty(dynamicConfig, "authorizationEndpoint");
     }
 
     public String getTokenEndpoint() {
-        return jsonProperty(oxAuthConfDynamic, "tokenEndpoint");
+        return jsonProperty(dynamicConfig, "tokenEndpoint");
     }
 
     public String getUserInfoEndpoint() {
-        return jsonProperty(oxAuthConfDynamic, "userInfoEndpoint");
+        return jsonProperty(dynamicConfig, "userInfoEndpoint");
     }
 
     public String getJwksUri() {
-        return jsonProperty(oxAuthConfDynamic, "jwksUri");
+        return jsonProperty(dynamicConfig, "jwksUri");
     }
 
     @Produces
@@ -334,11 +334,11 @@ private boolean loadApplianceSettings(Properties properties) {
 
         boolean success = false;
         try {
-            loadOxAuthSettings(properties.getProperty("oxauth_ConfigurationEntryDN"));
-            rootDn = "o=gluu";
+            loadASSettings(properties.getProperty("jansAuth_ConfigurationEntryDN"));
+            rootDn = "o=jans";
             success = true;
 
-            GluuConfiguration gluuConf = get(GluuConfiguration.class, jsonProperty(oxAuthConfStatic, "baseDn", "configuration"));
+            GluuConfiguration gluuConf = get(GluuConfiguration.class, jsonProperty(staticConfig, "baseDn", "configuration"));
             cacheConfiguration = gluuConf.getCacheConfiguration();
             documentStoreConfiguration = gluuConf.getDocumentStoreConfiguration();
         } catch (Exception e) {
@@ -348,13 +348,13 @@ private boolean loadApplianceSettings(Properties properties) {
 
     }
 
-    private void loadOxAuthSettings(String dn) throws Exception {
+    private void loadASSettings(String dn) throws Exception {
 
-        oxAuthConfiguration conf = get(oxAuthConfiguration.class, dn);
-        oxAuthConfDynamic = mapper.readTree(conf.getJansConfStatic());
-        oxAuthConfStatic = mapper.readTree(conf.getJansConfDyn());
+        ASConfiguration conf = get(ASConfiguration.class, dn);
+        dynamicConfig = mapper.readTree(conf.getJansConfStatic());
+        staticConfig = mapper.readTree(conf.getJansConfDyn());
 
-        personCustomObjectClasses = Optional.ofNullable(oxAuthConfDynamic.get("personCustomObjectClassList"))
+        personCustomObjectClasses = Optional.ofNullable(dynamicConfig.get("personCustomObjectClassList"))
                 .map(node -> {
                     try {
                         Set<String> ocs = new HashSet<>();

app/src/main/java/org/gluu/casa/core/model/oxAuthConfiguration.java renamed to app/src/main/java/org/gluu/casa/core/model/ASConfiguration.java

@@ -7,7 +7,7 @@
 
 @DataEntry
 @ObjectClass("jansAppConf")
-public class oxAuthConfiguration extends Entry {
+public class ASConfiguration extends Entry {
 
     @AttributeName
     private String jansConfDyn;

app/src/main/java/org/gluu/casa/plugins/authnmethod/rs/SecurityKey2EnrollingWS.java

@@ -114,7 +114,7 @@ public Response sendRegistrationResult(String body, @PathParam("userid") String
                             result = RegistrationCode.SUCCESS;
                         }
                     } else {
-                        logger.error("Verification has failed. See oxauth logs");
+                        logger.error("Verification has failed. See fido2 logs");
                         result = RegistrationCode.FAILED;
                     }
                 } catch (Exception e) {

app/src/main/java/org/gluu/casa/plugins/authnmethod/service/MobilePhoneService.java

@@ -105,7 +105,7 @@ public List<VerifiedMobile> getVerifiedPhones(String userId) {
 
     /**
      * Creates an instance of VerifiedMobile by looking up in the list of VerifiedPhones passed. If the item is not found
-     * in the list, it means the user had already that phone added by means of another application, ie. oxTrust. In this
+     * in the list, it means the user had already that phone added by means of another application, ie. admin-ui. In this
      * case the resulting object will not have properties like nickname, etc. Just the phone number
      * @param number Phone number (LDAP attribute "mobile" inside a user entry)
      * @param list List of existing phones enrolled. Ideally, there is an item here corresponding to the uid number passed

app/src/main/java/org/gluu/casa/plugins/authnmethod/service/U2fService.java

@@ -76,7 +76,7 @@ public List<SecurityKey> getDevices(String userId, boolean active) {
 
     /**
      * Triggers a registration request to a U2F endpoint and outputs the request message returned by the service in form of JSON
-     * @param userName As required per org.gluu.oxauth.client.fido.u2f.RegistrationRequestService#startRegistration
+     * @param userName As required per io.jans.as.client.fido.u2f.RegistrationRequestService#startRegistration
      * @param enrollmentCode A previously generated random code stored under user's LDAP entry
      * @return Json string representation
      * @throws Exception Network problem, De/Serialization error, ...
@@ -89,11 +89,11 @@ public String generateJsonRegisterMessage(String userName, String enrollmentCode
 
     /**
      * Executes the finish registration step of the U2F service
-     * @param userName As required per org.gluu.oxauth.client.fido.u2f.RegistrationRequestService#finishRegistration
+     * @param userName As required per io.jans.as.client.fido.u2f.RegistrationRequestService#finishRegistration
      * @param response This is the Json response obtained in the web browser after calling the u2f.register function in Javascript
      */
     public void finishRegistration(String userName, String response) {
-        //first parameter is not used in current implementation, see: org.gluu.oxauth.ws.rs.fido.u2f.U2fRegistrationWS#finishRegistration
+        //first parameter is not used in current implementation, see: io.jans.as.server.ws.rs.fido.u2f.U2fRegistrationWS#finishRegistration
         RegisterStatus status = registrationRequestService.finishRegistration(userName, response);
         logger.info("Response of finish registration: {}", status.getStatus());
     }

app/src/main/java/org/gluu/casa/timer/AuthnScriptsReloader.java

@@ -150,7 +150,7 @@ public void jobToBeExecuted(JobExecutionContext context) {
         if (reload) {
             //"touch" main script so that it gets reloaded. This helps the script to keep the list of supported methods up-to-date
             try {
-                logger.info("Touching main interception script to trigger reload by oxAuth...");
+                logger.info("Touching main interception script to trigger reload by jans-auth-server...");
                 script = persistenceService.getScript(ConfigurationHandler.DEFAULT_ACR);
                 Map<String, String> moduleProperties = Utils.scriptModulePropertiesAsMap(script);
                 ScriptLocationType locType = ScriptLocationType.getByValue(moduleProperties.get(LOCATION_TYPE_PROPERTY));

app/src/main/java/org/gluu/casa/ui/vm/admin/AuthnMethodsViewModel.java

@@ -46,7 +46,7 @@ public void init() {
 
         Map<String, String> mappedAcrs = getSettings().getAcrPluginMap();
 
-        //This set contains entries associated to active acr methods in oxauth
+        //This set contains entries associated to active acr methods in AS
         Set<String> serverAcrs = Optional.ofNullable(Utils.managedBean(ConfigurationHandler.class).retrieveAcrs())
                 .orElse(Collections.emptySet());
 

app/src/main/java/org/gluu/casa/ui/vm/user/SecurityKey2ViewModel.java

@@ -301,7 +301,7 @@ public void cancel() {
 		try {
 			/*
 			 * Remove the recently enrolled key. This is so because once the user touches
-			 * his key button, oxAuth creates the corresponding entry in LDAP, and if the
+			 * his key button, fido2 creates the corresponding entry in LDAP, and if the
 			 * user regrets adding the current key by not supplying a nickname (and thus
 			 * pressing cancel), we need to be obliterate the entry
 			 */

app/src/main/java/org/gluu/casa/ui/vm/user/SecurityKeyViewModel.java

@@ -168,7 +168,7 @@ public void cancel() {
         boolean success;
         try {
             /*
-             Remove the recently enrolled key. This is so because once the user touches his key button, oxAuth creates the
+             Remove the recently enrolled key. This is so because once the user touches his key button, jans-auth-server creates the
              corresponding entry in LDAP, and if the user regrets adding the current key by not supplying a nickname
              (and thus pressing cancel), we need to be obliterate the entry
              */

plugins/account-linking/src/main/java/org/gluu/casa/plugins/accounts/service/AvailableProviders.java

@@ -8,7 +8,7 @@
 import java.util.stream.Collectors;
 
 import org.gluu.casa.misc.Utils;
-import org.gluu.config.oxtrust.LdapOxPassportConfiguration;
+import org.gluu.model.passport.PassportConfigurationEntry;
 import org.gluu.casa.plugins.accounts.pojo.Provider;
 import org.gluu.casa.service.IPersistenceService;
 import org.gluu.model.passport.PassportConfiguration;
@@ -67,8 +67,8 @@ private static List<Provider> retrieveProviders() {
             //skip uninteresting chars
             dn = dn.replaceFirst("[\\W]*=[\\W]*","");
 
-            List<org.gluu.model.passport.Provider> details = Optional.ofNullable(persistenceService.get(LdapOxPassportConfiguration.class, dn))
-                    .map(LdapOxPassportConfiguration::getPassportConfiguration).map(PassportConfiguration::getProviders)
+            List<org.gluu.model.passport.Provider> details = Optional.ofNullable(persistenceService.get(PassportConfigurationEntry.class, dn))
+                    .map(PassportConfigurationEntry::getPassportConfiguration).map(PassportConfiguration::getProviders)
                     .orElse(Collections.emptyList());
 
             details = details.stream().filter(org.gluu.model.passport.Provider::isEnabled).collect(Collectors.toList());
@@ -85,7 +85,7 @@ private static List<Provider> retrieveProviders() {
                 String logo = provider.getLogoImg();
                 if (logo != null && !logo.startsWith("http")) {
                     //It's not an absolute URL
-                    logo = "/oxauth/auth/passport/" + logo;
+                    logo = "/jans-auth/auth/passport/" + logo;
                 }
                 provider.setLogoImg(logo);
                 providers.add(provider);

plugins/account-linking/src/main/java/org/gluu/config/oxtrust/LdapOxPassportConfiguration.java renamed to plugins/account-linking/src/main/java/org/gluu/model/passport/PassportConfigurationEntry.java

@@ -1,16 +1,14 @@
-package org.gluu.config.oxtrust;
+package org.gluu.model.passport;
 
 import io.jans.orm.model.base.Entry;
 import io.jans.orm.annotation.AttributeName;
 import io.jans.orm.annotation.DataEntry;
 import io.jans.orm.annotation.JsonObject;
 import io.jans.orm.annotation.ObjectClass;
 
-import org.gluu.model.passport.PassportConfiguration;
-
 @DataEntry
 @ObjectClass(value = "jansPassportConf")
-public class LdapOxPassportConfiguration extends Entry {
+public class PassportConfigurationEntry extends Entry {
 
     private static final long serialVersionUID = -8451013277721189767L;
 

plugins/cert-authn/src/main/java/org/gluu/casa/plugins/cert/service/CertService.java

@@ -327,7 +327,7 @@ private void updateUserX509Certificates(CertPerson person, X509Certificate certi
                 scimX509Cert.setValue(new String(Base64.getEncoder().encode(DEREncoded), StandardCharsets.UTF_8));
                 scimX509Cert.setDisplay(display);
 
-                logger.debug("Updating user's oxTrustx509Certificate attribute");
+                logger.debug("Updating user's x509Certificate attribute");
                 stringCerts.add(mapper.writeValueAsString(scimX509Cert));
                 person.setX509Certificates(stringCerts);
             }

plugins/cert-authn/src/main/java/org/gluu/casa/plugins/cert/vm/CertAuthenticationViewModel.java

@@ -129,7 +129,7 @@ public void init() throws Exception {
 
             logger.info("Preparing redirect for completion of authentication flow");
             String url = Utils.managedBean(IPersistenceService.class).getIssuerUrl();
-            WebUtils.execRedirect(String.format("%s/oxauth/postlogin.htm", url), true);
+            WebUtils.execRedirect(String.format("%s/jans-auth/postlogin.htm", url), true);
         }
 
     }

plugins/client-authorizations/src/main/java/org/gluu/casa/plugins/consent/model/Token.java

@@ -10,47 +10,47 @@
 public class Token extends Entry {
 
     @AttributeName(name = "tknCde")
-    private String oxAuthTokenCode;
+    private String tokenCode;
 
     @AttributeName(name = "clnId")
-    private String oxAuthClientId;
+    private String clientId;
 
     @AttributeName(name = "tknTyp")
-    private String oxAuthTokenType;
+    private String tokenType;
 
     @AttributeName(name = "usrId")
-    private String oxAuthUserId;
+    private String userId;
 
-    public String getOxAuthTokenCode() {
-        return oxAuthTokenCode;
+    public String getTokenCode() {
+        return tokenCode;
     }
 
-    public String getOxAuthClientId() {
-        return oxAuthClientId;
+    public String getClientId() {
+        return clientId;
     }
 
-    public String getOxAuthTokenType() {
-        return oxAuthTokenType;
+    public String getTokenType() {
+        return tokenType;
     }
 
-    public String getOxAuthUserId() {
-        return oxAuthUserId;
+    public String getUserId() {
+        return userId;
     }
 
-    public void setOxAuthTokenCode(String oxAuthTokenCode) {
-        this.oxAuthTokenCode = oxAuthTokenCode;
+    public void setTokenCode(String tokenCode) {
+        this.tokenCode = tokenCode;
     }
 
-    public void setOxAuthClientId(String v) {
-        this.oxAuthClientId = v;
+    public void setClientId(String v) {
+        this.clientId = v;
     }
 
-    public void setOxAuthTokenType(String v) {
-        this.oxAuthTokenType = v;
+    public void setTokenType(String v) {
+        this.tokenType = v;
     }
 
-    public void setOxAuthUserId(String oxAuthUserId) {
-        this.oxAuthUserId = oxAuthUserId;
+    public void setUserId(String userId) {
+        this.userId = userId;
     }
 
 }