@@ -5,14 +5,13 @@

 #include "user.h"

-class token {

-       std::string value_

+

+class user_token_supplier {

     public:

-       token(const std::string &value) : value_(value) {}

-       std::string value() { return value_; }

-}

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

+};

-shared_ptr<token> create_token(std::shared_ptr<user> user);

+typedef std::shared_ptr<user_token_supplier> user_token_supplier_p;

 int validate_token(const char *user, const char *token);

@@ -15,7 +15,7 @@ class user {

 typedef std::shared_ptr<user> user_p;

 class directory {

     public:

-        virtual ~directory() {}

+       virtual ~directory() {}

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

 };

@@ -1,8 +1,16 @@

 #include <string>

+#include <iostream>

 #include "validator.h"

 bool validator::validate(const std::string &user_name, const std::string &token) {

-    return directory_->find_user(user_name) && token == "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;

 }

@@ -4,12 +4,16 @@

 #include <string>

 #include "user.h"

+#include "token.h"

 class validator {

     private:

         directory_p directory_;

+        user_token_supplier_p user_token_supplier_;

     public:

-        validator(const directory_p &directory): directory_(directory) {}

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

 };

@@ -1,6 +1,7 @@

 #include "validator.h"

 #include "user.h"

 #include "test_util.h"

+#include "token.h"

 class fake_directory : public directory {

     private:

@@ -19,13 +20,26 @@ class fake_directory : public directory {

         }

 };

+class fake_user_token_supplier : public user_token_supplier {

+    private:

+        std::string token_;

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

+            return token_;

+        }

+};

+

 bool validator_validates() {

-   // given

+    // given

+    std::string token = "token";

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

-    validator validator(directory);

+    validator validator(directory, user_token_supplier);

     // when

@@ -40,12 +54,14 @@ bool validator_validates() {

 bool validator_fails_unknown_user() {

    // given

+   std::string token = "token";

+   user_token_supplier_p user_token_supplier(new fake_user_token_supplier(token));

    directory_p directory(new fake_directory);

-   validator validator(directory);

+   validator validator(directory, user_token_supplier);

    // when

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

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

    // then

@@ -56,13 +72,14 @@ bool validator_fails_unknown_user() {

 bool validator_fails_incorrect_token() {

    // given

-    std::string user_name = "user";

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

-    validator validator(directory);

+    validator validator(directory, user_token_supplier);

    // when

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

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

    // then

@@ -78,7 +95,6 @@ bool run_tests() {

     test(validator_fails_unknown_user);

     test(validator_fails_incorrect_token);

     succeed();

-

 }

 int main(int argc, char *argv[]) {