@@ -3,6 +3,37 @@

 #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;

+        }

+    };

+}

+

+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);

+}

+

+/*

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

                               const std::string &token)

 {

@@ -15,4 +46,5 @@ bool old_validator::validate (const std::string &user_name,

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

     return user_token == token;

 }

+*/

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

     }

 };

-class old_validator

-{

-private:

-    directory_p directory_;

-    user_token_supplier_p user_token_supplier_;

-public:

-    old_validator (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, const std::string &token);

-};

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

 #endif

@@ -45,7 +45,7 @@ bool validator_validates()

                 token));

     std::string user_name = "msmith";

     directory_p directory (new fake_directory (user_name));

-    old_validator validator (directory, user_token_supplier);

+    validator validator = create_validator (directory, user_token_supplier);

     // when

     bool actual = validator.validate (user_name, "token");

@@ -63,7 +63,7 @@ bool validator_fails_unknown_user()

     user_token_supplier_p user_token_supplier (new fake_user_token_supplier (

                 token));

     directory_p directory (new fake_directory);

-    old_validator validator (directory, user_token_supplier);

+    validator validator = create_validator (directory, user_token_supplier);

     // when

     bool actual = validator.validate ("notuser", token);

@@ -80,7 +80,7 @@ bool validator_fails_incorrect_token()

     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));

-    old_validator validator (directory, user_token_supplier);

+    validator validator = create_validator (directory, user_token_supplier);

     // when

     bool actual = validator.validate (user_name, "token");