@@ -18,6 +18,7 @@

 #include "token.h"

 #include "user.h"

+#include "base32.h"

 #include "sys_fstream.h"

 namespace

@@ -32,22 +33,24 @@ public:

         fstreams_ (fstreams), generator_(generator) {}

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

     {

-        return generator_.generate_token("\x00");

+        // Get key

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

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

-        // // Get key

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

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

+        // TODO: decode key

+        std::vector<char> line_v(40);

+        stream->getline(line_v.data(), line_v.size());

-        // if (!stream->good()) {

-        //     return "";

-        // }

+        if (stream->fail()) {

+            return "";

+        }

-        // // TODO: decode key

-        // std::vector<char> line (21);

-        // stream->getline (line.data(), line.size());

-        // std::vector<char> key = Base32.decode(line.data());

-        // // TODO: generate the token

-        // return generator_.generate_token (key);

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

     }

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

     {

@@ -89,6 +89,9 @@ private:

     std::string expected_token = "<unspecified>";

     std::string key = "<unset>";

 public:

+    fake_totp_generator (std::string expected_token = "<unspecified>") :

+        expected_token (expected_token)

+    {}

     std::string generate_token (const std::string &key) const override {

         return expected_token;

     }

@@ -100,10 +103,10 @@ int reads_from_the_right_file ()

     std::string home_directory = "/somedir";

     // hardcoded file name is .dual_control in the user's home directory

     std::string token_file = home_directory + "/.dual_control";

-    std::string token ("123456");

-    fstreams test_streams (fstreams::delegate (new fake_fstreams (token_file,

-                           token)));

-    totp_generator generator (totp_generator::delegate (new fake_totp_generator ()));

+    std::string token ("AAAAAAAA");

+

+    fstreams test_streams (fstreams::delegate (new fake_fstreams (token_file, token)));

+    totp_generator generator (totp_generator::delegate (new fake_totp_generator (token)));

     //file_reader test_file_reader (file_reader::delegate (new fake_file_reader));

     user test_user (user::delegate (new fake_user (home_directory)));

@@ -157,18 +160,16 @@ int writes_the_token ()

     temp << token << std::endl;

     std::string expected_written = temp.str();

     std::string expected_filename (home_directory + "/.dual_control");

-    check (mockfs->captured_filename() == expected_filename,

-           "filename does not match");

-    check (mockfs->captured_written() == expected_written,

-           "token does not match");

+    check (mockfs->captured_filename() == expected_filename, "filename does not match");

+    check (mockfs->captured_written() == expected_written, "token does not match");

     succeed();

 }

 int run_tests()

 {

-    // test (reads_from_the_right_file);

-    // test (returns_empty_string_if_file_open_fail);

-    // test (writes_the_token);

+    test (reads_from_the_right_file);

+    test (returns_empty_string_if_file_open_fail);

+    test (writes_the_token);

     succeed();

 }