adamantite 0.0.13 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6e6f271bc9d8fe8008bd42b52607ee735866937a483340d13b5c999c4e8caf3
-  data.tar.gz: 913b2831ff46ea1252f39c83ec79cd1594328c0e1bcb17ecd08fc8bca72ce795
+  metadata.gz: 4e83c51afbacf3138c9ebb70e6fceaa34dafce0431244dda651bf5f495722499
+  data.tar.gz: 24057e87f13dfca8d695353212fb939fba26a28d0d8229edb15d1dbf779d7413
 SHA512:
-  metadata.gz: e796b12ba43cba3a972533835162adc42d6937fdd2435436e0b636739eeda0dade7588f15ca811c173461507770855e493829d1ff13b6f9ed7627b79bcd20786
-  data.tar.gz: fb5b93107b2f420a5a6630b62d7ac83735f2938519fcf8e0d2442bad3badff750e99b9526ea5746ade73edc857766b3b0d1c870eb9124943c22d137ea0b3b754
+  metadata.gz: cfaedbbecb1aff0602a7955e7e9412331bf71511893c6bdadc0a313170a90a09f09915a442f44ce2def6535ad62f620f5ec130c1f5c23c527286e4163fb5ad1c
+  data.tar.gz: 0556f018b804eb1ac56dad36eaf2f1900147dcaaa26b83e974e9e686f50691870804efd4631ea31ca8e2cacd202361cd0ff4d9bf438c9098b6365bc6f7c54169

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, :vault
 
       OPSLIMIT = 2**20
       MEMLIMIT = 2**24
@@ -37,7 +37,7 @@ module Adamantite
             @master_password_salt = master_password_salt
             @vault = rbnacl_box(@master_vault_key)
             update_stored_passwords!
-            read_license_key! if has_license_key?
+            read_license_key!
             true
           rescue RbNaCl::CryptoError
             false
@@ -50,23 +50,13 @@ 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
-          write_to_file(password_file('master_license_key'), @vault.encrypt(@master_license_key), true)
+          write_master_license_key
+          @master_license_tier = license_tier(res)
+          write_master_license_tier
           true
         end
         licensed?
@@ -138,6 +128,8 @@ module Adamantite
           end
           FileUtils.remove_entry_secure(pwmanager_tmp_dir)
           write_master_info(new_master_password_salt, encrypted_vault_key)
+          write_master_license_key
+          write_master_license_tier
           @master_password_salt = master_password_salt
           @master_encrypted_vault_key = encrypted_vault_key
           true
@@ -188,10 +180,41 @@ module Adamantite
         write_to_file(password_file('master_encrypted_vault_key'), master_vault_key, true)
       end
 
+      def write_master_license_key
+        write_to_file(password_file('master_license_key'), @vault.encrypt(@master_license_key), true)
+      end
+
+      def write_master_license_tier
+        write_to_file(password_file('master_license_tier'), @vault.encrypt(@master_license_tier), true)
+      end
+
       def read_license_key!
-        return unless authenticated?
+        return unless authenticated? && has_license_key?
 
         @master_license_key = @vault.decrypt(get_license_key)
+        @master_license_tier = @vault.decrypt(get_license_tier)
+      end
+
+      def get_license_info(license_key)
+        license_key = license_key.nil? ? @master_license_key : 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
+
+      def license_tier(keygen_response)
+        free_tier = keygen_response['data']['attributes']['name'] == 'Adamantite Free'
+        free_tier ? 'free' : 'paid'
       end
     end
   end

data/lib/file_utils/adamantite_file_utils.rb

@@ -96,10 +96,14 @@ module Adamantite
 			File.open(pw_file('master_license_key'), 'rb', &:read)
 		end
 
+    def get_license_tier
+      File.open(pw_file('master_license_tier'), 'rb', &:read)
+    end
+
     def get_stored_pws
       excluded_filenames = [
         '.', '..', 'master_password_hash', 'master_password_salt', 'master_encrypted_vault_key',
-        'master_license_key'
+        'master_license_key', 'master_license_tier'
       ]
       Dir.entries(pwmanager_dir).filter { |f| !excluded_filenames.include?(f) }
     end
@@ -109,7 +113,7 @@ module Adamantite
     end
 
 		def has_license_key?
-			pw_file_exists?('master_license_key')
+			pw_file_exists?('master_license_key') && pw_file_exists?('master_license_tier')
 		end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adamantite
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.15
 platform: ruby
 authors:
 - Jake Bruemmer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-19 00:00:00.000000000 Z
+date: 2023-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer-dsl-libui