@@ -8,7 +8,7 @@

 class user_token_supplier

 {

 public:

-    virtual std::string token (const user_p user) = 0;

+    virtual std::string token (user user) = 0;

 };

 typedef std::shared_ptr<user_token_supplier> user_token_supplier_p;

@@ -5,21 +5,47 @@

 #include <memory>

 #include <pwd.h>

-class user

+class user_ifc

 {

 public:

-    virtual ~user() {}

-    //        virtual std::string home_directory() = 0;

+    virtual ~user_ifc() {}

 };

-typedef std::shared_ptr<user> user_p;

-class directory

+class user : public user_ifc

 {

+private:

+    std::shared_ptr<user_ifc> delegate_;

 public:

-    virtual ~directory() {}

-    virtual const user_p find_user (const std::string &user_name) = 0;

+    user (std::shared_ptr<user_ifc> delegate) : delegate_ (delegate) {}

+    user() : user (std::shared_ptr<user_ifc> (new user_ifc)) {}

+};

+

+class directory_ifc

+{

+public:

+    virtual ~directory_ifc() {}

+    virtual std::vector<user> find_user (const std::string &user_name)

+    {

+        return std::vector<user>();

+    }

+};

+

+class directory : public directory_ifc

+{

+private:

+    std::shared_ptr<directory_ifc> delegate_;

+public:

+    directory (std::shared_ptr<directory_ifc> delegate) : delegate_

+        (delegate) {}

+    directory() : directory (std::shared_ptr<directory_ifc>

+                                 (new directory_ifc)) {}

+    std::vector<user> find_user (const std::string &user_name)

+    {

+        return delegate_->find_user (user_name);

+    }

+

+    static directory create();

 };

-typedef std::shared_ptr<directory> directory_p;

 #endif

@@ -1,50 +1,40 @@

 #include <string>

-#include <iostream>

+#include <vector>

 #include "validator.h"

 namespace

 {

-    class impl : public validator_ifc {

-        private:

-            directory_p directory_;

-            user_token_supplier_p user_token_supplier_;

-        public:

-        impl(const directory_p &directory, const user_token_supplier_p user_token_supplier) :

-            directory_(directory),

-            user_token_supplier_(user_token_supplier) {}

-        bool validate (const std::string &user_name,

-                              const std::string &token)

-        {

-            user_p found_user = directory_->find_user (user_name);

-

-            if (!found_user) {

-                return false;

-            }

-

-            std::string user_token = user_token_supplier_->token (found_user);

-            return user_token == token;

+class impl : public validator_ifc

+{

+private:

+    directory directory_;

+    user_token_supplier_p user_token_supplier_;

+public:

+    impl (const directory &directory,

+          const user_token_supplier_p user_token_supplier) :

+        directory_ (directory),

+        user_token_supplier_ (user_token_supplier) {}

+    bool validate (const std::string &user_name,

+                   const std::string &token)

+    {

+        std::vector<user> found_user = directory_.find_user (user_name);

+

+        if (found_user.empty()) {

+            return false;

         }

-    };

-}

-validator create_validator(const directory_p &directory, const user_token_supplier_p &user_token_supplier) {

-    std::shared_ptr<validator_ifc> delegate(new impl(directory, user_token_supplier));

-    return validator(delegate);

+        std::string user_token = user_token_supplier_->token (found_user[0]);

+        return user_token == token;

+    }

+};

 }

-/*

-bool old_validator::validate (const std::string &user_name,

-                              const std::string &token)

+validator create_validator (const directory &directory,

+                            const user_token_supplier_p &user_token_supplier)

 {

-    user_p found_user = directory_->find_user (user_name);

-

-    if (!found_user) {

-        return false;

-    }

-

-    std::string user_token = user_token_supplier_->token (found_user);

-    return user_token == token;

+    std::shared_ptr<validator_ifc> delegate (new impl (directory,

+            user_token_supplier));

+    return validator (delegate);

 }

-*/

@@ -33,7 +33,8 @@ public:

     }

 };

-validator create_validator(const directory_p &directory, const user_token_supplier_p &token_supplier);

+validator create_validator (const directory &directory,

+                            const user_token_supplier_p &token_supplier);

 #endif

@@ -1,22 +1,27 @@

+#include <string>

+#include <vector>

+

 #include "validator.h"

 #include "user.h"

 #include "test_util.h"

 #include "token.h"

-class fake_directory : public directory

+class fake_directory : public directory_ifc

 {

 private:

     std::string user_name_;

 public:

-    fake_directory (const std::string &user_name) : user_name_ (user_name) {}

+    fake_directory (const std::string &user_name) : user_name_ (user_name)

+    {

+    }

     fake_directory() : user_name_ ("_NOT_A_USER") {}

-    virtual const user_p find_user (const std::string &user_name)

+    std::vector<user> find_user (const std::string &user_name)

     {

-        user_p result;

+        std::vector<user> result;

         if (user_name == user_name_) {

-            result.reset (new user);

+            result.push_back (user());

         }

         return result;

@@ -30,12 +35,18 @@ private:

 public:

     fake_user_token_supplier (const std::string &token) : token_ (token) {}

     fake_user_token_supplier() : token_ ("_NOT_A_TOKEN") {}

-    virtual std::string token (const user_p user)

+    virtual std::string token (user user)

     {

         return token_;

     }

 };

+template<class T>

+std::shared_ptr<T> share (T *t)

+{

+    return std::shared_ptr<T> (t);

+}

+

 bool validator_validates()

 {

@@ -44,7 +55,7 @@ bool validator_validates()

     user_token_supplier_p user_token_supplier (new fake_user_token_supplier (

                 token));

     std::string user_name = "msmith";

-    directory_p directory (new fake_directory (user_name));

+    directory directory (share (new fake_directory (user_name)));

     validator validator = create_validator (directory, user_token_supplier);

     // when

@@ -62,7 +73,7 @@ bool validator_fails_unknown_user()

     std::string token = "token";

     user_token_supplier_p user_token_supplier (new fake_user_token_supplier (

                 token));

-    directory_p directory (new fake_directory);

+    directory directory (share (new fake_directory));

     validator validator = create_validator (directory, user_token_supplier);

     // when

@@ -79,7 +90,7 @@ bool validator_fails_incorrect_token()

     // given

     user_token_supplier_p user_token_supplier (new fake_user_token_supplier);

     std::string user_name = "msmith";

-    directory_p directory (new fake_directory (user_name));

+    directory directory (share (new fake_directory (user_name)));

     validator validator = create_validator (directory, user_token_supplier);

     // when