adamantite 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f7cf1f6c53600d5d0c68d944098a7a98d3ae2715ed7aa48f54df72516c3722b
-  data.tar.gz: df595ee6fba2497f98ce2ac8446133207475861e6ea9681992e6e36f6b125fb8
+  metadata.gz: 4e83c51afbacf3138c9ebb70e6fceaa34dafce0431244dda651bf5f495722499
+  data.tar.gz: 24057e87f13dfca8d695353212fb939fba26a28d0d8229edb15d1dbf779d7413
 SHA512:
-  metadata.gz: 52b8593789453bbbcfa7a5fc9e75a166a0da8e14dbb6f639d08d5438b8acd7a977f7ca1929245f2a0ad5a31f7c10462f7d1b4f76b46bf551053c91c23a257eb9
-  data.tar.gz: 897783faaf123f26f8076b7cd25deb1c37e41138f53b0e660252077e433e22dcaae75d0487d4deccdffcf571cc7b79f3bf74278c7157f1bd8f34a2b20b493070
+  metadata.gz: cfaedbbecb1aff0602a7955e7e9412331bf71511893c6bdadc0a313170a90a09f09915a442f44ce2def6535ad62f620f5ec130c1f5c23c527286e4163fb5ad1c
+  data.tar.gz: 0556f018b804eb1ac56dad36eaf2f1900147dcaaa26b83e974e9e686f50691870804efd4631ea31ca8e2cacd202361cd0ff4d9bf438c9098b6365bc6f7c54169

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, :free_tier
+                  :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
@@ -54,8 +54,9 @@ module Adamantite
 
         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)
+          write_master_license_key
+          @master_license_tier = license_tier(res)
+          write_master_license_tier
           true
         end
         licensed?
@@ -127,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
@@ -177,15 +180,23 @@ 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)
-        res = get_license_info(@master_license_key)
-        @free_tier = res['data']['attributes']['name'] == 'Adamantite Free'
+        @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'
@@ -200,6 +211,11 @@ module Adamantite
         }
         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
 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.14
+  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