improved auth

service/src/main/java/CTFApplication.java

@@ -107,11 +107,9 @@ public class CTFApplication extends Application<ApplicationConfiguration> {
 
         @Override
         public com.google.common.base.Optional<User> authenticate(BasicCredentials credentials) throws AuthenticationException {
-            if ("secret".equals(credentials.getPassword())) {
-                java.util.Optional<User> user = usersRepository.get(credentials.getUsername());
-                if (user.isPresent()) {
-                    return Optional.of(user.get());
-                }
+            java.util.Optional<User> user = usersRepository.authenticateUser(credentials);
+            if (user.isPresent()) {
+                return Optional.of(user.get());
             }
             return Optional.absent();
         }
@@ -122,6 +120,7 @@ public class CTFApplication extends Application<ApplicationConfiguration> {
         public boolean authorize(User user, String role) {
             return user.getName().equals("good-guy") && role.equals("ADMIN");
         }
+
     }
 
     //todo: inject dbonnector

service/src/main/java/repositories/UsersRepository.java

 package repositories;
 
 import database.MongoDBConnector;
+import io.dropwizard.auth.basic.BasicCredentials;
 import objects.Team;
 import objects.User;
 
@@ -21,12 +22,24 @@ public class UsersRepository implements Repository {
         this.teamsRepository = teamsRepository;
     }
 
-    public Optional<User> get(String username) {
+//    public Optional<User> get(String username) {
+//        Optional<User> userOptional = teamsRepository.getAll()
+//                .stream()
+//                .map(Team::getMembers)
+//                .flatMap(Collection::stream)
+//                .filter(user -> user.getName().equals(username))
+//                .findFirst();
+//        return userOptional;
+//    }
+
+    public Optional<User> authenticateUser(BasicCredentials basicCredentials) {
         Optional<User> userOptional = teamsRepository.getAll()
                 .stream()
                 .map(Team::getMembers)
                 .flatMap(Collection::stream)
-                .filter(user -> user.getName().equals(username))
+                .filter(user -> {
+                    return user.getName().equals(basicCredentials.getUsername()) && user.getPassword().equals(basicCredentials.getPassword()); //todo
+                })
                 .findFirst();
         return userOptional;
     }