WIFI-846: Add component version and commit hash to application ping

response

base-build/pom.xml

@@ -47,7 +47,6 @@
                                 <module>../base-hierarchical-datastore</module>
                                 <module>../base-jdbc</module>
                                 <module>../base-jdbc-tests</module>
-                                <module>../base-tx-tests</module>
                                 <module>../base-cassandra</module>
                                 <module>../base-cassandra-tests</module>
                                 <module>../base-job</module>

base-container/pom.xml

@@ -39,13 +39,7 @@
     <dependency>
         <groupId>com.auth0</groupId>
         <artifactId>java-jwt</artifactId>
-        <version>3.11.0</version>
+        <version>0.3</version>
-    </dependency>
-    
-    <dependency>
-        <groupId>com.auth0</groupId>
-        <artifactId>jwks-rsa</artifactId>
-        <version>0.14.0</version>
     </dependency>
         	    
   </dependencies>

base-container/src/main/java/com/telecominfraproject/wlan/core/server/cache/CacheConfiguration.java

@@ -5,7 +5,6 @@ import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.caffeine.CaffeineCacheManager;
@@ -14,19 +13,16 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
-import org.springframework.context.annotation.Primary;
 
 @Configuration
 public class CacheConfiguration {
     
     private static final Logger LOG = LoggerFactory.getLogger(CacheConfiguration.class);
-
+    
     @Autowired
-	ApplicationContext applicationContext;
+    ApplicationContext applicationContext;
-
+    
     @Bean
-	@Primary
-	@Qualifier("cacheManager")
     public CacheManager cacheManager() {
     	  CaffeineCacheManager cacheManager = new CaffeineCacheManager();
     	  Caffeine < Object, Object > cb = caffeineCacheBuilder();
@@ -41,12 +37,17 @@ public class CacheConfiguration {
     	   .initialCapacity(100)
     	   .maximumSize(10000)
     	   .expireAfterAccess(10, TimeUnit.MINUTES)
-//    	   .weakKeys()
+    	   .weakKeys()
     	   .recordStats();
+    }    
+    
+    public Cache getCache(CacheType cacheType, String cacheName){
+        CacheManager cm = applicationContext.getBean(CacheManager.class, cacheType.toString());
+        return cm.getCache(cacheName);
     }
-
+    
+    
     @Bean
-	@Qualifier("cacheManagerShortLived")
     public CacheManager cacheManagerShortLived() {
     	  CaffeineCacheManager cacheManager = new CaffeineCacheManager();
     	  Caffeine < Object, Object > cb = caffeineCacheBuilderShortLived(); 
@@ -61,33 +62,8 @@ public class CacheConfiguration {
     	   .initialCapacity(100)
     	   .maximumSize(10000)
     	   .expireAfterAccess(1, TimeUnit.MINUTES)
-//    	   .weakKeys()
+    	   .weakKeys()
     	   .recordStats();
-    }
+    }    
 
-	@Bean
-	@Qualifier("cacheManagerLongLived")
-	public CacheManager cacheManagerLongLived() {
-		CaffeineCacheManager cacheManager = new CaffeineCacheManager();
-		Caffeine<Object, Object> cb = caffeineCacheBuilderLongLived();
-		cacheManager.setCaffeine(cb);
-		LOG.info("Configured cache manager with expiry {}", cb);
-
-		return cacheManager;
-	}
-
-	Caffeine<Object, Object> caffeineCacheBuilderLongLived() {
-		return Caffeine.newBuilder()
-				.initialCapacity(100)
-				.maximumSize(10000)
-				.expireAfterAccess(2, TimeUnit.HOURS)
-//              .weakKeys() Do not use weak keys - garbage collection will remove our values when we still want them
-				.recordStats();
-	}
-
-	public Cache getCache(String cacheName, String cacheManagerQualifier) {
-    	CacheManager cm = applicationContext.getBeansOfType(CacheManager.class).get(cacheManagerQualifier);
-		return cm.getCache(cacheName);
-
-	}
 }

base-container/src/main/java/com/telecominfraproject/wlan/core/server/cache/CacheType.java

@@ -0,0 +1,5 @@
+package com.telecominfraproject.wlan.core.server.cache;
+
+public enum CacheType {
+
+}

base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/ConnectorProperties.java

@@ -8,51 +8,10 @@ import java.net.InetAddress;
  */
 public interface ConnectorProperties {
 
-    /**
-     * @return port on which this server listens for internal API requests
-     */
-    int getInternalPort();
-    
-    /**
-     * @return host on which this server listens for internal API requests
-     */
-    String getInternalHostName();
-    
-    /**
-     * @return ip address on which this server listens for internal API requests
-     */
-    InetAddress getInternalIpAddress();
-
-    
-    /**
-     * @return port on which this server listens for API requests from the outside world
-     */
     int getExternalPort();
-    
+    int getInternalPort();
-    /**
-     * @return host on which this server listens for API requests from the outside world
-     */
-    String getExternalHostName();
-    
-    /**
-     * @return ip address on which this server listens for API requests from the outside world
-     */
     InetAddress getExternalIpAddress();
-
+    InetAddress getInternalIpAddress();
-    
+    String getExternalHostName();
-    /**
+    String getInternalHostName();
-     * @return port which this server advertises to clients so that they can send API requests from the outside world, could be a load-balancer port, or a kubernetes-remapped port
-     */
-    int getExternallyVisiblePort();
-    
-    /**
-     * @return host which this server advertises to clients so that they can send API requests from the outside world, could be a load-balancer host, or a kubernetes-remapped host
-     */
-    String getExternallyVisibleHostName();
-    
-    /**
-     * @return  ip address which this server advertises to clients so that they can send API requests from the outside world, could be a load-balancer ip address, or a kubernetes-remapped ip address
-     */
-    InetAddress getExternallyVisibleIpAddress();
-
 }

base-container/src/main/java/com/telecominfraproject/wlan/core/server/container/ConnectorPropertiesImpl.java

@@ -17,21 +17,14 @@ public class ConnectorPropertiesImpl implements ConnectorProperties {
 
     private static final Logger LOG = LoggerFactory.getLogger(ConnectorProperties.class);
 
-    //host and port on which this server listens for internal API requests
+    private final int externalPort;
     private final int internalPort;
-    private final String internalHostName;
+    private final InetAddress externalIpAddress;
     private final InetAddress internalIpAddress;
 
-    //host and port on which this server listens for API requests from the outside world
-    private final int externalPort;
     private final String externalHostName;
-    private final InetAddress externalIpAddress;
+    private final String internalHostName;
     
-    //host and port which this server advertises to clients so that they can send API requests from the outside world, could be a load-balancer host and port, or a kubernetes-remapped host/port
-    private final int externallyVisiblePort;
-    private final String externallyVisibleHostName;
-    private final InetAddress externallyVisibleIpAddress;
-
     public ConnectorPropertiesImpl(Environment environment){
         
         int _externalPort = Integer.parseInt(environment.getProperty("server.port").trim());
@@ -79,46 +72,26 @@ public class ConnectorPropertiesImpl implements ConnectorProperties {
             _internalHostName = _internalIpAddress.getCanonicalHostName();
         }
 
-
-        //Populate externally-visible properties, if any
-        int _externallyVisiblePort = Integer.parseInt(environment.getProperty("tip.wlan.externallyVisiblePort", "0").trim());
-        if(_externallyVisiblePort == 0) {
-            _externallyVisiblePort = _externalPort;
-        }
-        
-        String _externallyVisibleHostName = environment.getProperty("tip.wlan.externallyVisibleHostName");
-        if(_externallyVisibleHostName == null || _externallyVisibleHostName.trim().isEmpty()) {
-            _externallyVisibleHostName = _externalHostName;
-        }
-        
-        InetAddress _externallyVisibleIpAddress;
-        String externallyVisibleIpAddrStr = environment.getProperty("tip.wlan.externallyVisibleIpAddress");
-        if(externallyVisibleIpAddrStr == null) {
-            _externallyVisibleIpAddress = _externalIpAddress;
-        } else {
-            try {
-                _externallyVisibleIpAddress = InetAddress.getByName(externallyVisibleIpAddrStr.trim());
-            } catch (UnknownHostException e) {
-                throw new ConfigurationException("Cannot get externally visible address of the system", e);
-            }
-        }
-        
         
         this.externalIpAddress = _externalIpAddress;
         this.externalHostName = _externalHostName;
         this.externalPort = _externalPort;
-
         this.internalIpAddress = _internalIpAddress;
         this.internalHostName = _internalHostName;
         this.internalPort = _internalPort;
 
-        this.externallyVisibleIpAddress = _externallyVisibleIpAddress;
-        this.externallyVisibleHostName = _externallyVisibleHostName;
-        this.externallyVisiblePort = _externallyVisiblePort;
-
         LOG.info("connectorProperties {}", this);
     }
     
+    public ConnectorPropertiesImpl(String externalHostName, InetAddress externalIpAddress, int externalPort, 
+            String internalHostName, InetAddress internalIpAddress, int internalPort) {
+        this.externalIpAddress = externalIpAddress;
+        this.externalHostName = externalHostName;
+        this.externalPort = externalPort;
+        this.internalIpAddress = internalIpAddress;
+        this.internalHostName = internalHostName;
+        this.internalPort = internalPort;
+    }
 
     public int getExternalPort() {
         return externalPort;
@@ -144,24 +117,24 @@ public class ConnectorPropertiesImpl implements ConnectorProperties {
         return internalHostName;
     }
 
-    public int getExternallyVisiblePort() {
-        return externallyVisiblePort;
-    }
-
-    public String getExternallyVisibleHostName() {
-        return externallyVisibleHostName;
-    }
-
-    public InetAddress getExternallyVisibleIpAddress() {
-        return externallyVisibleIpAddress;
-    }
-
     @Override
     public String toString() {
-        return String.format(
+        StringBuilder builder = new StringBuilder();
-                "ConnectorPropertiesImpl [internalPort=%s, internalHostName=%s, internalIpAddress=%s, externalPort=%s, externalHostName=%s, externalIpAddress=%s, externallyVisiblePort=%s, externallyVisibleHostName=%s, externallyVisibleIpAddress=%s]",
+        builder.append("ConnectorProperties [externalHostName=");
-                internalPort, internalHostName, internalIpAddress, externalPort, externalHostName, externalIpAddress,
+        builder.append(externalHostName);
-                externallyVisiblePort, externallyVisibleHostName, externallyVisibleIpAddress);
+        builder.append(", externalIpAddress=");
+        builder.append(externalIpAddress);
+        builder.append(", externalPort=");
+        builder.append(externalPort);
+        builder.append(", internalHostName=");
+        builder.append(internalHostName);
+        builder.append(", internalIpAddress=");
+        builder.append(internalIpAddress);
+        builder.append(", internalPort=");
+        builder.append(internalPort);
+        builder.append("]");
+        return builder.toString();
     }
+
     
 }

base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/WebSecurityConfig.java

@@ -871,23 +871,21 @@ public abstract class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     protected Auth0AuthenticationProvider createAuth0AuthenticationProvider(int providerIndex) throws Exception {
         String clientId;
         String clientSecret;
-        String issuer;
+        String securedRoute;
         String accessTypeValue;
-        String jwksLocation;
         if (0 == providerIndex) {
             clientId = environment.getProperty("tip.wlan.auth0.clientId", DEFAULT_AUTH0_PROPERTY);
             clientSecret = environment.getProperty("tip.wlan.auth0.clientSecret", DEFAULT_AUTH0_PROPERTY);
-            issuer = environment.getProperty("tip.wlan.auth0.issuerUri", DEFAULT_AUTH0_PROPERTY);
+            securedRoute = environment.getProperty("tip.wlan.auth0.securedRoute", DEFAULT_AUTH0_PROPERTY);
             accessTypeValue = environment.getProperty("tip.wlan.auth0.accessType",
                     getDefaultAccessType(providerIndex));
-            jwksLocation = environment.getProperty("tip.wlan.auth0.jwksLocation", DEFAULT_AUTH0_PROPERTY);
         } else {
             clientId = environment.getProperty("tip.wlan.auth0.clientId" + providerIndex);
             clientSecret = environment.getProperty("tip.wlan.auth0.clientSecret" + providerIndex);
-            issuer = environment.getProperty("tip.wlan.auth0.issuer" + providerIndex);
+            securedRoute = environment.getProperty("tip.wlan.auth0.securedRoute" + providerIndex,
+                    DEFAULT_AUTH0_PROPERTY);
             accessTypeValue = environment.getProperty("tip.wlan.auth0.accessType" + providerIndex,
                     getDefaultAccessType(providerIndex));
-            jwksLocation = environment.getProperty("tip.wlan.auth0.jwksLocation" + providerIndex);
         }
         if (null == clientId) {
             return null;
@@ -898,8 +896,7 @@ public abstract class WebSecurityConfig extends WebSecurityConfigurerAdapter {
             Auth0AuthenticationProvider auth0Provider = new Auth0AuthenticationProvider(accessType);
             auth0Provider.setClientId(clientId);
             auth0Provider.setClientSecret(clientSecret);
-            auth0Provider.setIssuer(issuer);
+            auth0Provider.setSecuredRoute(securedRoute);
-            auth0Provider.setJwksLocation(jwksLocation);
             auth0Provider.afterPropertiesSet();
             LOG.info("Loaded configuration for auth0 provider {}", providerIndex);
             return auth0Provider;

base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/Auth0AuthenticationProvider.java

@@ -1,12 +1,9 @@
 package com.telecominfraproject.wlan.core.server.security.auth0;
 
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStream;
+import java.security.InvalidKeyException;
-import java.io.InputStreamReader;
+import java.security.NoSuchAlgorithmException;
-import java.security.interfaces.RSAPublicKey;
+import java.security.SignatureException;
-import java.util.List;
 import java.util.Map;
 import java.util.Scanner;
 
@@ -16,20 +13,8 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
-import org.springframework.util.ResourceUtils;
 
-import com.auth0.jwk.Jwk;
-import com.auth0.jwk.JwkException;
-import com.auth0.jwt.JWT;
 import com.auth0.jwt.JWTVerifier;
-import com.auth0.jwt.algorithms.Algorithm;
-import com.auth0.jwt.exceptions.JWTDecodeException;
-import com.auth0.jwt.exceptions.JWTVerificationException;
-import com.auth0.jwt.interfaces.DecodedJWT;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Lists;
 import com.telecominfraproject.wlan.core.server.security.AccessType;
 import com.telecominfraproject.wlan.server.exceptions.ConfigurationException;
 
@@ -38,21 +23,18 @@ import com.telecominfraproject.wlan.server.exceptions.ConfigurationException;
  * the userdetails in the authentication object
  * 
  * @author Daniel Teixeira
- * @author rlee
  */
 public class Auth0AuthenticationProvider implements AuthenticationProvider, InitializingBean {
 
     private static final Logger LOG = LoggerFactory.getLogger(Auth0AuthenticationProvider.class);
-    
-    private ObjectMapper mapper = new ObjectMapper();
 
+    private JWTVerifier jwtVerifier = null;
     private String clientSecret = null;
     private String clientId = null;
-    private String issuer = null;
+    private String securedRoute = null;
-    private String jwksLocation = null;
     private final AccessType accessType;
     private static final AuthenticationException AUTH_ERROR = new Auth0TokenException("Authentication error occured");
-    
+
     public Auth0AuthenticationProvider(AccessType accessType) {
         this.accessType = accessType;
     }
@@ -60,52 +42,35 @@ public class Auth0AuthenticationProvider implements AuthenticationProvider, Init
     public Authentication authenticate(Authentication authentication) throws AuthenticationException {
 
         String token = ((Auth0JWTToken) authentication).getJwt();
-        LOG.trace("Auth0 trying to authenticate with token: {} ", token);
-                        
-        try {
-            Auth0JWTToken tokenAuth = ((Auth0JWTToken) authentication);
-            
-            DecodedJWT jwt = JWT.decode(token);
-            String alg = jwt.getAlgorithm();
-            
-            // Get jwks file
-            Jwk jwk = getJwk(jwt.getKeyId());
-            if (jwk == null) {
-            	throw new JwkException("jwk could not be found");
-            }
 
-            Algorithm algorithm;
+        LOG.trace("Auth0 trying to authenticate with token: {} ", token);
-            if (alg.equals("RS256")) {
+
-            	// create RS256 key decoder
+        Map<String, Object> decoded;
-            	algorithm = Algorithm.RSA256((RSAPublicKey) jwk.getPublicKey(), null);
+        try {
-            } else {
+
-            	// create HS256 key decoder
+            Auth0JWTToken tokenAuth = ((Auth0JWTToken) authentication);
-            	algorithm = Algorithm.HMAC256(clientSecret);
+            decoded = jwtVerifier.verify(token);
-            }
+            LOG.trace("Decoded JWT token {}", decoded);
-            
-            JWTVerifier verifier = JWT.require(algorithm)
-            		.withIssuer(issuer)
-            		.build();
-            
-            jwt = verifier.verify(token);
-            LOG.trace("Decoded JWT token {}", jwt);
             tokenAuth.setAuthenticated(true);
-            tokenAuth.setPrincipal(new Auth0UserDetails(jwt, this.accessType));
+            tokenAuth.setPrincipal(new Auth0UserDetails(decoded, this.accessType));
-            tokenAuth.setDetails(jwt);
+            tokenAuth.setDetails(decoded);
             return authentication;
 
-        } catch (JWTDecodeException e) {
+        } catch (InvalidKeyException e) {
-            LOG.error("JWTDecodeException thrown while decoding JWT token", e);
+            LOG.error("InvalidKeyException thrown while decoding JWT token", e);
             throw AUTH_ERROR;
-        } catch (JWTVerificationException e) {
+        } catch (NoSuchAlgorithmException e) {
-            LOG.error("JWTVerificationException thrown while decoding JWT token", e);
+            LOG.error("NoSuchAlgorithmException thrown while decoding JWT token", e);
-            throw AUTH_ERROR;
-        } catch (JwkException e) {
-            LOG.error("JwkException thrown while decoding JWT token", e);
             throw AUTH_ERROR;
         } catch (IllegalStateException e) {
             LOG.error("IllegalStateException thrown while decoding JWT token", e);
             throw AUTH_ERROR;
+        } catch (SignatureException e) {
+            LOG.debug("SignatureException thrown while decoding JWT token", e);
+            throw AUTH_ERROR;
+        } catch (IOException e) {
+            LOG.error("IOException thrown while decoding JWT token", e);
+            throw AUTH_ERROR;
         }
     }
 
@@ -114,84 +79,21 @@ public class Auth0AuthenticationProvider implements AuthenticationProvider, Init
     }
 
     public void afterPropertiesSet() throws Exception {
-        if ((clientSecret == null) || (clientId == null) || (issuer == null)) {
+        if ((clientSecret == null) || (clientId == null)) {
-            throw new ConfigurationException("Client secret, client id, or issuer URI is not set for Auth0AuthenticationProvider");
+            throw new ConfigurationException("Client secret or client id is not set for Auth0AuthenticationProvider");
         }
+        if (securedRoute == null) {
+            throw new ConfigurationException("SecureRoute is not set for Auth0AuthenticationProvider");
+        }
+        jwtVerifier = new JWTVerifier(clientSecret, clientId);
     }
-    
+
-    private Jwk getJwk(String keyId) {
+    public String getSecuredRoute() {
-        try {      	
+        return securedRoute;
-        	String jwksSource = getJwksString();
-        	if (jwksSource == null) {
-            	throw new FileNotFoundException("jwks could not be found");
-            }
-        	
-        	List<Jwk> jwks = Lists.newArrayList();
-        	@SuppressWarnings("unchecked")
-    		List<Map<String, Object>> keys = (List<Map<String, Object>>) mapper.readValue(jwksSource, Map.class).get("keys");
-            
-            for (Map<String, Object> values : keys) {
-                jwks.add(Jwk.fromValues(values));
-            }
-            
-            if (keyId == null && jwks.size() == 1) {
-                return jwks.get(0);
-            }
-            
-            if (keyId != null) {
-                for (Jwk jwk : jwks) {
-                    if (keyId.equals(jwk.getId())) {
-                    	// Can only contain 1 matching jwk
-                        return jwk;
-                    }
-                }
-            }
-            
-        } catch (JsonMappingException e) {
-        	LOG.error("JsonMappingException thrown while decoding JWT token", e);
-            throw AUTH_ERROR;
-		} catch (JsonProcessingException e) {
-			LOG.error("JsonProcessingException thrown while decoding JWT token", e);
-            throw AUTH_ERROR;
-		} catch (FileNotFoundException e) {
-			LOG.error("FileNotFoundException thrown while decoding JWT token", e);
-            throw AUTH_ERROR;
-		}
-        
-        return null;
     }
-    
+
-    private String getJwksString() {
+    public void setSecuredRoute(String securedRoute) {
-    	LOG.debug("Loading jwks from {}", jwksLocation);		
+        this.securedRoute = securedRoute;
-    	String ret = null;
-    	
-    	try {
-	    	Object jwksObj = ResourceUtils.getURL(jwksLocation).getContent();
-	    	if (jwksObj instanceof InputStream) {
-	    		ret = readFromInputStream((InputStream) jwksObj);
-	    	}
-    	} catch (FileNotFoundException e) {
-    		LOG.error("FileNotFoundException thrown while getting jwks", e);
-            throw AUTH_ERROR;
-    	} catch (IOException e) {
-    		LOG.error("IOException thrown while getting jwks", e);
-            throw AUTH_ERROR;
-		}
-	  return ret;
-	}
-    
-    private String readFromInputStream(InputStream inputStream) {
-    	StringBuilder resultStringBuilder = new StringBuilder();
-	    try (BufferedReader br = new BufferedReader(new InputStreamReader(inputStream))) {
-	        String line;
-	        while ((line = br.readLine()) != null) {
-	            resultStringBuilder.append(line).append("\n");
-	        }
-	    } catch (IOException e) {
-	    	LOG.error("IOException thrown while getting jwks", e);
-            throw AUTH_ERROR;
-	    }
-	    return resultStringBuilder.toString();
     }
 
     public String getClientSecret() {
@@ -209,22 +111,6 @@ public class Auth0AuthenticationProvider implements AuthenticationProvider, Init
     public void setClientId(String clientId) {
         this.clientId = clientId;
     }
-    
-    public String getIssuer() {
-    	return issuer;
-    }
-    
-    public void setIssuer(String issuer) {
-    	this.issuer = issuer;
-    }
-    
-    public String getJwksLocation() {
-    	return jwksLocation;
-    }
-    
-    public void setJwksLocation(String jwksLocation) {
-    	this.jwksLocation = jwksLocation;
-    }
 
     /**
      * Use to encode raw secret to Base 64 URL safe string

base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/Auth0UserDetails.java

@@ -2,6 +2,7 @@ package com.telecominfraproject.wlan.core.server.security.auth0;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -9,7 +10,6 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
-import com.auth0.jwt.interfaces.DecodedJWT;
 import com.telecominfraproject.wlan.core.server.security.AccessType;
 import com.telecominfraproject.wlan.core.server.security.AuthProviderInfo;
 
@@ -24,46 +24,42 @@ public class Auth0UserDetails implements UserDetails, AuthProviderInfo {
 
     private static final long serialVersionUID = 2058797193125711681L;
 
-    private DecodedJWT details;
+    private Map<String, Object> details;
     private String username;
     private boolean emailVerified = false;
     private Collection<GrantedAuthority> authorities = null;
     private final AccessType accessType;
-    private static final String EMAIL_CLAIM = "email";
-    private static final String EMAIL_VERIFIED_CLAIM = "email_verified";
-    private static final String NICKNAME_CLAIM = "nickname";
-    private static final String ROLES_CLAIM = "roles";
 
     private static final Log LOGGER = LogFactory.getLog(Auth0UserDetails.class);
 
-    public Auth0UserDetails(DecodedJWT jwt, AccessType accessType) {
+    @SuppressWarnings("unchecked")
+    public Auth0UserDetails(Map<String, Object> map, AccessType accessType) {
         this.accessType = accessType;
-        if (!jwt.getClaim(EMAIL_CLAIM).isNull()) {
+        if (map.containsKey("email")) {
-            this.username = jwt.getClaim(EMAIL_CLAIM).asString();
+            this.username = map.get("email").toString();
-        } else if (!jwt.getClaim(NICKNAME_CLAIM).isNull()) {
+        } else if (map.containsKey("username")) {
-            this.username = jwt.getClaim(NICKNAME_CLAIM).asString();
+            this.username = map.get("username").toString();
-        } else if (jwt.getId() != null) {
+        } else if (map.containsKey("user_id")) {
-            this.username = jwt.getId();
+            this.username = map.get("user_id").toString();
-        } else if (jwt.getSubject() != null) {
-            this.username = jwt.getSubject();
         } else {
             this.username = "UNKNOWN_USER";
         }
 
-        if (!jwt.getClaim(EMAIL_CLAIM).isNull()) {
+        if (map.containsKey("email")) {
-            this.emailVerified = Boolean.valueOf(jwt.getClaim(EMAIL_VERIFIED_CLAIM).toString());
+            this.emailVerified = Boolean.valueOf(map.get("email_verified").toString());
         }
 
         // set authorities
         authorities = new ArrayList<>();
-        if (!jwt.getClaim(ROLES_CLAIM).isNull()) {
+        if (map.containsKey("roles")) {
             ArrayList<String> roles = null;
             try {
-                roles = (ArrayList<String>) jwt.getClaim(ROLES_CLAIM).asList(String.class);
+                roles = (ArrayList<String>) map.get("roles");
                 for (String role : roles) {
                     authorities.add(new SimpleGrantedAuthority(role));
                 }
             } catch (java.lang.ClassCastException e) {
+                // e.printStackTrace();
                 LOGGER.error("Error in casting the roles object", e);
             }
         }
@@ -73,7 +69,7 @@ public class Auth0UserDetails implements UserDetails, AuthProviderInfo {
             authorities.add(new SimpleGrantedAuthority("ROLE_USER"));
         }
 
-        this.details = jwt;
+        this.details = map;
 
     }
 
@@ -132,11 +128,7 @@ public class Auth0UserDetails implements UserDetails, AuthProviderInfo {
      *         otherwise
      */
     public Object getAuth0Attribute(String attributeName) {
-        if (details.getClaim(attributeName).isNull()) {
+        return details.get(attributeName);
-        	LOGGER.debug("No attribute was found : " + attributeName);
-        	return null;
-        }
-        return details.getClaim(attributeName);
     }
 
     @Override

base-container/src/main/java/com/telecominfraproject/wlan/core/server/security/auth0/impl/Auth0TokenHelperImpl.java

@@ -1,23 +1,21 @@
 package com.telecominfraproject.wlan.core.server.security.auth0.impl;
 
 import java.io.IOException;
-import java.security.interfaces.RSAPublicKey;
+import java.security.InvalidKeyException;
-import java.util.Date;
+import java.security.NoSuchAlgorithmException;
+import java.security.SignatureException;
 import java.util.Map;
 
+import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
 
-import com.auth0.jwt.algorithms.Algorithm;
+import com.auth0.jwt.Algorithm;
-import com.auth0.jwt.interfaces.DecodedJWT;
+import com.auth0.jwt.ClaimSet;
-import com.auth0.jwk.Jwk;
-import com.auth0.jwk.JwkException;
-import com.auth0.jwk.JwkProvider;
-import com.auth0.jwk.UrlJwkProvider;
-import com.auth0.jwt.JWT;
 import com.auth0.jwt.JWTVerifier;
+import com.auth0.jwt.JwtSigner;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.telecominfraproject.wlan.core.server.security.auth0.Auth0TokenHelper;
@@ -27,23 +25,26 @@ public class Auth0TokenHelperImpl implements Auth0TokenHelper<Object>, Initializ
 	private static final Log Logger = LogFactory.getLog(Auth0TokenHelperImpl.class);
 	
 	private String clientSecret = null;
-	private String issuer = null;
+	private String clientId = null;
 
 	@Override
 	public String generateToken(Object object, int expiration) {
 
-		String token;
+		String payload, token;
 		try {
-			
+		
-			Algorithm hsEncoded = Algorithm.HMAC256(clientSecret);
+			JwtSigner jwtSigner = new JwtSigner();
-			token = JWT.create()
+			payload = new  ObjectMapper().writeValueAsString(object);
-					.withIssuer(issuer)
+
-					.withExpiresAt(new Date(expiration))
+		    ClaimSet claimSet = new ClaimSet();
-					.withClaim("payload", new ObjectMapper().writeValueAsString(object))
+		    claimSet.setExp(expiration); // expire in 1 year
-					.sign(hsEncoded);
+		    
+		    token = jwtSigner.encode(Algorithm.HS256, payload, "payload", new String(Base64.decodeBase64(clientSecret)), claimSet);
 		
 		} catch (JsonProcessingException e) {
 			throw new Auth0RuntimeException(e);
+		} catch (Exception e) {
+			throw new Auth0RuntimeException(e);
 		}
 		
 		return token;
@@ -52,43 +53,39 @@ public class Auth0TokenHelperImpl implements Auth0TokenHelper<Object>, Initializ
 
 	@Override
 	public Object decodeToken(String token) {
+
+		JWTVerifier jwtVerifier = new JWTVerifier(clientSecret, clientId);
+
 		
-		JwkProvider jwkProvider = new UrlJwkProvider(issuer);
+		Map<String, Object> verify;
-				
 		try {
-			DecodedJWT jwt = JWT.decode(token);
+
-            String alg = jwt.getAlgorithm();
+			verify = jwtVerifier.verify(token);
-            
+			String payload = (String) verify.get("$");
-            // Get jwk
-            Jwk jwk = jwkProvider.get(jwt.getKeyId());
-            
-            Algorithm algorithm;
-            if (alg.equals("RS256")) {
-            	// create RS256 key decoder
-            	algorithm = Algorithm.RSA256((RSAPublicKey) jwk.getPublicKey(), null);
-            } else {
-            	// create HS256 key decoder
-            	algorithm = Algorithm.HMAC256(clientSecret);
-            }
-            
-            JWTVerifier verifier = JWT.require(algorithm)
-            		.withIssuer(issuer)
-            		.build();
-            
-            jwt = verifier.verify(token);
 			@SuppressWarnings("unchecked")
-			Map<String, String> map = new ObjectMapper().readValue(jwt.getPayload(), Map.class);
+			Map<String, String> map = new ObjectMapper().readValue(payload, Map.class);
 			return map;
 
-		} catch (IllegalStateException|IOException|JwkException e) {
+		} catch (InvalidKeyException e) {
+			throw new Auth0RuntimeException(e);
+		} catch (NoSuchAlgorithmException e) {
+			throw new Auth0RuntimeException(e);
+		} catch (IllegalStateException e) {
+			throw new Auth0RuntimeException(e);
+		} catch (SignatureException e) {
+			throw new Auth0RuntimeException(e);
+		} catch (IOException e) {
 			throw new Auth0RuntimeException(e);
 		}
 		
 	}
 
+
 	@Override
 	public void afterPropertiesSet() throws Exception {
 		Assert.notNull(clientSecret, "The client secret is not set for " + this.getClass());
+		Assert.notNull(clientId, "The client id is not set for " + this.getClass());
+
 	}
 
 	public String getClientSecret() {
@@ -99,4 +96,12 @@ public class Auth0TokenHelperImpl implements Auth0TokenHelper<Object>, Initializ
 		this.clientSecret = clientSecret;
 	}
 
+	public String getClientId() {
+		return clientId;
+	}
+
+	public void setClientId(String clientId) {
+		this.clientId = clientId;
+	}
+
 }

base-models/src/main/java/com/telecominfraproject/wlan/core/model/entity/CountryCode.java

@@ -1,369 +1,49 @@
 package com.telecominfraproject.wlan.core.model.entity;
 
-import java.util.ArrayList;
+import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.telecominfraproject.wlan.core.model.extensibleenum.EnumWithId;
+import com.telecominfraproject.wlan.core.model.json.JsonDeserializationUtils;
-import com.telecominfraproject.wlan.core.model.json.BaseJsonModel;
 
-public class CountryCode implements EnumWithId {
+public enum CountryCode {
 
-    private static final Logger LOG = LoggerFactory.getLogger(CountryCode.class);
+    usa(0),
-
+    ca(1),
-    private static Object lock = new Object();
+    integration(1000),
-    private static final Map<Integer, CountryCode> ELEMENTS = new ConcurrentHashMap<>();
+    
-    private static final Map<String, CountryCode> ELEMENTS_BY_NAME = new ConcurrentHashMap<>();
+    UNSUPPORTED(-1);
-
-    public static final CountryCode AD = new CountryCode(1, "AD"),
-            AE = new CountryCode(2, "AE"),
-            AF = new CountryCode(3, "AF"),
-            AG = new CountryCode(4, "AG"),
-            AI = new CountryCode(5, "AI"),
-            AL = new CountryCode(6, "AL"),
-            AM = new CountryCode(7, "AM"),
-            AO = new CountryCode(8, "AO"),
-            AQ = new CountryCode(9, "AQ"),
-            AR = new CountryCode(10, "AR"),
-            AS = new CountryCode(11, "AS"),
-            AT = new CountryCode(12, "AT"),
-            AU = new CountryCode(13, "AU"),
-            AW = new CountryCode(14, "AW"),
-            AX = new CountryCode(15, "AX"),
-            AZ = new CountryCode(16, "AZ"),
-            BA = new CountryCode(17, "BA"),
-            BB = new CountryCode(18, "BB"),
-            BD = new CountryCode(19, "BD"),
-            BE = new CountryCode(20, "BE"),
-            BF = new CountryCode(21, "BF"),
-            BG = new CountryCode(22, "BG"),
-            BH = new CountryCode(23, "BH"),
-            BI = new CountryCode(24, "BI"),
-            BJ = new CountryCode(25, "BJ"),
-            BL = new CountryCode(26, "BL"),
-            BM = new CountryCode(27, "BM"),
-            BN = new CountryCode(28, "BN"),
-            BO = new CountryCode(29, "BO"),
-            BQ = new CountryCode(30, "BQ"),
-            BR = new CountryCode(31, "BR"),
-            BS = new CountryCode(32, "BS"),
-            BT = new CountryCode(33, "BT"),
-            BV = new CountryCode(34, "BV"),
-            BW = new CountryCode(35, "BW"),
-            BY = new CountryCode(36, "BY"),
-            BZ = new CountryCode(37, "BZ"),
-            CA = new CountryCode(38, "CA"),
-            CC = new CountryCode(39, "CC"),
-            CD = new CountryCode(40, "CD"),
-            CF = new CountryCode(41, "CF"),
-            CG = new CountryCode(42, "CG"),
-            CH = new CountryCode(43, "CH"),
-            CI = new CountryCode(44, "CI"),
-            CK = new CountryCode(45, "CK"),
-            CL = new CountryCode(46, "CL"),
-            CM = new CountryCode(47, "CM"),
-            CN = new CountryCode(48, "CN"),
-            CO = new CountryCode(49, "CO"),
-            CR = new CountryCode(50, "CR"),
-            CU = new CountryCode(51, "CU"),
-            CV = new CountryCode(52, "CV"),
-            CW = new CountryCode(53, "CW"),
-            CX = new CountryCode(54, "CX"),
-            CY = new CountryCode(55, "CY"),
-            CZ = new CountryCode(56, "CZ"),
-            DE = new CountryCode(57, "DE"),
-            DJ = new CountryCode(58, "DJ"),
-            DK = new CountryCode(59, "DK"),
-            DM = new CountryCode(60, "DM"),
-            DO = new CountryCode(61, "DO"),
-            DZ = new CountryCode(62, "DZ"),
-            EC = new CountryCode(63, "EC"),
-            EE = new CountryCode(64, "EE"),
-            EG = new CountryCode(65, "EG"),
-            EH = new CountryCode(66, "EH"),
-            ER = new CountryCode(67, "ER"),
-            ES = new CountryCode(68, "ES"),
-            ET = new CountryCode(69, "ET"),
-            FI = new CountryCode(70, "FI"),
-            FJ = new CountryCode(71, "FJ"),
-            FK = new CountryCode(72, "FK"),
-            FM = new CountryCode(73, "FM"),
-            FO = new CountryCode(74, "FO"),
-            FR = new CountryCode(75, "FR"),
-            GA = new CountryCode(76, "GA"),
-            GB = new CountryCode(77, "GB"),
-            GD = new CountryCode(78, "GD"),
-            GE = new CountryCode(79, "GE"),
-            GF = new CountryCode(80, "GF"),
-            GG = new CountryCode(81, "GG"),
-            GH = new CountryCode(82, "GH"),
-            GI = new CountryCode(83, "GI"),
-            GL = new CountryCode(84, "GL"),
-            GM = new CountryCode(85, "GM"),
-            GN = new CountryCode(86, "GN"),
-            GP = new CountryCode(87, "GP"),
-            GQ = new CountryCode(88, "GQ"),
-            GR = new CountryCode(89, "GR"),
-            GS = new CountryCode(90, "GS"),
-            GT = new CountryCode(91, "GT"),
-            GU = new CountryCode(92, "GU"),
-            GW = new CountryCode(93, "GW"),
-            GY = new CountryCode(94, "GY"),
-            HK = new CountryCode(95, "HK"),
-            HM = new CountryCode(96, "HM"),
-            HN = new CountryCode(97, "HN"),
-            HR = new CountryCode(98, "HR"),
-            HT = new CountryCode(99, "HT"),
-            HU = new CountryCode(100, "HU"),
-            ID = new CountryCode(101, "ID"),
-            IE = new CountryCode(102, "IE"),
-            IL = new CountryCode(103, "IL"),
-            IM = new CountryCode(104, "IM"),
-            IN = new CountryCode(105, "IN"),
-            IO = new CountryCode(106, "IO"),
-            IQ = new CountryCode(107, "IQ"),
-            IR = new CountryCode(108, "IR"),
-            IS = new CountryCode(109, "IS"),
-            IT = new CountryCode(110, "IT"),
-            JE = new CountryCode(111, "JE"),
-            JM = new CountryCode(112, "JM"),
-            JO = new CountryCode(113, "JO"),
-            JP = new CountryCode(114, "JP"),
-            KE = new CountryCode(115, "KE"),
-            KG = new CountryCode(116, "KG"),
-            KH = new CountryCode(117, "KH"),
-            KI = new CountryCode(118, "KI"),
-            KM = new CountryCode(119, "KM"),
-            KN = new CountryCode(120, "KN"),
-            KP = new CountryCode(121, "KP"),
-            KR = new CountryCode(122, "KR"),
-            KW = new CountryCode(123, "KW"),
-            KY = new CountryCode(124, "KY"),
-            KZ = new CountryCode(125, "KZ"),
-            LA = new CountryCode(126, "LA"),
-            LB = new CountryCode(127, "LB"),
-            LC = new CountryCode(128, "LC"),
-            LI = new CountryCode(129, "LI"),
-            LK = new CountryCode(130, "LK"),
-            LR = new CountryCode(131, "LR"),
-            LS = new CountryCode(132, "LS"),
-            LT = new CountryCode(133, "LT"),
-            LU = new CountryCode(134, "LU"),
-            LV = new CountryCode(135, "LV"),
-            LY = new CountryCode(136, "LY"),
-            MA = new CountryCode(137, "MA"),
-            MC = new CountryCode(138, "MC"),
-            MD = new CountryCode(139, "MD"),
-            ME = new CountryCode(140, "ME"),
-            MF = new CountryCode(141, "MF"),
-            MG = new CountryCode(142, "MG"),
-            MH = new CountryCode(143, "MH"),
-            MK = new CountryCode(144, "MK"),
-            ML = new CountryCode(145, "ML"),
-            MM = new CountryCode(146, "MM"),
-            MN = new CountryCode(147, "MN"),
-            MO = new CountryCode(148, "MO"),
-            MP = new CountryCode(149, "MP"),
-            MQ = new CountryCode(150, "MQ"),
-            MR = new CountryCode(151, "MR"),
-            MS = new CountryCode(152, "MS"),
-            MT = new CountryCode(153, "MT"),
-            MU = new CountryCode(154, "MU"),
-            MV = new CountryCode(155, "MV"),
-            MW = new CountryCode(156, "MW"),
-            MX = new CountryCode(157, "MX"),
-            MY = new CountryCode(158, "MY"),
-            MZ = new CountryCode(159, "MZ"),
-            NA = new CountryCode(160, "NA"),
-            NC = new CountryCode(161, "NC"),
-            NE = new CountryCode(162, "NE"),
-            NF = new CountryCode(163, "NF"),
-            NG = new CountryCode(164, "NG"),
-            NI = new CountryCode(165, "NI"),
-            NL = new CountryCode(166, "NL"),
-            NO = new CountryCode(167, "NO"),
-            NP = new CountryCode(168, "NP"),
-            NR = new CountryCode(169, "NR"),
-            NU = new CountryCode(170, "NU"),
-            NZ = new CountryCode(171, "NZ"),
-            OM = new CountryCode(172, "OM"),
-            PA = new CountryCode(173, "PA"),
-            PE = new CountryCode(174, "PE"),
-            PF = new CountryCode(175, "PF"),
-            PG = new CountryCode(176, "PG"),
-            PH = new CountryCode(177, "PH"),
-            PK = new CountryCode(178, "PK"),
-            PL = new CountryCode(179, "PL"),
-            PM = new CountryCode(180, "PM"),
-            PN = new CountryCode(181, "PN"),
-            PR = new CountryCode(182, "PR"),
-            PS = new CountryCode(183, "PS"),
-            PT = new CountryCode(184, "PT"),
-            PW = new CountryCode(185, "PW"),
-            PY = new CountryCode(186, "PY"),
-            QA = new CountryCode(187, "QA"),
-            RE = new CountryCode(188, "RE"),
-            RO = new CountryCode(189, "RO"),
-            RS = new CountryCode(190, "RS"),
-            RU = new CountryCode(191, "RU"),
-            RW = new CountryCode(192, "RW"),
-            SA = new CountryCode(193, "SA"),
-            SB = new CountryCode(194, "SB"),
-            SC = new CountryCode(195, "SC"),
-            SD = new CountryCode(196, "SD"),
-            SE = new CountryCode(197, "SE"),
-            SG = new CountryCode(198, "SG"),
-            SH = new CountryCode(199, "SH"),
-            SI = new CountryCode(200, "SI"),
-            SJ = new CountryCode(201, "SJ"),
-            SK = new CountryCode(202, "SK"),
-            SL = new CountryCode(203, "SL"),
-            SM = new CountryCode(204, "SM"),
-            SN = new CountryCode(205, "SN"),
-            SO = new CountryCode(206, "SO"),
-            SR = new CountryCode(207, "SR"),
-            SS = new CountryCode(208, "SS"),
-            ST = new CountryCode(209, "ST"),
-            SV = new CountryCode(210, "SV"),
-            SX = new CountryCode(211, "SX"),
-            SY = new CountryCode(212, "SY"),
-            SZ = new CountryCode(213, "SZ"),
-            TC = new CountryCode(214, "TC"),
-            TD = new CountryCode(215, "TD"),
-            TF = new CountryCode(216, "TF"),
-            TG = new CountryCode(217, "TG"),
-            TH = new CountryCode(218, "TH"),
-            TJ = new CountryCode(219, "TJ"),
-            TK = new CountryCode(220, "TK"),
-            TL = new CountryCode(221, "TL"),
-            TM = new CountryCode(222, "TM"),
-            TN = new CountryCode(223, "TN"),
-            TO = new CountryCode(224, "TO"),
-            TR = new CountryCode(225, "TR"),
-            TT = new CountryCode(226, "TT"),
-            TV = new CountryCode(227, "TV"),
-            TW = new CountryCode(228, "TW"),
-            TZ = new CountryCode(229, "TZ"),
-            UA = new CountryCode(230, "UA"),
-            UG = new CountryCode(231, "UG"),
-            UM = new CountryCode(232, "UM"),
-            US = new CountryCode(233, "US"),
-            UY = new CountryCode(234, "UY"),
-            UZ = new CountryCode(235, "UZ"),
-            VA = new CountryCode(236, "VA"),
-            VC = new CountryCode(237, "VC"),
-            VE = new CountryCode(238, "VE"),
-            VG = new CountryCode(239, "VG"),
-            VI = new CountryCode(240, "VI"),
-            VN = new CountryCode(241, "VN"),
-            VU = new CountryCode(242, "VU"),
-            WF = new CountryCode(243, "WF"),
-            WS = new CountryCode(244, "WS"),
-            YE = new CountryCode(245, "YE"),
-            YT = new CountryCode(246, "YT"),
-            ZA = new CountryCode(247, "ZA"),
-            ZM = new CountryCode(248, "ZM"),
-            ZW = new CountryCode(249, "ZW"),
-
-            UNSUPPORTED = new CountryCode(-1, "UNSUPPORTED");
-
-    static {
-        //try to load all the subclasses explicitly - to avoid timing issues when items coming from subclasses may be registered some time later, after the parent class is loaded 
-        Set<Class<? extends CountryCode>> subclasses = BaseJsonModel.getReflections().getSubTypesOf(CountryCode.class);
-        for(Class<?> cls: subclasses) {
-            try {
-                Class.forName(cls.getName());
-            } catch (ClassNotFoundException e) {
-                LOG.warn("Cannot load class {} : {}", cls.getName(), e);
-            }
-        }
-    }  
 
     private final int id;
-    private final String name;
+    private static final Map<Integer, CountryCode> ELEMENTS = new HashMap<>();
-    
-    protected CountryCode(int id, String name) {
-        synchronized(lock) {
-            
-            LOG.debug("Registering CountryCode by {} : {}", this.getClass().getSimpleName(), name);
 
-            this.id = id;
+    private CountryCode(int id) {
-            this.name = name;
+        this.id = id;
-
-            ELEMENTS_BY_NAME.values().forEach(s -> {
-                if(s.getName().equals(name)) {
-                    throw new IllegalStateException("CountryCode item for "+ name + " is already defined, cannot have more than one of them");
-                }                
-            });
-    
-            if(ELEMENTS.containsKey(id)) {
-                throw new IllegalStateException("CountryCode item "+ name + "("+id+") is already defined, cannot have more than one of them");
-            }
-    
-            ELEMENTS.put(id, this);
-            ELEMENTS_BY_NAME.put(name, this);
-        }
     }
-    
+
-    @Override
     public int getId() {
-        return id;
+        return this.id;
     }
 
-    @Override
+    public static CountryCode getById(int enumId) {
-    public String getName() {
+        if (ELEMENTS.isEmpty()) {
-        return name;
+            synchronized (ELEMENTS) {
-    }
+                if (ELEMENTS.isEmpty()) {
-
+                    //initialize elements map
-    public static CountryCode getById(int enumId){
+                    for(CountryCode met : CountryCode.values()) {
+                        ELEMENTS.put(met.getId(), met);
+                    }
+                }
+            }
+        }
         return ELEMENTS.get(enumId);
     }
-    
     @JsonCreator
     public static CountryCode getByName(String value) {
-        CountryCode ret = ELEMENTS_BY_NAME.get(value);
+        return JsonDeserializationUtils.deserializEnum(value, CountryCode.class, UNSUPPORTED);
-        if (ret == null) {
-            ret = UNSUPPORTED;
-        }
-        
-        return ret;
-    }
-
-
-    public static List<CountryCode> getValues() {
-        return new ArrayList<>(ELEMENTS.values());
     }
     
     public static boolean isUnsupported(CountryCode value) {
-        return (UNSUPPORTED.equals(value));
+        return UNSUPPORTED.equals(value);
     }
-
-    @Override
-    public int hashCode() {
-        return id;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!(obj instanceof CountryCode)) {
-            return false;
-        }
-        CountryCode other = (CountryCode) obj;
-        return id == other.id;
-    }   
-
-    @Override
-    public String toString() {
-        return name;
-    }
-
 }

base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/AbstractSource.java

@@ -1,57 +0,0 @@
-package com.telecominfraproject.wlan.core.model.equipment;
-
-import java.util.Objects;
-
-import com.telecominfraproject.wlan.core.model.json.BaseJsonModel;
-
-public abstract class AbstractSource<T> extends BaseJsonModel {
-    private static final long serialVersionUID = 2761981826629575941L;
-    protected SourceType source;
-    protected T value;
-
-    public AbstractSource(SourceType source, T manualValue) {
-        this.source = source;
-        this.value = manualValue;
-    }
-
-    protected AbstractSource() {
-        // json construct
-    }
-
-    public SourceType getSource() {
-        return source;
-    }
-
-    public void setSource(SourceType source) {
-        this.source = source;
-    }
-
-    public T getValue() {
-        return value;
-    }
-
-    public void setValue(T value) {
-        this.value = value;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(source, value);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (!(obj instanceof AbstractSource)) {
-            return false;
-        }
-        AbstractSource<T> other = (AbstractSource<T>) obj;
-        return this.source == other.source && Objects.equals(value, other.value);
-    }
-
-}

base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/SourceSelectionSteering.java

@@ -1,41 +0,0 @@
-package com.telecominfraproject.wlan.core.model.equipment;
-
-public class SourceSelectionSteering extends AbstractSource<RadioBestApSettings>{
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 4631172351117490997L;
-	
-	private SourceSelectionSteering() {
-
-	}
-
-    private SourceSelectionSteering(SourceType source, RadioBestApSettings value) {
-        super(source, value);
-    }
-
-    public static SourceSelectionSteering createAutomaticInstance(RadioBestApSettings value) {
-        return new SourceSelectionSteering(SourceType.auto, value);
-    }
-
-    public static SourceSelectionSteering createManualInstance(RadioBestApSettings value) {
-        return new SourceSelectionSteering(SourceType.manual, value);
-    }
-    
-    public static SourceSelectionSteering createProfileInstance(RadioBestApSettings value) {
-        return new SourceSelectionSteering(SourceType.profile, value);
-    }
-	
-    @Override
-    public boolean hasUnsupportedValue() {
-        if (SourceType.isUnsupported(source)) {
-            return true;
-        }
-        if ((null != value) && value.hasUnsupportedValue()) {
-            return true;
-        }
-        return false;
-    }
-    
-}

base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/SourceSelectionValue.java

@@ -1,50 +0,0 @@
-package com.telecominfraproject.wlan.core.model.equipment;
-
-public class SourceSelectionValue extends AbstractSource<Integer>{
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 4631172351117490997L;
-	
-	private SourceSelectionValue() {
-
-	}
-
-    private SourceSelectionValue(SourceType source, int value) {
-        super(source, value);
-    }
-
-    public static SourceSelectionValue createAutomaticInstance(int value) {
-        return new SourceSelectionValue(SourceType.auto, value);
-    }
-
-    public static SourceSelectionValue createManualInstance(int value) {
-        return new SourceSelectionValue(SourceType.manual, value);
-    }
-    
-    public static SourceSelectionValue createProfileInstance(int value) {
-        return new SourceSelectionValue(SourceType.profile, value);
-    }
-    
-    public static AutoOrManualValue getAutoOrManualFromSourcedValue(SourceSelectionValue param) {
-    	AutoOrManualValue ret = null;
-    	if (param.getSource() == SourceType.auto) {
-    		ret = AutoOrManualValue.createAutomaticInstance(param.getValue());
-    	} else if (param.getSource() == SourceType.profile) {
-    		ret = AutoOrManualValue.createManualInstance(param.getValue());
-    	} else { // else param.getSource == SourceType.manual
-    		ret = AutoOrManualValue.createManualInstance(param.getValue());
-    	}
-    	return ret;
-    }   
-    
-    @Override
-    public boolean hasUnsupportedValue() {
-        if (SourceType.isUnsupported(source)) {
-            return true;
-        }
-        return false;
-    }
-
-}

base-models/src/main/java/com/telecominfraproject/wlan/core/model/equipment/SourceType.java

@@ -1,50 +0,0 @@
-package com.telecominfraproject.wlan.core.model.equipment;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.telecominfraproject.wlan.core.model.json.JsonDeserializationUtils;
-
-public enum SourceType {
-
-    auto(0L),
-    manual(1L),
-    profile(2L),
-    
-    UNSUPPORTED(-1L);
-
-    private final long id;
-    private static final Map<Long, SourceType> ELEMENTS = new HashMap<>();
-
-    private SourceType(long id) {
-        this.id = id;
-    }
-
-    public long getId() {
-        return this.id;
-    }
-
-    public static SourceType getById(long enumId) {
-        if (ELEMENTS.isEmpty()) {
-            synchronized (ELEMENTS) {
-                if (ELEMENTS.isEmpty()) {
-                    //initialize elements map
-                    for(SourceType met : SourceType.values()) {
-                        ELEMENTS.put(met.getId(), met);
-                    }
-                }
-            }
-        }
-        return ELEMENTS.get(enumId);
-    }
-    
-    @JsonCreator
-    public static SourceType getByName(String value) {
-        return JsonDeserializationUtils.deserializEnum(value, SourceType.class, UNSUPPORTED);
-    }
-    
-    public static boolean isUnsupported(SourceType value) {
-        return UNSUPPORTED.equals(value);
-    }
-}

base-models/src/main/java/com/telecominfraproject/wlan/core/model/role/PortalUserRole.java

@@ -17,49 +17,29 @@ import com.telecominfraproject.wlan.core.model.json.JsonDeserializationUtils;
  */
 public enum PortalUserRole {
     /**
-     * Public user - Read Only
+     * Public user
      */
     Public(0, 0),
     /**
-     * Customer - Read Write
+     * Customer
      */
     CustomerIT(1, 10),
     /**
-     * MSP - Read Write
+     * MSP
      */
     ManagedServiceProvider(2, 20),
     /**
-     * Service Distributor - Read Write
+     * Service Distributor
      */
     Distributor(3, 30),
     /**
-     * Technical Support - Read Write
+     * Technical Support
      */
     TechSupport(4, 40),
     /**
-     * Super User - Read Write
+     * Super User
      */
     SuperUser(Integer.MAX_VALUE, Integer.MAX_VALUE),
-    /**
-     * Customer - Read Only
-     */
-    CustomerIT_RO(5, 5),
-    /**
-     * MSP - Read Only
-     */
-    ManagedServiceProvider_RO(6, 15),
-    /**
-     * Service Distributor - Read Only
-     */
-    Distributor_RO(7, 25),
-    /**
-     * Technical Support - Read Only
-     */
-    TechSupport_RO(8, 35),
-    /**
-     * Super User - Read Only
-     */
-    SuperUser_RO(Integer.MAX_VALUE - 1, Integer.MAX_VALUE - 5),    
     /**
      * Unknown
      */

base-models/src/main/java/com/telecominfraproject/wlan/core/model/webtoken/WebTokenRequest.java

@@ -13,7 +13,6 @@ public class WebTokenRequest extends BaseJsonModel {
     private String grantType;
     private String userId;
     private String password;
-    private String refreshToken;
     private String scope;
     
     public String getGrantType() {
@@ -40,11 +39,5 @@ public class WebTokenRequest extends BaseJsonModel {
     public void setScope(String scope) {
         this.scope = scope;
     }
-	public String getRefreshToken() {
-		return refreshToken;
-	}
-	public void setRefreshToken(String refreshToken) {
-		this.refreshToken = refreshToken;
-	}
     
 }

base-models/src/main/java/com/telecominfraproject/wlan/core/model/webtoken/WebTokenResult.java

@@ -14,7 +14,6 @@ public class WebTokenResult extends BaseJsonModel {
     private boolean resetPassword;
     private String access_token;
     private String refresh_token;
-    private String id_token;
     private String token_type;
     private int expires_in;
     private int idle_timeout;
@@ -44,12 +43,6 @@ public class WebTokenResult extends BaseJsonModel {
 	public void setRefresh_token(String refresh_token) {
 		this.refresh_token = refresh_token;
 	}
-	public String getId_token() {
-		return id_token;
-	}
-	public void setId_token(String id_token) {
-		this.id_token = id_token;
-	}
 	public String getToken_type() {
 		return token_type;
 	}

base-remote-tests/pom.xml

@@ -13,11 +13,9 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>com.telecominfraproject.wlan</groupId>
+			<groupId>org.springframework</groupId>
-			<artifactId>base-tx-tests</artifactId>
+			<artifactId>spring-tx</artifactId>
-            <version>${tip-wlan-cloud.release.version}</version>
 		</dependency>
-        
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>

base-remote-tests/src/main/java/com/telecominfraproject/wlan/remote/tests/BaseRemoteTest.java

@@ -1,7 +1,6 @@
 package com.telecominfraproject.wlan.remote.tests;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -29,10 +28,7 @@ import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionException;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.SimpleTransactionStatus;
-import org.springframework.transaction.support.TransactionSynchronization;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
 
-import com.telecominfraproject.wlan.core.server.tx.test.TxTestConfig;
 import com.telecominfraproject.wlan.server.RemoteTestServer;
 
 /**
@@ -76,7 +72,6 @@ import com.telecominfraproject.wlan.server.RemoteTestServer;
                 "tip.wlan.csrf-enabled=false" })
 @DirtiesContext(classMode = ClassMode.AFTER_CLASS)
 @Import(value = {
-        TxTestConfig.class
 })
 public abstract class BaseRemoteTest {
 
@@ -132,6 +127,37 @@ public abstract class BaseRemoteTest {
     // @PropertySource({ "classpath:persistence-${envTarget:dev}.properties" })
     public static class Config {
 
+        @Bean
+        @Primary
+        public PlatformTransactionManager transactionManager() {
+            PlatformTransactionManager ptm = new PlatformTransactionManager() {
+
+                {
+                    LOG.info("*** Using simulated PlatformTransactionManager");
+                }
+
+                @Override
+                public void rollback(TransactionStatus status) throws TransactionException {
+                    LOG.info("Simulating Rollback for {}", status);
+                }
+
+                @Override
+                public void commit(TransactionStatus status) throws TransactionException {
+                    LOG.info("Simulating Commit for {}", status);
+                }
+
+                @Override
+                public TransactionStatus getTransaction(TransactionDefinition definition) throws TransactionException {
+                    LOG.info("Simulating getTransaction for {}", definition);
+                    TransactionStatus ts = new SimpleTransactionStatus();
+                    return ts;
+                }
+
+            };
+
+            return ptm;
+        }
+
     }
 
     protected int getNextCustomerId() {

base-tx-tests/pom.xml

@@ -1,21 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-    <parent>
-      <groupId>com.telecominfraproject.wlan</groupId>
-      <artifactId>tip-wlan-cloud-root-pom</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
-      <relativePath>../../wlan-cloud-root</relativePath>
-    </parent>
-	<artifactId>base-tx-tests</artifactId>
-	<name>base-tx-tests</name>
-	<description>Common classes used by the unit tests that require transaction support.</description>
-
-	<dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-        </dependency>
-
-	</dependencies>
-</project>

base-tx-tests/src/main/java/com/telecominfraproject/wlan/core/server/tx/test/TxTestConfig.java

@@ -1,98 +0,0 @@
-package com.telecominfraproject.wlan.core.server.tx.test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionException;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.SimpleTransactionStatus;
-import org.springframework.transaction.support.TransactionSynchronization;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-
-/**
- * @author dtop
- *
- */
-@Configuration
-public class TxTestConfig {
-
-    private static final Logger LOG = LoggerFactory.getLogger(TxTestConfig.class);
-
-    @Bean
-    @Primary
-    public PlatformTransactionManager transactionManager() {
-        PlatformTransactionManager ptm = new PlatformTransactionManager() {
-            private ThreadLocal<List<TransactionStatus>> currentTx = new ThreadLocal<>() ;
-            
-            {
-                LOG.info("*** Using simulated PlatformTransactionManager");
-            }
-
-            @Override
-            public void rollback(TransactionStatus status) throws TransactionException {
-                LOG.debug("Simulating Rollback for {}", status);
-                if(currentTx.get().size() == 1 ) {
-                    if (TransactionSynchronizationManager.isSynchronizationActive()) {
-                        TransactionSynchronizationManager.clearSynchronization();
-                    }
-                    currentTx.remove();
-                } else {
-                    currentTx.get().remove(currentTx.get().size() - 1 );
-                }
-            }
-
-            @Override
-            public void commit(TransactionStatus status) throws TransactionException {
-                LOG.debug("Simulating Commit for {}", status);
-                if(currentTx.get().size() == 1 ) {
-                    if (TransactionSynchronizationManager.isSynchronizationActive()) {
-                        List<TransactionSynchronization> synchronizations = TransactionSynchronizationManager
-                                .getSynchronizations();
-                        if (synchronizations != null) {
-                            for (TransactionSynchronization synchronization : synchronizations) {
-                                synchronization.afterCommit();
-                            }
-                        }
-    
-                        TransactionSynchronizationManager.clearSynchronization();
-                    }
-                    
-                    currentTx.remove();
-                } else {
-                    currentTx.get().remove(currentTx.get().size() - 1 );
-                }
-            }
-            
-            @Override
-            public TransactionStatus getTransaction(TransactionDefinition definition) throws TransactionException {
-                LOG.debug("Simulating getTransaction for {}", definition);
-                if (!TransactionSynchronizationManager.isSynchronizationActive()) {
-                    TransactionSynchronizationManager.initSynchronization();
-                }
-                
-                if (currentTx.get() == null) {
-                    List<TransactionStatus> txList = new ArrayList<>();
-                    TransactionStatus ts = new SimpleTransactionStatus(true);
-                    txList.add(ts);
-                    currentTx.set(txList);
-                    return ts;
-                } else {
-                    List<TransactionStatus> txList = currentTx.get();
-                    TransactionStatus ts = new SimpleTransactionStatus(false);
-                    txList.add(ts);
-                    return ts;
-                }
-            }
-
-        };
-        return ptm;
-    }
-
-}