selfsdk 0.0.140 → 0.0.141

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 031a8f44592664c22d59c7c1105822ab9111dde46ffda50ba34b6116d70d4a3f
-  data.tar.gz: e2096831cb8f8d5bcba45fabf93a5173fac96f06ec933b6f6d446d1ed55f015a
+  metadata.gz: 1fc84c8ad47b159c7f07f33226c1273bf30202f3b999ceba02ef51f6b35763fb
+  data.tar.gz: 4c88fbad5ffa05cc69977554d454ca7fcc796663400f2e74b770879afe05c2a7
 SHA512:
-  metadata.gz: 368a7cdacf1df7204473e6488e299e06e40b6caacc332c366ca039fea96930186e4888e007a333e99a6693d9b6ae18d13b4ae339f7d2cd988a1c412826bfce47
-  data.tar.gz: bc484da9425cc8e9f3b4d7e7af132f15395b1966109636e941ff3b5592ace7d914b65f338de4287de96e8d1d92dac03d5555667f1e146311a4965975b3154888
+  metadata.gz: c5f9b8cf446fb87a089d2094449691cd73806af84ce5d3f712a0357a0bdc5c4b2f7fef0dd6552591d56c4c5dd07fcaadcad02173b67b500f07ae80aec519fc2f
+  data.tar.gz: ee291b8ca0f22787067ae2edca5a59fee3fea4950a06cfd921c00c9d283d7c769cefeac7dd8bcee0bd2eeee7784fab307a52919d81f87942b8c8ccd4eff6d045

data/lib/crypto.rb

@@ -8,9 +8,9 @@ module SelfSDK
       @storage_key = storage_key
       @storage_folder = storage_folder
 
-      if File.exist?('account.pickle')
+      if File.exist?(account_path)
         # 1a) if alice's account file exists load the pickle from the file
-        @account = SelfCrypto::Account.from_pickle(File.read('account.pickle'), @storage_key)
+        @account = SelfCrypto::Account.from_pickle(File.read(account_path), @storage_key)
       else
         # 1b-i) if create a new account for alice if one doesn't exist already
         @account = SelfCrypto::Account.from_seed(@client.jwt.key)
@@ -25,12 +25,12 @@ module SelfSDK
         @client.post("/v1/apps/#{@client.jwt.id}/devices/#{@device}/pre_keys", keys)
 
         # 1b-v) store the account to a file
-        File.write('account.pickle', @account.to_pickle(storage_key))
+        File.write(account_path, @account.to_pickle(storage_key))
       end
     end
 
     def encrypt(message, recipient, recipient_device)
-      session_file_name = "#{recipient}:#{recipient_device}-session.pickle"
+      session_file_name = session_path(recipient, recipient_device)
 
       if File.exist?(session_file_name)
         # 2a) if bob's session file exists load the pickle from the file
@@ -71,7 +71,7 @@ module SelfSDK
     end
 
     def decrypt(message, sender, sender_device)
-      session_file_name = "#{sender}:#{sender_device}-session.pickle"
+      session_file_name = session_path(sender, sender_device)
 
       if File.exist?(session_file_name)
         # 7a) if carol's session file exists load the pickle from the file
@@ -98,5 +98,15 @@ module SelfSDK
       # 10) decrypt the message ciphertext
       gs.decrypt("#{sender}:#{sender_device}", message).to_s
     end
+
+    private
+
+    def account_path
+      "#{@storage_folder}/account.pickle"
+    end
+
+    def session_path(selfid, device)
+      "#{@storage_folder}/#{selfid}:#{device}-session.pickle"
+    end
   end
 end

data/lib/messaging.rb

@@ -30,7 +30,7 @@ module SelfSDK
     # @params storage_folder [String] folder to perist messaging encryption
     # @option opts [Bool] :auto_reconnect Automatically reconnects to websocket if connection is lost (defaults to true).
     # @option opts [String] :device_id The device id to be used by the app defaults to "1".
-    def initialize(url, client, storage_key, storage_folder, options = {})
+    def initialize(url, client, storage_key, options = {})
       @mon = Monitor.new
       @url = url
       @messages = {}
@@ -49,7 +49,7 @@ module SelfSDK
 
       FileUtils.mkdir_p @storage_dir unless File.exist? @storage_dir
       unless options.include? :no_crypto
-        @encryption_client = Crypto.new(@client, @device_id, storage_folder, storage_key)
+        @encryption_client = Crypto.new(@client, @device_id, @storage_dir, storage_key)
       end
 
       if options.include? :ws

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selfsdk
 version: !ruby/object:Gem::Version
-  version: 0.0.140
+  version: 0.0.141
 platform: ruby
 authors:
 - Aldgate Ventures