Move jwksUrl and issuer in the init section instead of login

Author: jbonofre

activemq-jaas/src/main/java/org/apache/activemq/jaas/OAuth2LoginModule.java

@@ -118,7 +118,15 @@ public void initialize(Subject subject, CallbackHandler callbackHandler, Map<Str
         this.debug = Boolean.parseBoolean((String) options.get("debug"));
 
         this.jwksUrl = (String) options.get(JWKS_URL_OPTION);
+        if (jwksUrl == null || jwksUrl.isEmpty()) {
+            throw new IllegalArgumentException("OAuth2 JWKS URL (" + JWKS_URL_OPTION + ") is required");
+        }
+
         this.issuer = (String) options.get(ISSUER_OPTION);
+        if (issuer == null || issuer.isEmpty()) {
+            throw new IllegalArgumentException("OAuth2 issuer (" + ISSUER_OPTION + ") is required");
+        }
+
         this.audience = (String) options.get(AUDIENCE_OPTION);
 
         String userClaim = (String) options.get(USERNAME_CLAIM_OPTION);
@@ -135,13 +143,6 @@ public void initialize(Subject subject, CallbackHandler callbackHandler, Map<Str
 
     @Override
     public boolean login() throws LoginException {
-        if (jwksUrl == null || jwksUrl.isEmpty()) {
-            throw new LoginException("OAuth2 JWKS URL (oauth2.jwksUrl) is required");
-        }
-        if (issuer == null || issuer.isEmpty()) {
-            throw new LoginException("OAuth2 issuer (oauth2.issuer) is required");
-        }
-
         String token = getToken();
         if (token == null || token.isEmpty()) {
             throw new FailedLoginException("No JWT token provided");

activemq-jaas/src/test/java/org/apache/activemq/jaas/OAuth2LoginModuleTest.java

@@ -307,12 +307,10 @@ public void testMissingJwksUrl() throws Exception {
 
         Subject subject = new Subject();
         OAuth2LoginModule module = new OAuth2LoginModule();
-        module.initialize(subject, new TokenCallbackHandler("token"), new HashMap<>(), options);
-
         try {
-            module.login();
-            fail("Should have thrown LoginException for missing JWKS URL");
-        } catch (LoginException e) {
+            module.initialize(subject, new TokenCallbackHandler("token"), new HashMap<>(), options);
+            fail("Should have thrown IllegalArgumentException for missing JWKS URL");
+        } catch (IllegalArgumentException e) {
             assertTrue("Error should mention JWKS URL", e.getMessage().contains("JWKS URL"));
         }
     }
@@ -323,12 +321,10 @@ public void testMissingIssuer() throws Exception {
 
         Subject subject = new Subject();
         OAuth2LoginModule module = new OAuth2LoginModule();
-        module.initialize(subject, new TokenCallbackHandler("token"), new HashMap<>(), options);
-
         try {
-            module.login();
-            fail("Should have thrown LoginException for missing issuer");
-        } catch (LoginException e) {
+            module.initialize(subject, new TokenCallbackHandler("token"), new HashMap<>(), options);
+            fail("Should have thrown IllegalArgumentException for missing issuer");
+        } catch (IllegalArgumentException e) {
             assertTrue("Error should mention issuer", e.getMessage().contains("issuer"));
         }
     }