Start using ResponseParser class

Previously the code for parsing the server responses were part of the
core library. Move this code to the previously added ResponseParser
class. This makes it possible to in the future give the user of the
library an easy way to change which third party libraries are used
for parsing server responses.

Author: svedi

CMakeLists.txt

@@ -4,8 +4,8 @@ project (cryptolens)
 set (CRYPTOLENS_BUILD_TESTS OFF CACHE BOOL "build tests?")
 set (CRYPTOLENS_CURL_EMBED_CACERTS OFF CACHE BOOL "embed the ca certs in the library instead of using system default files?")
 
-set (SRC "src/ActivateError.cpp" "src/DataObject.cpp" "src/LicenseKey.cpp" "src/LicenseKeyChecker.cpp" "src/LicenseKeyInformation.cpp" "src/MachineCodeComputer_static.cpp" "src/basic_Cryptolens.cpp" "src/basic_SKM.cpp" "third_party/base64_OpenBSD/base64.cpp")
-set (LIBS "")
+set (SRC "src/ActivateError.cpp" "src/DataObject.cpp" "src/LicenseKey.cpp" "src/LicenseKeyChecker.cpp" "src/LicenseKeyInformation.cpp" "src/MachineCodeComputer_static.cpp" "src/RawLicenseKey.cpp" "src/ResponseParser_ArduinoJson5.cpp" "src/basic_SKM.cpp" "src/cryptolens_internals.cpp" "third_party/base64_OpenBSD/base64.cpp")
+set (LIBS "pthread" "dl")
 
 find_package(OpenSSL)
 if (${OpenSSL_FOUND})

include/cryptolens/Customer.hpp

