senkyoshi 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 734aa6a4182cbe1cc084141e348a86de31e79e8f
-  data.tar.gz: da8a96c3f60cd2b8afd6bde2633336db2838facf
+  metadata.gz: 6380890b182d57c03008d4c6893a0e7e319b4ad5
+  data.tar.gz: 1b9ed95c67cfd8f5f1e6ded91ad0c3af0ee98680
 SHA512:
-  metadata.gz: 9c53c165560b8b087b256eadecb60b0f0106c3987532ba845155b1fcd905ef0db32f6fd0bd93e9e6bf869867f40d7961916f501047aa182db93372e3716175ed
-  data.tar.gz: 90efec004135f970851a3a9c3e8c8d893bcf6930b3111811500302ec22f7be2706ddbfd54b616d45e97a349e1710948bef12097350fe7fb49bc6951ec7d6e7e5
+  metadata.gz: 9b2a316951726bd6ddfd757b2152990505ca298c96ed34a42f73f78276deca27fb83ea9b345d4e174caa67208e3d69f59b88a695c7247c6b2ce7f847e967c59f
+  data.tar.gz: cbe0c05994c6ed39aee696488d3fd868ef5f6af9d474ca908e645ba073ed74c98bca0fa402a5e945f941afe32a12a7eeb431439950d6840c6398470280181400

data/README.md

@@ -71,9 +71,11 @@ Create a `senkyoshi.yml` and add credentials:
 # Adhesion, it would just be `scorm`.
 :scorm_oauth_consumer_key: <scorm oauth consumer key>
 
-# This is the secret to authenticate requests to the SCORM manager. In the case
-# of Adhesion, you can generate a shared secret by logging into the server and
-# running rake shared_auth, which will generate and save a token
+# This is the shared id for the jwt aud. In the case of Adhesion it
+# will be `adhesion`.
+:scorm_shared_id: <scorm shared id>
+
+# This is the secret used to create a jwt to communicate with the SCORM manager.
 :scorm_shared_auth: <scorm manager token>
 
 # The number of seconds before uploads timeout. Defaults to 1800 (30 minutes)

data/lib/auth_token.rb

@@ -0,0 +1,28 @@
+require "jwt"
+
+module AuthToken
+
+  # More information on jwt available at
+  # http://self-issued.info/docs/draft-ietf-oauth-json-web-token.html#rfc.section.4.1.6
+  def self.issue_token(
+    payload = {},
+    exp = (Time.now + 86400),
+    secret = nil,
+    aud = nil
+  )
+    config = Senkyoshi.configuration
+    payload["iat"] = Time.now.to_i # issued at claim
+    payload["exp"] = exp.to_i # Default expiration set to 24 hours.
+    payload["aud"] = aud || config.scorm_shared_id
+    JWT.encode(
+      payload,
+      secret || config.scorm_shared_auth,
+      "HS512",
+    )
+  end
+
+  def self.valid?(token, secret = nil)
+    config = Senkyoshi.configuration
+    JWT.decode(token, secret || config.scorm_shared_auth)
+  end
+end

data/lib/senkyoshi/canvas_course.rb

@@ -16,6 +16,7 @@
 require "pandarus"
 require "senkyoshi/models/scorm_package"
 require "rest-client"
+require "auth_token"
 
 module Senkyoshi
   ##
@@ -134,11 +135,39 @@ module Senkyoshi
         assignment__points_possible__: scorm_package["points_possible"],
       }
 
-      CanvasCourse.client.create_assignment(
+      lms_assignment = CanvasCourse.client.create_assignment(
         course_id,
         scorm_package["title"],
         payload,
       )
+
+      lms_assignment_id = lms_assignment["id"]
+      points_possible = lms_assignment["points_possible"]
+      update_scorm_package(
+        scorm_package["package_id"],
+        lms_assignment_id,
+        points_possible,
+      )
+    end
+
+    ##
+    # Updates scorm manager with lms data for scorm course
+    ##
+    def update_scorm_package(package_id, lms_assignment_id, points_possible)
+      config = Senkyoshi.configuration
+      url = "#{config.scorm_url}/api/scorm_courses/#{package_id}"
+      RestClient.put(
+        url,
+        {
+          oauth_consumer_key: config.scorm_oauth_consumer_key,
+          shared_auth: true,
+          scorm_course: {
+            lms_assignment_id: lms_assignment_id,
+            points_possible: points_possible,
+          },
+        },
+        Authorization: "Bearer #{AuthToken.issue_token}",
+      )
     end
 
     ##
@@ -148,19 +177,23 @@ module Senkyoshi
     def upload_scorm_package(scorm_package, course_id, tmp_name)
       zip = scorm_package.write_zip tmp_name
       config = Senkyoshi.configuration
+      url = "#{config.scorm_url}/api/scorm_courses"
       File.open(zip, "rb") do |file|
         RestClient.post(
-          "#{Senkyoshi.configuration.scorm_url}/api/scorm_courses",
+          url,
           {
             oauth_consumer_key: config.scorm_oauth_consumer_key,
             lms_course_id: course_id,
             file: file,
+            shared_auth: true,
           },
-          SharedAuthorization: config.scorm_shared_auth,
+          Authorization: "Bearer #{AuthToken.issue_token}",
         ) do |resp|
-          result = JSON.parse(resp.body)["response"]
-          result["points_possible"] = scorm_package.points_possible
-          result
+          result = JSON.parse(resp.body)
+          response = result["response"]
+          response["points_possible"] = scorm_package.points_possible
+          response["package_id"] = result["package_id"]
+          response
         end
       end
     end

data/lib/senkyoshi/configuration.rb

@@ -22,7 +22,9 @@ module Senkyoshi
     attr_accessor :account_id
     attr_accessor :scorm_url
     attr_accessor :scorm_launch_url
+    attr_accessor :scorm_shared_id
     attr_accessor :scorm_shared_auth
+    attr_accessor :scorm_oauth_consumer_key
     attr_accessor :request_timeout
 
     DEFAULT_TIMEOUT = 1_800 # 30 minutes
@@ -33,7 +35,10 @@ module Senkyoshi
       @account_id = Configuration._config[:account_id] || :self
       @scorm_url = Configuration._config[:scorm_url]
       @scorm_launch_url = Configuration._config[:scorm_launch_url]
+      @scorm_shared_id = Configuration._config[:scorm_shared_id]
       @scorm_shared_auth = Configuration._config[:scorm_shared_auth]
+      @scorm_oauth_consumer_key =
+        Configuration._config[:scorm_oauth_consumer_key]
       @request_timeout =
         Configuration._config[:request_timeout] || DEFAULT_TIMEOUT
     end

data/lib/senkyoshi/version.rb

@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Senkyoshi
-  VERSION = "1.0.10".freeze
+  VERSION = "1.0.11".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: senkyoshi
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Atomic Jolt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-byebug
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: pandarus
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: Commandline tool for converting blackboard to canvas
 email: 
 executables:
@@ -149,6 +163,7 @@ files:
 - README.md
 - bin/console
 - bin/import_blackboard
+- lib/auth_token.rb
 - lib/senkyoshi.rb
 - lib/senkyoshi/canvas_course.rb
 - lib/senkyoshi/collection.rb
@@ -225,7 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -233,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Converts Blackboard zip file to Canvas Common Cartridge