Rename verification methods to use 'verifySecretCodeAndFetchEmail' for consistency

Author: Damans227

api/src/main/java/org/apache/cloudstack/auth/UserOAuth2Authenticator.java

@@ -42,7 +42,7 @@ public interface UserOAuth2Authenticator extends Adapter {
      * Verifies the code provided by provider and fetches email
      * @return returns email
      */
-    String verifyCodeAndFetchEmail(String secretCode);
+    String verifySecretCodeAndFetchEmail(String secretCode);
 
     /**
      * Verifies if the logged in user is valid for a specific domain
@@ -54,7 +54,7 @@ public interface UserOAuth2Authenticator extends Adapter {
      * Verifies the secret code provided by provider and fetches email for a specific domain
      * @return email for the specified domain
      */
-    String verifyCodeAndFetchEmail(String secretCode, Long domainId);
+    String verifySecretCodeAndFetchEmail(String secretCode, Long domainId);
 
     /**
      * Fetches email using the accessToken

plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/OAuth2AuthManager.java

@@ -53,7 +53,7 @@ public interface OAuth2AuthManager extends PluggableAPIAuthenticator, PluggableS
      */
     UserOAuth2Authenticator getUserOAuth2AuthenticationProvider(final String providerName);
 
-    String verifyCodeAndFetchEmail(String code, String provider, Long domainId);
+    String verifySecretCodeAndFetchEmail(String code, String provider, Long domainId);
 
     OauthProviderVO registerOauthProvider(RegisterOAuthProviderCmd cmd);
 

plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/OAuth2AuthManagerImpl.java

@@ -133,9 +133,9 @@ protected void initializeUserOAuth2AuthenticationProvidersMap() {
     }
 
     @Override
-    public String verifyCodeAndFetchEmail(String code, String provider, Long domainId) {
+    public String verifySecretCodeAndFetchEmail(String code, String provider, Long domainId) {
         UserOAuth2Authenticator authenticator = getUserOAuth2AuthenticationProvider(provider);
-        String email = authenticator.verifyCodeAndFetchEmail(code, domainId);
+        String email = authenticator.verifySecretCodeAndFetchEmail(code, domainId);
 
         return email;
     }

plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/command/VerifyOAuthCodeAndGetUserCmd.java

@@ -112,7 +112,7 @@ public String authenticate(String command, Map<String, Object[]> params, HttpSes
         }
         domainId = _oauth2mgr.resolveDomainId(params);
 
-        String email = _oauth2mgr.verifyCodeAndFetchEmail(secretCode, provider, domainId);
+        String email = _oauth2mgr.verifySecretCodeAndFetchEmail(secretCode, provider, domainId);
         if (email != null) {
             UserResponse response = new UserResponse();
             response.setEmail(email);

plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/github/GithubOAuth2Provider.java

@@ -59,8 +59,8 @@ public boolean verifyUser(String email, String secretCode) {
     }
 
     @Override
-    public String verifyCodeAndFetchEmail(String secretCode) {
-        return verifyCodeAndFetchEmail(secretCode, null);
+    public String verifySecretCodeAndFetchEmail(String secretCode) {
+        return verifySecretCodeAndFetchEmail(secretCode, null);
     }
 
     @Override
@@ -74,7 +74,7 @@ public boolean verifyUser(String email, String secretCode, Long domainId) {
             throw new CloudRuntimeException("Github provider is not registered, so user cannot be verified");
         }
 
-        String verifiedEmail = verifyCodeAndFetchEmail(secretCode, domainId);
+        String verifiedEmail = verifySecretCodeAndFetchEmail(secretCode, domainId);
         if (StringUtils.isEmpty(verifiedEmail) || !email.equals(verifiedEmail)) {
             throw new CloudRuntimeException("Unable to verify the email address with the provided secret");
         }
@@ -85,7 +85,7 @@ public boolean verifyUser(String email, String secretCode, Long domainId) {
     }
 
     @Override
-    public String verifyCodeAndFetchEmail(String secretCode, Long domainId) {
+    public String verifySecretCodeAndFetchEmail(String secretCode, Long domainId) {
         String accessToken = getAccessToken(secretCode, domainId);
         if (StringUtils.isEmpty(accessToken)) {
             return null;

plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/google/GoogleOAuth2Provider.java

@@ -62,8 +62,8 @@ public boolean verifyUser(String email, String secretCode) {
     }
 
     @Override
-    public String verifyCodeAndFetchEmail(String secretCode) {
-        return verifyCodeAndFetchEmail(secretCode, null);
+    public String verifySecretCodeAndFetchEmail(String secretCode) {
+        return verifySecretCodeAndFetchEmail(secretCode, null);
     }
 
     protected void clearAccessAndRefreshTokens() {
@@ -87,7 +87,7 @@ public boolean verifyUser(String email, String secretCode, Long domainId) {
             throw new CloudAuthenticationException("Google provider is not registered, so user cannot be verified");
         }
 
-        String verifiedEmail = verifyCodeAndFetchEmail(secretCode, domainId);
+        String verifiedEmail = verifySecretCodeAndFetchEmail(secretCode, domainId);
         if (verifiedEmail == null || !email.equals(verifiedEmail)) {
             throw new CloudRuntimeException("Unable to verify the email address with the provided secret");
         }
@@ -97,7 +97,7 @@ public boolean verifyUser(String email, String secretCode, Long domainId) {
     }
 
     @Override
-    public String verifyCodeAndFetchEmail(String secretCode, Long domainId) {
+    public String verifySecretCodeAndFetchEmail(String secretCode, Long domainId) {
         OauthProviderVO provider = _oauthProviderDao.findByProviderAndDomainWithGlobalFallback(getName(), domainId);
         String clientId = provider.getClientId();
         String secret = provider.getSecretKey();

plugins/user-authenticators/oauth2/src/test/java/org/apache/cloudstack/oauth2/api/command/VerifyOAuthCodeAndGetUserCmdTest.java

@@ -74,7 +74,7 @@ public void testAuthenticate() {
         params.put("provider", providerArray);
 
         when(oauth2mgr.resolveDomainId(any())).thenReturn(null);
-        when(oauth2mgr.verifyCodeAndFetchEmail(eq("secretcode"), eq("provider"), any())).thenReturn("test@example.com");
+        when(oauth2mgr.verifySecretCodeAndFetchEmail(eq("secretcode"), eq("provider"), any())).thenReturn("test@example.com");
 
         String response = cmd.authenticate("command", params, session, remoteAddress, responseType, auditTrailSb, req, resp);
 
@@ -93,7 +93,7 @@ public void testAuthenticateWithInvalidCode() throws Exception {
         params.put("provider", providerArray);
 
         when(oauth2mgr.resolveDomainId(any())).thenReturn(null);
-        when(oauth2mgr.verifyCodeAndFetchEmail(eq("invalidcode"), eq("provider"), any())).thenReturn(null);
+        when(oauth2mgr.verifySecretCodeAndFetchEmail(eq("invalidcode"), eq("provider"), any())).thenReturn(null);
 
         cmd.authenticate("command", params, session, remoteAddress, responseType, auditTrailSb, req, resp);
     }