@@ -26,7 +26,7 @@ class Customer {
   , company_name_(std::move(company_name))
   , created_(created)
   {
-    // TODO: Check length requirements
+    // TODO: Check length requirements (does not matter when we are just reading things from the web api)
   }
 
   // Returns the customer id

include/cryptolens/DataObject.hpp

@@ -14,7 +14,6 @@ class DataObject {
   std::string string_value_;
   int int_value_;
 public:
-  // TOOD: Use ints with specific sizes...
   DataObject
     ( int id
     , std::string name

include/cryptolens/LicenseKeyInformation.hpp

@@ -5,8 +5,9 @@
 
 #include "imports/std/optional"
 
-#include "basic_Error.hpp"
+#include "api.hpp"
 #include "ActivationData.hpp"
+#include "basic_Error.hpp"
 #include "Customer.hpp"
 #include "DataObject.hpp"
 #include "RawLicenseKey.hpp"
@@ -32,37 +33,68 @@ class LicenseKeyChecker;
  */
 class LicenseKeyInformation {
 private:
-  LicenseKeyInformation() { };
-
-  int           product_id;
-  std::uint64_t created;
-  std::uint64_t expires;
-  int           period;
-  bool          block;
-  bool          trial_activation;
-  std::uint64_t sign_date;
-  bool          f1;
-  bool          f2;
-  bool          f3;
-  bool          f4;
-  bool          f5;
-  bool          f6;
-  bool          f7;
-  bool          f8;
-
-  optional<int>                         id;
-  optional<std::string>                 key;
-  optional<std::string>                 notes;
-  optional<int>                         global_id;
-  optional<Customer>                    customer;
-  optional<std::vector<ActivationData>> activated_machines;
-  optional<int>                         maxnoofmachines;
-  optional<std::string>                 allowed_machines;
-  optional<std::vector<DataObject>>     data_objects;
+  LicenseKeyInformation();
+
+  int           product_id_;
+  std::uint64_t created_;
+  std::uint64_t expires_;
+  int           period_;
+  bool          block_;
+  bool          trial_activation_;
+  std::uint64_t sign_date_;
+  bool          f1_;
+  bool          f2_;
+  bool          f3_;
+  bool          f4_;
+  bool          f5_;
+  bool          f6_;
+  bool          f7_;
+  bool          f8_;
+
+  optional<int>                         id_;
+  optional<std::string>                 key_;
+  optional<std::string>                 notes_;
+  optional<int>                         global_id_;
+  optional<Customer>                    customer_;
+  optional<std::vector<ActivationData>> activated_machines_;
+  optional<int>                         maxnoofmachines_;
+  optional<std::string>                 allowed_machines_;
+  optional<std::vector<DataObject>>     data_objects_;
 public:
+  LicenseKeyInformation(
+    api::internal::main,
+    int           product_id,
+    std::uint64_t created,
+    std::uint64_t expires,
+    int           period,
+    bool          block,
+    bool          trial_activation,
+    std::uint64_t sign_date,
+    bool          f1,
+    bool          f2,
+    bool          f3,
+    bool          f4,
+    bool          f5,
+    bool          f6,
+    bool          f7,
+    bool          f8,
+
+    optional<int>                         id,
+    optional<std::string>                 key,
+    optional<std::string>                 notes,
+    optional<int>                         global_id,
+    optional<Customer>                    customer,
+    optional<std::vector<ActivationData>> activated_machines,
+    optional<int>                         maxnoofmachines,
+    optional<std::string>                 allowed_machines,
+    optional<std::vector<DataObject>>     data_objects
+  );
+
+#if 1
   static optional<LicenseKeyInformation> make(basic_Error & e, RawLicenseKey const& raw_license_key);
   static optional<LicenseKeyInformation> make(basic_Error & e, optional<RawLicenseKey> const& raw_license_key);
   static optional<LicenseKeyInformation> make_unsafe(basic_Error & e, std::string const& license_key);
+#endif
 
   LicenseKeyChecker check() const;
 

include/cryptolens/RawLicenseKey.hpp

@@ -36,12 +36,11 @@ class RawLicenseKey {
   std::string signature_;
   std::string license_;
 public:
-  // TODO: Move methods
-  std::string const& get_base64_license() const { return base64_license_; }
+  std::string const& get_base64_license() const;
 
-  std::string const& get_signature() const { return signature_; }
+  std::string const& get_signature() const;
 
-  std::string const& get_license() const { return license_; }
+  std::string const& get_license() const;
 
   template<typename SignatureVerifier>
   static

include/cryptolens/RequestHandler_WinHTTP.hpp

@@ -94,7 +94,7 @@ namespace v20180502 {
 
 namespace errors {
 
-//XXX: Add stuff here
+namespace RequestHandler_WinHTTP = ::cryptolens_io::v20190401::errors::RequestHandler_WinHTTP;
 
 } // namespace errors
 

include/cryptolens/RequestHandler_v20190401_to_v20180502.hpp

@@ -38,7 +38,7 @@ RequestHandler_v20190401_to_v20180502<RequestHandler>::make_request(::cryptolens
 
   if (e) { return ""; }
   if (e_) {
-    e.set(api::main(), errors::Subsystem::RequestHandler);  // XXX: Add stuff here
+    e.set(api::main(), errors::Subsystem::RequestHandler);  // TODO: Add more detailed error code
     return "";
   }
 

include/cryptolens/ResponseParser_ArduinoJson5.hpp

@@ -1,14 +1,32 @@
 #pragma once
 
+#include "imports/std/optional"
+
+#include <utility>
+
 #include "basic_Error.hpp"
+#include "LicenseKeyInformation.hpp"
+#include "RawLicenseKey.hpp"
 
 namespace cryptolens_io {
 
 namespace v20190401 {
 
 class ResponseParser_ArduinoJson5 {
+/*
+ * Note the API of this class is not considered stable. Please contact us if you would like to create
+ * a custom ResponseParser.
+ */
 public:
   ResponseParser_ArduinoJson5(basic_Error & e) {}
+
+  optional<LicenseKeyInformation> make_license_key_information(basic_Error & e, RawLicenseKey const& raw_license_key) const;
+  optional<LicenseKeyInformation> make_license_key_information(basic_Error & e, optional<RawLicenseKey> const& raw_license_key) const;
+  optional<LicenseKeyInformation> make_license_key_information_unsafe(basic_Error & e, std::string const& license_key) const;
+
+  optional<std::pair<std::string, std::string>> parse_activate_response(basic_Error & e, std::string const& server_response) const;
+  std::string parse_create_trial_key_response(basic_Error & e, std::string const& server_response) const;
+  std::string parse_last_message_response(basic_Error & e, std::string const& server_response) const;
 };
 
 } // namespace latest

include/cryptolens/api.hpp

@@ -10,6 +10,12 @@ struct main { };
 
 struct experimental_v1 { };
 
+namespace internal {
+
+struct main { };
+
+}  // namespace internal
+
 } // namespace api
 
 } // namespace v20190401