MULE-17662: Misnamed parameters in OAuth module generate invalid (#94)

extension model
mulesoft · Oct 17, 2019 · 373eee3 · 373eee3
1 parent 71f6137
commit 373eee3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/main/java/org/mule/extension/oauth2/internal/AbstractGrantType.java b/src/main/java/org/mule/extension/oauth2/internal/AbstractGrantType.java
@@ -31,7 +31,6 @@
 import org.mule.runtime.api.lock.LockFactory;
 import org.mule.runtime.api.tls.TlsContextFactory;
 import org.mule.runtime.core.api.MuleContext;
-import org.mule.runtime.extension.api.annotation.Alias;
 import org.mule.runtime.extension.api.annotation.Expression;
 import org.mule.runtime.extension.api.annotation.param.DefaultEncoding;
 import org.mule.runtime.extension.api.annotation.param.Optional;
@@ -128,9 +127,8 @@ public abstract class AbstractGrantType implements HttpRequestAuthentication, Li
   protected Literal<String> responseExpiresIn;
 
   @Parameter
-  @Alias("custom-parameter-extractors")
   @Optional
-  protected List<ParameterExtractor> parameterExtractors;
+  protected List<ParameterExtractor> customParameterExtractors;
 
   /**
    * After executing an API call authenticated with OAuth it may be that the access token used was expired, so this attribute
@@ -151,7 +149,7 @@ public abstract class AbstractGrantType implements HttpRequestAuthentication, Li
   @Expression(NOT_SUPPORTED)
   @DisplayName(TLS_CONFIGURATION)
   @Placement(tab = SECURITY_TAB)
-  private TlsContextFactory tlsContextFactory;
+  private TlsContextFactory tlsContext;
 
   @Parameter
   @Optional
@@ -234,9 +232,9 @@ public boolean equals(Object obj) {
           literalEquals(responseAccessToken, other.responseAccessToken) &&
           literalEquals(responseRefreshToken, other.responseRefreshToken) &&
           literalEquals(responseExpiresIn, other.responseExpiresIn) &&
-          Objects.equals(parameterExtractors, other.parameterExtractors) &&
+          Objects.equals(customParameterExtractors, other.customParameterExtractors) &&
           literalEquals(refreshTokenWhen, other.refreshTokenWhen) &&
-          Objects.equals(tlsContextFactory, other.tlsContextFactory) &&
+          Objects.equals(tlsContext, other.tlsContext) &&
           Objects.equals(proxyConfig, other.proxyConfig);
     }
 
@@ -246,7 +244,7 @@ public boolean equals(Object obj) {
   @Override
   public int hashCode() {
     return 31 * hash(
-                     clientId, clientSecret, scopes, tokenManager, tokenUrl, parameterExtractors, tlsContextFactory, proxyConfig)
+                     clientId, clientSecret, scopes, tokenManager, tokenUrl, customParameterExtractors, tlsContext, proxyConfig)
         *
         literalHashCodes(responseAccessToken, responseRefreshToken, responseExpiresIn, refreshTokenWhen);
   }
@@ -288,11 +286,11 @@ public Literal<String> getResponseExpiresIn() {
   }
 
   public List<ParameterExtractor> getCustomParameterExtractors() {
-    return parameterExtractors != null ? parameterExtractors : emptyList();
+    return customParameterExtractors != null ? customParameterExtractors : emptyList();
   }
 
   public TlsContextFactory getTlsContextFactory() {
-    return tlsContextFactory;
+    return tlsContext;
   }
 
 }
diff --git a/src/main/java/org/mule/extension/oauth2/internal/OAuthOperations.java b/src/main/java/org/mule/extension/oauth2/internal/OAuthOperations.java
@@ -96,7 +96,7 @@ public String retrieveState(@Expression(NOT_SUPPORTED) TokenManagerConfig tokenM
    * @param resourceOwnerId The resource owner id to invalidate. This attribute is only allowed for authorization code grant type.
    * @param key to look for in the elements that has been extracted after the previous OAuth dance.
    * @return an element if there was previously introduced by the OAuth dance and the custom parameter extractor. Null otherwise
-   * @see AbstractGrantType#parameterExtractors
+   * @see AbstractGrantType#customParameterExtractors
    */
   @MediaType(value = TEXT_PLAIN, strict = false)
   public String retrieveCustomTokenResponseParam(@Expression(NOT_SUPPORTED) TokenManagerConfig tokenManager,