From e6f0b7df179266ba2b023b5cbaa24951c7b5d6ac Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Mon, 5 Dec 2016 21:33:50 -0800
Subject: [PATCH] GUACAMOLE-136: Rename overly-generic
 AuthenticationProviderService to UserVerificationService.

---
 .../guacamole/auth/duo/DuoAuthenticationProvider.java       | 6 +++---
 .../guacamole/auth/duo/DuoAuthenticationProviderModule.java | 2 +-
 ...ionProviderService.java => UserVerificationService.java} | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)
 rename extensions/guacamole-auth-duo/src/main/java/org/apache/guacamole/auth/duo/{AuthenticationProviderService.java => UserVerificationService.java} (96%)

diff --git a/extensions/guacamole-auth-duo/src/main/java/org/apache/guacamole/auth/duo/DuoAuthenticationProvider.java b/extensions/guacamole-auth-duo/src/main/java/org/apache/guacamole/auth/duo/DuoAuthenticationProvider.java
index bcf8c835f..ccb1c40a1 100644
--- a/extensions/guacamole-auth-duo/src/main/java/org/apache/guacamole/auth/duo/DuoAuthenticationProvider.java
+++ b/extensions/guacamole-auth-duo/src/main/java/org/apache/guacamole/auth/duo/DuoAuthenticationProvider.java
@@ -78,11 +78,11 @@ public class DuoAuthenticationProvider implements AuthenticationProvider {
     public UserContext getUserContext(AuthenticatedUser authenticatedUser)
             throws GuacamoleException {
 
-        AuthenticationProviderService authProviderService =
-                injector.getInstance(AuthenticationProviderService.class);
+        UserVerificationService verificationService =
+                injector.getInstance(UserVerificationService.class);
 
         // Verify user against Duo service
-        authProviderService.verifyAuthenticatedUser(authenticatedUser);
+        verificationService.verifyAuthenticatedUser(authenticatedUser);
 
         // User has been verified, and authentication should be allowed to
         // continue
diff --git a/extensions/guacamole-auth-duo/src/main/java/org/apache/guacamole/auth/duo/DuoAuthenticationProviderModule.java b/extensions/guacamole-auth-duo/src/main/java/org/apache/guacamole/auth/duo/DuoAuthenticationProviderModule.java
index c3c129cdc..2dfc4eb77 100644
--- a/extensions/guacamole-auth-duo/src/main/java/org/apache/guacamole/auth/duo/DuoAuthenticationProviderModule.java
+++ b/extensions/guacamole-auth-duo/src/main/java/org/apache/guacamole/auth/duo/DuoAuthenticationProviderModule.java
@@ -72,9 +72,9 @@ public class DuoAuthenticationProviderModule extends AbstractModule {
         bind(Environment.class).toInstance(environment);
 
         // Bind Duo-specific services
-        bind(AuthenticationProviderService.class);
         bind(ConfigurationService.class);
         bind(DuoWebService.class);
+        bind(UserVerificationService.class);
 
     }
 
diff --git a/extensions/guacamole-auth-duo/src/main/java/org/apache/guacamole/auth/duo/AuthenticationProviderService.java b/extensions/guacamole-auth-duo/src/main/java/org/apache/guacamole/auth/duo/UserVerificationService.java
similarity index 96%
rename from extensions/guacamole-auth-duo/src/main/java/org/apache/guacamole/auth/duo/AuthenticationProviderService.java
rename to extensions/guacamole-auth-duo/src/main/java/org/apache/guacamole/auth/duo/UserVerificationService.java
index c3dd8ee47..3209be2ab 100644
--- a/extensions/guacamole-auth-duo/src/main/java/org/apache/guacamole/auth/duo/AuthenticationProviderService.java
+++ b/extensions/guacamole-auth-duo/src/main/java/org/apache/guacamole/auth/duo/UserVerificationService.java
@@ -33,10 +33,9 @@ import org.apache.guacamole.net.auth.credentials.CredentialsInfo;
 import org.apache.guacamole.net.auth.credentials.GuacamoleInsufficientCredentialsException;
 
 /**
- * Service providing convenience functions for the Duo AuthenticationProvider
- * implementation.
+ * Service for verifying the identity of a user against Duo.
  */
-public class AuthenticationProviderService {
+public class UserVerificationService {
 
     /**
      * Service for retrieving Duo configuration information.