ims-lti 2.0.0.beta.41 → 2.1.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe29bdb1f765a0a3bf91d6268d275f3f84a5d402
-  data.tar.gz: 8051d34738fcec8d0a10902492fa8f0621ab0e82
+  metadata.gz: 29e9c5e5a1a93a572ef8c13b58070c2a346cc9b0
+  data.tar.gz: b8e314b9ce9a1be4370c2bc664636093c774aa3d
 SHA512:
-  metadata.gz: bb0eaa36739ed561812ebb7dd2d715a39ee3bb4e19d6e3bf886ee572ab22502d50898e06784b34580766678e9d6da9c9431eecf522a6f94b8fb405eb2c367cd9
-  data.tar.gz: 8848464d689ddf0267561efc1f6c31c4bb6107018833697dc27d72b0b76cdb4c7e4f164286b165f5916d70e7db0dc516288282e45643ab2166907f7e6177c55f
+  metadata.gz: c1395db97d9522e4db6f47abcc4f78898be410ff37d0254162cbb4c3012c16b02a94961adc57233c6d6310dbd9ee47cbd2cd6cf6b2439d18a0fbc9385bb43407
+  data.tar.gz: 6e50211103d46cad1ea94365c1e34848cb54b2bb97768807c959fda2270c02b929b45cc307781c4126630d9c4710d3b2860859d4475ba74bf5981bbacb8ff66f

data/lib/ims/lti/models/messages/message.rb

@@ -1,7 +1,7 @@
 module IMS::LTI::Models::Messages
   class Message
 
-    attr_reader :simple_oauth_header
+    attr_reader :message_authenticator
 
     class << self
 
@@ -126,23 +126,9 @@ module IMS::LTI::Models::Messages
     end
 
     def signed_post_params(secret)
-      params = post_params
-      @simple_oauth_header = SimpleOAuth::Header.new(:post, launch_url, params, consumer_key: oauth_consumer_key, consumer_secret: secret, callback: 'about:blank')
-      @simple_oauth_header.signed_attributes.merge(params)
-    end
-
-    def valid_signature?(secret)
-      params = collect_attributes(OAUTH_KEYS)
-      params = OAUTH_KEYS.inject({}) do |hash, k|
-        value = instance_variable_get("@#{k}")
-        hash[k] = value if value
-        hash
-      end
-      options, parsed_params = parse_params(params.merge(post_params))
-      signature = parsed_params.delete(:oauth_signature)
-      consumer_key = oauth_consumer_key
-      @simple_oauth_header = SimpleOAuth::Header.new(:post, launch_url, parsed_params, options.merge({consumer_key: consumer_key, consumer_secret: secret}))
-      @simple_oauth_header.valid?(signature: signature)
+      message_params = { oauth_consumer_key: oauth_consumer_key}.merge(post_params)
+      @message_authenticator = IMS::LTI::Services::MessageAuthenticator.new(launch_url, message_params, secret )
+      @message_authenticator.signed_params
     end
 
     def parameters
@@ -181,18 +167,6 @@ module IMS::LTI::Models::Messages
 
     private
 
-    def parse_params(params)
-      params.inject([{}, {}]) do |array, (k, v)|
-        attr = k.to_s.sub('oauth_', '').to_sym
-        if SimpleOAuth::Header::ATTRIBUTE_KEYS.include?(attr)
-          array[0][attr] = v
-        else
-          array[1][k] = v
-        end
-        array
-      end
-    end
-
     def collect_attributes(attributes)
       attributes.inject({}) do |h, param|
         value = instance_variable_get("@#{param}")

data/lib/ims/lti/services.rb

@@ -3,5 +3,6 @@ module IMS::LTI
     require_relative 'services/tool_proxy_registration_service'
     require_relative 'services/tool_config'
     require_relative 'services/tool_proxy_validator'
+    require_relative 'services/message_authenticator'
   end
 end

data/lib/ims/lti/services/message_authenticator.rb

@@ -0,0 +1,67 @@
+module IMS::LTI::Services
+  class MessageAuthenticator
+
+    attr_reader :launch_url, :params, :message, :simple_oauth_header, :signature, :consumer_key
+
+    def initialize(launch_url, params, secret)
+      @launch_url = launch_url
+      @params = params
+      @consumer_key = params[:oauth_consumer_key]
+      @options, @parsed_params = parse_params(params)
+      @signature = @parsed_params.delete(:oauth_signature)
+      @secret = secret
+    end
+
+
+    def valid_signature?
+      simple_oauth_header.valid?(signature: signature)
+    end
+
+    def message
+      @message ||= begin
+        m = IMS::LTI::Models::Messages::Message.generate(params)
+        m.launch_url = launch_url
+        m
+      end
+    end
+
+    def simple_oauth_header
+      @simple_oauth_header ||= begin
+        @simple_oauth_header = SimpleOAuth::Header.new(
+          :post, launch_url,
+          @parsed_params,
+          @options.merge(
+            {
+              consumer_key: consumer_key,
+              consumer_secret: @secret
+            }
+          )
+        )
+        @simple_oauth_header
+      end
+    end
+
+    def base_string
+      simple_oauth_header.send(:signature_base)
+    end
+
+    def signed_params
+      simple_oauth_header.signed_attributes.merge(params)
+    end
+
+
+    private
+    def parse_params(params)
+      params.inject([{}, {}]) do |array, (k, v)|
+        attr = k.to_s.sub('oauth_', '').to_sym
+        if SimpleOAuth::Header::ATTRIBUTE_KEYS.include?(attr)
+          array[0][attr] = v
+        else
+          array[1][k] = v
+        end
+        array
+      end
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ims-lti
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.41
+  version: 2.1.0.beta.1
 platform: ruby
 authors:
 - Instructure
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_oauth
@@ -258,6 +258,7 @@ files:
 - lib/ims/lti/serializers/membership_service/page_serializer.rb
 - lib/ims/lti/serializers/membership_service/person_serializer.rb
 - lib/ims/lti/services.rb
+- lib/ims/lti/services/message_authenticator.rb
 - lib/ims/lti/services/tool_config.rb
 - lib/ims/lti/services/tool_proxy_registration_service.rb
 - lib/ims/lti/services/tool_proxy_validator.rb