Add support for GetKey

Author: artemlos

.idea/artifacts/cryptolens_java_jar.xml .idea/artifacts/cryptolens_jar.xml.idea/artifacts/cryptolens_java_jar.xml renamed to .idea/artifacts/cryptolens_jar.xml

@@ -4,7 +4,7 @@
   <groupId>io.cryptolens</groupId>
   <artifactId>cryptolens</artifactId>
   <packaging>jar</packaging>
-  <version>1.5</version>
+  <version>1.7-STABLE</version>
   <name>cryptolens</name>
   <description>A client api to access Cryptolens Licensing API.</description>
   <url>https://github.com/cryptolens/cryptolens-java</url>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>com.github.oshi</groupId>
       <artifactId>oshi-core</artifactId>
-      <version>LATEST</version>
+      <version>5.3.1</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>

pom.xml

@@ -45,7 +45,7 @@ public static LicenseKey Activate (String token, String RSAPubKey, ActivateModel
     }
 
     /**
-     * Calls the Activate method (https://app.cryptolens.io/docs/api/v3/Activate).
+     * Calls the Activate method (https://app.cryptolens.io/docs/api/v3/Activate?modelVersion=3).
      * <p>This method allows you to retrieve the error message from the Web API.</p>
      * <p>
      *     To retrieve the error message, you need to initialize an APIError object and pass it in into the
@@ -94,6 +94,36 @@ public static LicenseKey Activate (String token, String RSAPubKey, ActivateModel
         return LicenseKey.LoadFromString(RSAPubKey, result.RawResponse);
     }
 
+    public static LicenseKey GetKey (String token, String RSAPubKey, GetKeyModel model, APIError error) {
+
+        Map<String,String> extraParams = new HashMap<>();
+
+        // force sign and the new protocol (only in activate)
+        // modelVersion=3 docs: https://app.cryptolens.io/docs/api/v3/Activate?modelVersion=3
+        extraParams.put("Sign", "true");
+        extraParams.put("SignMethod", "1");
+        extraParams.put("token", token);
+        extraParams.put("ModelVersion", "3");
+
+        ActivateResult result = HelperMethods.SendRequestToWebAPI("key/getkey", model, extraParams, ActivateResult.class, error);
+
+        if(result == null || result.result == 1) {
+            if(result != null) {
+                if (error != null) {
+                    error.message = result.message;
+                    error.errorType = ErrorType.WebAPIError;
+                }
+            } else {
+                if (error != null) {
+                    error.errorType = ErrorType.WebAPIError;
+                }
+            }
+            return null;
+        }
+
+        return LicenseKey.LoadFromString(RSAPubKey, result.RawResponse);
+    }
+
     /**
      * This method will 'undo' a key activation with a certain machine code.
      * The key should not be blocked, since otherwise this method will throw an error.

src/main/java/io/cryptolens/methods/Key.java

@@ -0,0 +1,52 @@
+package io.cryptolens.models;
+
+/**
+ * The parameters that are used when calling the Key.GetKey method.
+ */
+
+public class GetKeyModel {
+    /**
+     * The product id, which can be found on the product page.
+     */
+    public int ProductId;
+
+    /**
+     * The Key string, eg. AAAA-BBBB-CCCC-DDDD.
+     */
+    public String Key;
+
+    /**
+     * An integer that allows you to restrict the information returned in the license key data object.
+     * Please read https://app.cryptolens.io/docs/api/v3/Activate#remarks for more details.
+     */
+    public int FieldsToReturn;
+
+    /**
+     * Includes additional information about the license key, such as number of activated devices, etc.
+     */
+    public boolean Metadata;
+
+    /**
+     * Allows you specify the floatingTimeInterval. The current version of the SDK uses a modelVersion=3,
+     * which means that all activated devices (node-locked and floating) will be returned in ActivatedMachines,
+     * independent of the floatingTimeInterval value. This value is only taken into account in the additional
+     * metadata that is returned (if Metadata=true). In most use cases, this parameter does not need to be used.
+     */
+    public int FloatingTimeInterval;
+
+    public GetKeyModel() {
+
+    }
+
+    public GetKeyModel(int productId, String key) {
+        ProductId = productId;
+        Key = key;
+    }
+
+    public GetKeyModel(int productId, String key, int floatingTimeInterval, boolean metadata) {
+        ProductId = productId;
+        Key = key;
+        FloatingTimeInterval = floatingTimeInterval;
+        Metadata = metadata;
+    }
+}