redeisgned auth

service/src/main/java/CTFApplication.java

@@ -121,11 +121,8 @@ public class CTFApplication extends Application<ApplicationConfiguration> {
 
         @Override
         public com.google.common.base.Optional<User> authenticate(BasicCredentials credentials) throws AuthenticationException {
-            java.util.Optional<User> user = usersRepository.authenticateUser(credentials);
-            if (user.isPresent()) {
-                return Optional.of(user.get());
-            }
-            return Optional.absent();
+            User user = usersRepository.authenticateUser(credentials);
+            return Optional.of(user);
         }
     }
 

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

@@ -2,12 +2,12 @@ package repositories;
 
 import io.dropwizard.auth.basic.BasicCredentials;
 import objects.User;
+import org.apache.commons.codec.binary.Hex;
 import org.mongodb.morphia.Datastore;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.List;
-import java.util.Optional;
 
 /**
  * Created by gpietrus on 20.02.2016.
@@ -39,23 +39,12 @@ public class UsersRepository implements Repository {
 //        return userOptional;
 //    }
 
-    public Optional<User> authenticateUser(BasicCredentials basicCredentials) {
+    public User authenticateUser(BasicCredentials basicCredentials) {
 
-
-
-        return null;
-        /*
-        Optional<User> userOptional = teamsRepository.getAll()
-                .stream()
-                .map(Team::getMembers)
-                .flatMap(Collection::stream)
-                .filter(user -> {
-                    return user.getName().equals(basicCredentials.getUsername()) &&
-                            user.getPassword().equals(
-                                    Hex.encodeHexString(messageDigest.digest(basicCredentials.getPassword().getBytes()))); //todo
-                })
-                .findFirst();
-        return userOptional;*/
+        return datastore.createQuery(User.class)
+                .field("name").equal(basicCredentials.getUsername())
+                .field("password").equal(Hex.encodeHexString(messageDigest.digest(basicCredentials.getPassword().getBytes())))
+                .get();
     }
 
     @Override