@@ -2,7 +2,7 @@ CXXFLAGS += -fPIC -fno-stack-protector -std=c++14

 CFLAGS += -fPIC -fno-stack-protector

 OBJS = dual_control.o request.o dual_control_integrate.o validator.o conversation.o user.o \

-	   sys_unistd.o sys_pwd.o token.o

+	   sys_unistd.o sys_pwd.o token.o file_reader.o

 TESTS = dual_control_test validator_test conversation_test request_test user_test token_test

 TESTOBJS = $(patsubst %,%.o,$(TESTS))

 SRCS := $(OBJS:.o=.cc) $(TESTOBJS:.o=.cc)

new file mode 100644

@@ -0,0 +1,28 @@

+#include <fstream>

+

+#include "file_reader.h"

+

+namespace {

+class file_reader_impl : public file_reader_ifc

+{

+public:

+    bool open (std::ifstream &token_file, const std::string &file_path)

+    {

+        token_file.open (file_path);

+        return token_file.good();

+    }

+    std::string getline (std::ifstream &token_file, std::string &line)

+    {

+        std::getline (token_file, line);

+        return line;

+    }

+};

+

+}

+

+file_reader file_reader::create ()

+{

+    return file_reader (file_reader::delegate (new

+                        file_reader_impl ));

+}

+

new file mode 100644

@@ -0,0 +1,58 @@

+/* Copyright (C) CJ Affiliate

+ *

+ * You may use, distribute and modify this code under  the

+ * terms of the  GNU General Public License  version 2  or

+ * later.

+ *

+ * You should have received a copy of the license with this

+ * file. If not, you will find a copy in the "LICENSE" file

+ * at https://github.com/cjdev/dual-control.

+ */

+

+#ifndef _FILE_READER_H

+#define _FILE_READER_H

+

+#include <string>

+#include <memory>

+

+#include "user.h"

+

+

+class file_reader_ifc

+{

+public:

+    virtual bool open (std::ifstream &token_file, const std::string &file_path)

+    {

+        return false;

+    }

+    virtual std::string getline (std::ifstream &token_file,

+                                 std::string &line)

+    {

+        return "";

+    }

+};

+

+class file_reader : public file_reader_ifc

+{

+public:

+    typedef std::shared_ptr<file_reader_ifc> delegate;

+private:

+    delegate delegate_;

+public:

+    file_reader (delegate delegate) :

+        delegate_ (delegate) {}

+    file_reader() : delegate_ (delegate (new file_reader_ifc)) {}

+    bool open (std::ifstream &token_file, const std::string &file_path)

+    {

+        return delegate_->open (token_file, file_path);

+    }

+    std::string getline (std::ifstream &token_file, std::string &line)

+    {

+        return delegate_->getline (token_file, line);

+    }

+

+    static file_reader create ();

+};

+

+#endif

+

@@ -41,29 +41,7 @@ public:

         return file_reader_.getline (token_file, fetched_token);

     }

 };

-

-class file_reader_impl : public file_reader_ifc

-{

-public:

-    bool open (std::ifstream &token_file, const std::string &file_path)

-    {

-        token_file.open (file_path);

-        return token_file.good();

-    }

-    std::string getline (std::ifstream &token_file, std::string &line)

-    {

-        std::getline (token_file, line);

-        return line;

-    }

-};

-}

-

-file_reader file_reader::create ()

-{

-    return file_reader (file_reader::delegate (new

-                        file_reader_impl ));

 }

-

 user_token_supplier user_token_supplier::create (file_reader &file_reader)

 {

     return user_token_supplier (user_token_supplier::delegate

@@ -16,6 +16,7 @@

 #include <memory>

 #include "user.h"

+#include "file_reader.h"

 class user_token_supplier_ifc

 {

@@ -27,42 +28,6 @@ public:

     }

 };

-class file_reader_ifc

-{

-public:

-    virtual bool open (std::ifstream &token_file, const std::string &file_path)

-    {

-        return false;

-    }

-    virtual std::string getline (std::ifstream &token_file,

-                                 std::string &line)

-    {

-        return "";

-    }

-};

-

-class file_reader : public file_reader_ifc

-{

-public:

-    typedef std::shared_ptr<file_reader_ifc> delegate;

-private:

-    delegate delegate_;

-public:

-    file_reader (delegate delegate) :

-        delegate_ (delegate) {}

-    file_reader() : delegate_ (delegate (new file_reader_ifc)) {}

-    bool open (std::ifstream &token_file, const std::string &file_path)

-    {

-        return delegate_->open (token_file, file_path);

-    }

-    std::string getline (std::ifstream &token_file, std::string &line)

-    {

-        return delegate_->getline (token_file, line);

-    }

-

-    static file_reader create ();

-};

-

 class user_token_supplier : public user_token_supplier_ifc

 {

 public:

@@ -19,6 +19,7 @@

 #include "token.h"

 #include "test_util.h"

 #include "user.h"

+#include "file_reader.h"

 class fake_file_reader : public file_reader_ifc

 {