1 files changed, 5 insertions, 17 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/authentication/DemoAuthenticationProvider.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/authentication/DemoAuthenticationProvider.java
index f393eb7fd5b..af3797d5bc4 100644
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/authentication/DemoAuthenticationProvider.java
+++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/authentication/DemoAuthenticationProvider.java
@@ -10,33 +10,21 @@
  *******************************************************************************/
 package org.eclipse.osee.framework.core.server.internal.authentication;
 
-import java.util.Arrays;
-import java.util.List;
-import org.eclipse.osee.framework.core.data.UserToken;
+import static org.eclipse.osee.framework.core.enums.DemoUsers.Joe_Smith;
 import org.eclipse.osee.framework.core.data.OseeCredential;
+import org.eclipse.osee.framework.core.data.UserToken;
+import org.eclipse.osee.framework.core.enums.DemoUsers;
 import org.eclipse.osee.framework.core.server.AbstractAuthenticationProvider;
 
 /**
  * @author Roberto E. Escobar
  */
 public class DemoAuthenticationProvider extends AbstractAuthenticationProvider {
-
    private final boolean autoAuthenticate = true;
-   public static final UserToken Joe_Smith =
-      UserToken.create(61106791L, "ABNRvbZxXHICYklfslwA", "Joe Smith", "", "3333", true, false, false);
-   public static final UserToken Kay_Jones =
-      UserToken.create(5896672L, "ABNRvuB8x3VARkkn3YAA", "Kay Jones", "", "4444", true, false, false);
-   public static final UserToken Jason_Michael =
-      UserToken.create(277990, "ABNRvuHWtXAdxbG3mUAA", "Jason Michael", "", "5555", true, false, false);
-   public static final UserToken Alex_Kay =
-      UserToken.create(8006939L, "ABNRvuKDIWOcPDe4X0wA", "Alex Kay", "", "6666", true, false, false);
-   public static final UserToken Inactive_Steve =
-      UserToken.create(5808093, "ABNRvuRG6jKwKnEoX4gA", "Inactive Steve", "", "7777", false, false, false);
-   public static List<UserToken> values = Arrays.asList(Joe_Smith, Kay_Jones, Jason_Michael, Alex_Kay, Inactive_Steve);
 
    @Override
    public UserToken asOseeUserId(OseeCredential credential) {
-      for (UserToken token : values) {
+      for (UserToken token : DemoUsers.values()) {
          if (credential.getUserName().equals(token.getName().toLowerCase())) {
             UserToken userToken = getUserTokenFromOseeDb(token.getName());
             if (userToken != null) {
@@ -46,7 +34,7 @@ public class DemoAuthenticationProvider extends AbstractAuthenticationProvider {
             }
          }
       }
-      return createUserToken(true, Joe_Smith.getName(), Joe_Smith.getUserId(), "", true);
+      return createUserToken(true, Joe_Smith.getName(), Joe_Smith.getUserId(), "joe@boeing.com", true);
    }
 
    @Override