@@ -2,15 +2,30 @@

 #define _TOKEN_H

 #include <string>

 #include <memory>

-

+#include <iostream>

 #include "user.h"

-class user_token_supplier

+

+

+class user_token_supplier_ifc

 {

 public:

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

+    virtual std::string token (const user &user) {

+        return "";

+    }

 };

-typedef std::shared_ptr<user_token_supplier> user_token_supplier_p;

+

+class user_token_supplier : public user_token_supplier_ifc {

+    private:

+        std::shared_ptr<user_token_supplier_ifc> delegate_;

+    public:

+        user_token_supplier(std::shared_ptr<user_token_supplier_ifc> delegate) : delegate_(delegate) {}

+        user_token_supplier() : user_token_supplier(std::shared_ptr<user_token_supplier_ifc>(new user_token_supplier_ifc)) {}

+        std::string token(const user &user) {

+            return delegate_->token(user);

+        }

+};

+

 #endif

@@ -9,10 +9,10 @@ class impl : public validator_ifc

 {

 private:

     directory directory_;

-    user_token_supplier_p user_token_supplier_;

+    user_token_supplier user_token_supplier_;

 public:

     impl (const directory &directory,

-          const user_token_supplier_p user_token_supplier) :

+          const user_token_supplier user_token_supplier) :

         directory_ (directory),

         user_token_supplier_ (user_token_supplier) {}

     bool validate (const std::string &user_name,

@@ -24,14 +24,14 @@ public:

             return false;

         }

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

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

         return user_token == token;

     }

 };

 }

 validator create_validator (const directory &directory,

-                            const user_token_supplier_p &user_token_supplier)

+                            const user_token_supplier &user_token_supplier)

 {

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

             user_token_supplier));

@@ -34,7 +34,7 @@ public:

 };

 validator create_validator (const directory &directory,

-                            const user_token_supplier_p &token_supplier);

+                            const user_token_supplier &token_supplier);

 #endif

@@ -35,7 +35,7 @@ private:

 public:

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

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

-    virtual std::string token (user user)

+    virtual std::string token (const user &user)

     {

         return token_;

     }

@@ -52,14 +52,13 @@ bool validator_validates()

     // given

     std::string token = "token";

-    user_token_supplier_p user_token_supplier (new fake_user_token_supplier (

-                token));

+    user_token_supplier user_token_supplier (share(new fake_user_token_supplier(token)));

     std::string user_name = "msmith";

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

     validator validator = create_validator (directory, user_token_supplier);

     // when

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

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

     // then

     check (actual, "should be valid");

@@ -71,8 +70,7 @@ bool validator_fails_unknown_user()

     // given

     std::string token = "token";

-    user_token_supplier_p user_token_supplier (new fake_user_token_supplier (

-                token));

+    user_token_supplier user_token_supplier (share(new fake_user_token_supplier));

     directory directory (share (new fake_directory));

     validator validator = create_validator (directory, user_token_supplier);

@@ -88,7 +86,7 @@ bool validator_fails_incorrect_token()

 {

     // given

-    user_token_supplier_p user_token_supplier (new fake_user_token_supplier);

+    user_token_supplier user_token_supplier (share(new fake_user_token_supplier));

     std::string user_name = "msmith";

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

     validator validator = create_validator (directory, user_token_supplier);