safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-5: Rename JDBC-specific UserContext to ModeledUserContext for clarity.

Browse Source
This commit is contained in:
Michael Jumper
2016-07-29 15:19:33 -07:00
parent 544b3c6767
commit 212e559edf
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java
View File

@@ -20,7 +20,7 @@
package org.apache.guacamole.auth.jdbc; package org.apache.guacamole.auth.jdbc;
import com.google.inject.Scopes; import com.google.inject.Scopes;
import org.apache.guacamole.auth.jdbc.user.UserContext; import org.apache.guacamole.auth.jdbc.user.ModeledUserContext;
import org.apache.guacamole.auth.jdbc.connectiongroup.RootConnectionGroup; import org.apache.guacamole.auth.jdbc.connectiongroup.RootConnectionGroup;
import org.apache.guacamole.auth.jdbc.connectiongroup.ModeledConnectionGroup; import org.apache.guacamole.auth.jdbc.connectiongroup.ModeledConnectionGroup;
import org.apache.guacamole.auth.jdbc.connectiongroup.ConnectionGroupDirectory; import org.apache.guacamole.auth.jdbc.connectiongroup.ConnectionGroupDirectory;
@@ -140,12 +140,12 @@ public class JDBCAuthenticationProviderModule extends MyBatisModule {
bind(ModeledGuacamoleConfiguration.class); bind(ModeledGuacamoleConfiguration.class);
bind(ModeledSharingProfile.class); bind(ModeledSharingProfile.class);
bind(ModeledUser.class); bind(ModeledUser.class);
bind(ModeledUserContext.class);
bind(RootConnectionGroup.class); bind(RootConnectionGroup.class);
bind(SharingProfileDirectory.class); bind(SharingProfileDirectory.class);
bind(SharingProfilePermissionSet.class); bind(SharingProfilePermissionSet.class);
bind(SystemPermissionSet.class); bind(SystemPermissionSet.class);
bind(TrackedActiveConnection.class); bind(TrackedActiveConnection.class);
bind(UserContext.class);
bind(UserDirectory.class); bind(UserDirectory.class);
bind(UserPermissionSet.class); bind(UserPermissionSet.class);

8
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderService.java
View File

@@ -23,7 +23,7 @@ import com.google.inject.Inject;
import com.google.inject.Provider; import com.google.inject.Provider;
import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.auth.jdbc.user.ModeledUser; import org.apache.guacamole.auth.jdbc.user.ModeledUser;
import org.apache.guacamole.auth.jdbc.user.UserContext; import org.apache.guacamole.auth.jdbc.user.ModeledUserContext;
import org.apache.guacamole.auth.jdbc.user.UserService; import org.apache.guacamole.auth.jdbc.user.UserService;
import org.apache.guacamole.net.auth.AuthenticatedUser; import org.apache.guacamole.net.auth.AuthenticatedUser;
import org.apache.guacamole.net.auth.AuthenticationProvider; import org.apache.guacamole.net.auth.AuthenticationProvider;
@@ -50,7 +50,7 @@ public class JDBCAuthenticationProviderService implements AuthenticationProvider
* Provider for retrieving UserContext instances. * Provider for retrieving UserContext instances.
*/ */
@Inject @Inject
private Provider<UserContext> userContextProvider; private Provider<ModeledUserContext> userContextProvider;
@Override @Override
public AuthenticatedUser authenticateUser(AuthenticationProvider authenticationProvider, public AuthenticatedUser authenticateUser(AuthenticationProvider authenticationProvider,
@@ -67,7 +67,7 @@ public class JDBCAuthenticationProviderService implements AuthenticationProvider
} }
@Override @Override
public UserContext getUserContext(AuthenticationProvider authenticationProvider, public ModeledUserContext getUserContext(AuthenticationProvider authenticationProvider,
AuthenticatedUser authenticatedUser) throws GuacamoleException { AuthenticatedUser authenticatedUser) throws GuacamoleException {
// Retrieve user account for already-authenticated user // Retrieve user account for already-authenticated user
@@ -76,7 +76,7 @@ public class JDBCAuthenticationProviderService implements AuthenticationProvider
return null; return null;
// Link to user context // Link to user context
UserContext context = userContextProvider.get(); ModeledUserContext context = userContextProvider.get();
context.init(user.getCurrentUser()); context.init(user.getCurrentUser());
return context; return context;

2
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserContext.java → extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUserContext.java
View File

@@ -50,7 +50,7 @@ import org.apache.guacamole.net.auth.User;
* @author James Muehlner * @author James Muehlner
* @author Michael Jumper * @author Michael Jumper
*/ */
public class UserContext extends RestrictedObject public class ModeledUserContext extends RestrictedObject
implements org.apache.guacamole.net.auth.UserContext { implements org.apache.guacamole.net.auth.UserContext {
/** /**