adamantite 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6e6f271bc9d8fe8008bd42b52607ee735866937a483340d13b5c999c4e8caf3
-  data.tar.gz: 913b2831ff46ea1252f39c83ec79cd1594328c0e1bcb17ecd08fc8bca72ce795
+  metadata.gz: 9f7cf1f6c53600d5d0c68d944098a7a98d3ae2715ed7aa48f54df72516c3722b
+  data.tar.gz: df595ee6fba2497f98ce2ac8446133207475861e6ea9681992e6e36f6b125fb8
 SHA512:
-  metadata.gz: e796b12ba43cba3a972533835162adc42d6937fdd2435436e0b636739eeda0dade7588f15ca811c173461507770855e493829d1ff13b6f9ed7627b79bcd20786
-  data.tar.gz: fb5b93107b2f420a5a6630b62d7ac83735f2938519fcf8e0d2442bad3badff750e99b9526ea5746ade73edc857766b3b0d1c870eb9124943c22d137ea0b3b754
+  metadata.gz: 52b8593789453bbbcfa7a5fc9e75a166a0da8e14dbb6f639d08d5438b8acd7a977f7ca1929245f2a0ad5a31f7c10462f7d1b4f76b46bf551053c91c23a257eb9
+  data.tar.gz: 897783faaf123f26f8076b7cd25deb1c37e41138f53b0e660252077e433e22dcaae75d0487d4deccdffcf571cc7b79f3bf74278c7157f1bd8f34a2b20b493070

data/lib/adamantite.rb

@@ -147,8 +147,11 @@ module Adamantite
             end
             horizontal_box do
               stretchy false
-
-              label('This is valid Adamantite installation.')
+              free_or_paid = @adamantite.free_tier ? 'free' : 'paid'
+              label_text = <<-TEXT
+                This is valid Adamantite installation on a #{free_or_paid} license.
+              TEXT
+              label(label_text)
             end
           end
         else

data/lib/base/adamantite.rb

@@ -12,7 +12,7 @@ module Adamantite
       include AdamantiteFileUtils
 
       attr_reader :authenticated, :master_password, :master_password_salt, :stored_passwords,
-                  :master_license_key
+                  :master_license_key, :free_tier
 
       OPSLIMIT = 2**20
       MEMLIMIT = 2**24
@@ -50,22 +50,11 @@ module Adamantite
       def activate_license!(master_license_key)
         return unless authenticated?
 
-        headers = {
-          'Content-Type': 'application/vnd.api+json',
-          'Accept': 'application/vnd.api+json'
-        }
-        body = {
-          'meta': {
-            'key': master_license_key,
-            'scope': {
-              'product': 'bb6542ab-7d74-44d0-b4f5-1fbc39cdeb99'
-            }
-          }
-        }
-        res = HTTParty.post(LICENSE_ACTIVATION_URL, headers: headers, body: body.to_json)
+        res = get_license_info(master_license_key)
 
         if res['meta']['valid']
           @master_license_key = master_license_key
+          @free_tier = res['data']['attributes']['name'] == 'Adamantite Free'
           write_to_file(password_file('master_license_key'), @vault.encrypt(@master_license_key), true)
           true
         end
@@ -192,6 +181,24 @@ module Adamantite
         return unless authenticated?
 
         @master_license_key = @vault.decrypt(get_license_key)
+        res = get_license_info(@master_license_key)
+        @free_tier = res['data']['attributes']['name'] == 'Adamantite Free'
+      end
+
+      def get_license_info(license_key)
+        headers = {
+          'Content-Type': 'application/vnd.api+json',
+          'Accept': 'application/vnd.api+json'
+        }
+        body = {
+          'meta': {
+            'key': license_key,
+            'scope': {
+              'product': 'bb6542ab-7d74-44d0-b4f5-1fbc39cdeb99'
+            }
+          }
+        }
+        HTTParty.post(LICENSE_ACTIVATION_URL, headers: headers, body: body.to_json)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adamantite
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Jake Bruemmer