@@ -53,7 +53,6 @@ int main (int argc, char *argv[])

 {

     class system system (init_system());

     installer tool (init_installer());

-    std::string generated_token = tool.install_token();

-    std::cout << generated_token << std::endl;

-    return 0;

+    std::string generated_key = tool.install_key();

+    std::cout << generated_key << std::endl;

 }

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

           const totp_generator generator) :

         tokens_ (tokens), unistd_ (unistd), directory_ (directory),

         generator_ (generator) {}

-    std::string install_token() const override

+    std::string install_key() const override

     {

         const char *c_user_name = unistd_.getlogin();

@@ -51,9 +51,10 @@ public:

         }

         user user (found_user[0]);

-        std::string token (tokens_.token(user));

-        tokens_.save (user, token);

-        return token;

+

+        std::string key = tokens_.ensure_key(user);

+

+        return key;

     }

 };

@@ -24,7 +24,7 @@

 class installer_ifc

 {

 public:

-    virtual std::string install_token() const

+    virtual std::string install_key() const

     {

         return "123456";

     }

@@ -39,9 +39,9 @@ private:

 public:

     installer (const delegate &delegate = std::make_shared<installer_ifc>()) :

         delegate_ (delegate) {}

-    std::string install_token() const

+    std::string install_key() const

     {

-        return delegate_->install_token();

+        return delegate_->install_key();

     }

     static installer create (const tokens &tokens, const unistd &unistd,

                              const directory &directory,

@@ -34,6 +34,11 @@ public:

         return key_;

     }

+    std::string ensure_key(const user &user) const override {

+        save(user, key_);

+        return key_;

+    }

+

     void save (const user &user, const std::string &token) const override

     {

         captured_token = token;

@@ -115,7 +120,7 @@ int installs_token()

                           generator);

     //when

-    std::string result = installer.install_token();

+    std::string result = installer.install_key();

     //then

     check (test_tokens->captured_token == key, "installed wrong token");

@@ -138,7 +143,7 @@ int unistd_does_not_find_user_name_nullptr_case()

                           generator);

     //when

-    auto returned = installer.install_token();

+    auto returned = installer.install_key();

     //then

     check (test_tokens->captured_token == "",

@@ -162,7 +167,7 @@ int unistd_does_not_find_user_name_empty_string_case()

                           generator);

     //when

-    auto returned = installer.install_token();

+    auto returned = installer.install_key();

     //then

     check (test_tokens->captured_token == "",

@@ -185,7 +190,7 @@ int directory_finds_no_user_info()

                           generator);

     //when

-    auto returned = installer.install_token();

+    auto returned = installer.install_key();

     //then

     check (test_tokens->captured_token == "", "installed wrong token");

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

     std::string token (const user &user) const override

     {

         // Get key

-        const std::string file_path (user.home_directory() + "/.dual_control");

+        std::string line = read_key(user);

+        if (line == "") {

+            return "";

+        }

+

+        base32 codec;

+        std::vector<uint8_t> key = codec.decode(line);

+

+        // TODO: generate the token

+        return generator_.generate_token (std::string (key.begin(), key.end()));

+    }

+

+private:

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

+        return user.home_directory() + "/.dual_control";

+    }

+

+    bool key_exists (const user &user) const {

+        // check if file exists

+        std::string file_path = get_key_path(user);

+        fstreams::pstream stream (fstreams_.open_fstream(file_path));

+        return stream->good();

+    }

+

+    std::string generate_key() const {

+        base32 codec;

+        // get randomness

+        std::vector<unsigned char> random_bytes (16);

+        // base32encode it

+        std::string key = codec.encode(random_bytes);

+        return "QWERQWERQWERQWER";

+    }

+

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

+        std::string file_path = get_key_path(user);

         fstreams::pstream stream (fstreams_.open_fstream (file_path));

         // TODO: ignore newlines

@@ -45,16 +79,23 @@ public:

             return "";

         }

-        base32 codec;

         std::string line(line_v.begin(), line_v.end());

-        std::vector<uint8_t> key = codec.decode(line);

-

-        // TODO: generate the token

-        return generator_.generate_token (std::string (key.begin(), key.end()));

+        return line;

+    }

+public:

+    std::string ensure_key (const user &user) const override {

+        if (!key_exists(user)) {

+            std::string key = generate_key();

+            save(user, key);

+            return key;

+        } else {

+            return read_key(user);

+        }

     }

+

     void save (const user &user, const std::string &token) const override

     {

-        std::string file_path (user.home_directory() + "/.dual_control");

+        std::string file_path = get_key_path(user);

         fstreams::postream stream (fstreams_.open_ofstream (file_path,

                                    std::ios_base::trunc));

         *stream << token << std::endl;

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

     {

         return "";

     }

+    virtual std::string ensure_key (const user &user) const { return ""; };

     virtual void save (const user &user, const std::string &token) const {}

 };

@@ -43,6 +44,9 @@ public:

         delegate_ (delegate) {}

     tokens() : tokens (

             delegate (new tokens_ifc)) {}

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

+        return delegate_->ensure_key(user);

+    }

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

     {

         return delegate_->token (user);