selfsdk 0.0.159 → 0.0.164

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a1de83ae25387f6180432dd419f36568956a458bdbfd5df988ea9292588e50a
-  data.tar.gz: 55717411b03f983659ee503493a233d3ceea14f35fd991eec9494a6bc01fe9b2
+  metadata.gz: 37a0711ed0feb251165f49fcfdce3573cb3845dea3e02263395baada7af5d0f6
+  data.tar.gz: dd281cf75f58dc8ff14e22a8e71e32b400aa78a7ea806038a33c9cb8d9bf61ac
 SHA512:
-  metadata.gz: 291ba0d883273e9aa94eb61aa936014a1fd4a6031c9e921d0affc5da4064c39a4cc5b073bb68823ae73d53a33c2808f9cb4921eeac0e043308715d8eb37b9239
-  data.tar.gz: d73be5eb6086614300de7469026715881b640ea51fd9e9e5d8054a7b9c387b9d67f3cb21e72f358ff899833176bf9bb38962832405dd68461fc489e8d217d345
+  metadata.gz: 81ce8dcd9ebdbccfd0991b0479ddba10d46806588d660a4c7ace4f76cc534d62c7c3ef3074060989504b11a7876c51e66bb5ec780ddce889d780750cc5724e85
+  data.tar.gz: 296412709b0ad51d9e4ee748d2116f07f940168aa00c7ad9494ff432fca532f81e7c996e833641c36417f94a319a82d012fa49665eb8b7f2e651b39419ba77b5

data/lib/messages/authentication_message.rb

@@ -9,7 +9,7 @@ module SelfSDK
   module Messages
     class AuthenticationMessage < Base
 
-      def parse(input, original=nil)
+      def parse(input, envelope=nil)
         @input = input
         @typ = @typ
         @payload = get_payload input
@@ -21,6 +21,10 @@ module SelfSDK
         @expires = ::Time.parse(payload[:exp])
         @issued = ::Time.parse(payload[:iat])
         @status = payload[:status]
+        if envelope
+          issuer = envelope.sender.split(":")
+          @from_device = issuer.last
+        end
       end
     end
   end

data/lib/messages/base.rb

@@ -27,10 +27,12 @@ module SelfSDK
         res
       end
 
-      def send_message
+      def send_message(device_id = nil)
         check_credits!
+        dds = devices
+        dds = [device_id] if device_id
         res = []
-        devices.each do |d|
+        dds.each do |d|
           res << @messaging.send_message(proto(d))
           SelfSDK.logger.info "asynchronously requested information to #{@to}:#{d}"
         end

data/lib/messages/fact_request.rb

@@ -39,17 +39,23 @@ module SelfSDK
                         end
       end
 
-      def parse(input)
+      def parse(input, envelope=nil)
         @input = input
         @typ = MSG_TYPE
         @payload = get_payload input
         @id = @payload[:cid]
         @from = @payload[:iss]
         @to = @payload[:sub]
+        @audience = payload[:aud]
         @expires = @payload[:exp]
         @description = @payload.include?(:description) ? @payload[:description] : nil
         @facts = @payload[:facts]
         @options = @payload[:options]
+
+        if envelope
+          issuer = envelope.sender.split(":")
+          @from_device = issuer.last
+        end
       end
 
       def build_response
@@ -57,9 +63,8 @@ module SelfSDK
         m.id = @id
         m.from = @to
         m.to = @from
+        m.sub = @to
         m.audience = @from
-        m.to_device = @messaging.device_id
-        m.from_device = @to_device
         m.facts = @facts
         m
       end

data/lib/messages/fact_response.rb

@@ -13,7 +13,7 @@ module SelfSDK
 
       attr_accessor :facts, :audience
 
-      def parse(input)
+      def parse(input, envelope=nil)
         @input = input
         @typ = MSG_TYPE
         @payload = get_payload input
@@ -35,6 +35,10 @@ module SelfSDK
             SelfSDK.logger.info e.message
           end
         end
+        if envelope
+          issuer = envelope.sender.split(":")
+          @from_device = issuer.last
+        end
       end
 
       def fact(name)
@@ -60,15 +64,13 @@ module SelfSDK
         end
       end
 
-      protected
-
-      def proto(to_device)
+      def body
         encoded_facts = []
         @facts.each do |fact|
           encoded_facts.push(fact.to_hash)
         end
-        body = @jwt.prepare(
-          typ: MSG_TYPE,
+        
+        { typ: MSG_TYPE,
           iss: @jwt.id,
           sub: @sub || @to,
           aud: @audience,
@@ -77,15 +79,19 @@ module SelfSDK
           cid: @id,
           jti: SecureRandom.uuid,
           status: @status,
-          facts: encoded_facts,
-        )
+          facts: encoded_facts }        
+      end
+
+      protected
 
+      def proto(to_device)
+        @to_device = to_device
         Msgproto::Message.new(
           type: Msgproto::MsgType::MSG,
           id: SecureRandom.uuid,
           sender: "#{@jwt.id}:#{@messaging.device_id}",
           recipient: "#{@to}:#{@to_device}",
-          ciphertext: encrypt_message(body, @to, @to_device)
+          ciphertext: encrypt_message(@jwt.prepare(body), @to, @to_device)
         )
       end
     end

data/lib/messages/message.rb

@@ -10,11 +10,13 @@ require_relative "authentication_req"
 module SelfSDK
   module Messages
     def self.parse(input, messaging, original=nil)
+      envelope = nil
       body = if input.is_a? String
-               input
+                input
              else
-               issuer = input.sender.split(":")
-               messaging.encryption_client.decrypt(input.ciphertext, issuer.first, issuer.last)
+                envelope = input
+                issuer = input.sender.split(":")
+                messaging.encryption_client.decrypt(input.ciphertext, issuer.first, issuer.last)
              end
 
       jwt = JSON.parse(body, symbolize_names: true)
@@ -23,16 +25,16 @@ module SelfSDK
       case payload[:typ]
       when "identities.facts.query.req"
         m = FactRequest.new(messaging)
-        m.parse(body)
+        m.parse(body, envelope)
       when "identities.facts.query.resp"
         m = FactResponse.new(messaging)
-        m.parse(body)
+        m.parse(body, envelope)
       when "identities.authenticate.resp"
         m = AuthenticationResp.new(messaging)
-        m.parse(body)
+        m.parse(body, envelope)
       when "identities.authenticate.req"
         m = AuthenticationReq.new(messaging)
-        m.parse(body)
+        m.parse(body, envelope)
       else
         raise StandardError.new("Invalid message type.")
       end

metadata

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