oneroster 2.3.6 → 2.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12d6aa35d7eac60a9e611302845be1ed8072e0dca2bedd11282e6bcc23cc1dfc
-  data.tar.gz: af958aebb8a105f98eb17ab33a42cd065ced816917a76245591f01634a3909cd
+  metadata.gz: 40d5e334a53e3d8a02137968318000bdaf7604a02a54291b7fd334552893ec5d
+  data.tar.gz: 94a198a0065ce9c615824acf25f4326fe7159b9a87b397aca640a48df6c3df81
 SHA512:
-  metadata.gz: 9d297d5100333fefe6749270f6e44620ad38b0dde3ae3cc399d73aa51c4c933eb9a87796262a0f6c93844dd8c71451f60964ac31a3ffff02734dc4c82287277e
-  data.tar.gz: 45d8e0c74996efe2b1e75de72a9ba57a6282ebaaf315a5bf274067a82614b935124c0aa02b9b0b0c581f53e7b2956c330cdfecb4687442e76a6969ec2e596469
+  metadata.gz: 2528744a79bf3570e061d9c6c1f81345428be201f9d6b1dd79bfa649ea5b55f6a010f575df8e29ff944ed172be6a5a2983aaad95233ba687844aad88df45ea46
+  data.tar.gz: dc653c3c64ed67ed9546b9be9ba6e00b104829656fcde796d6be43a37c731de6eaaaa1ab50adf361f8bfb5fd28f30dd910eb8286d1bb5a087e2dc4ad0de6b852

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oneroster (2.3.6)
+    oneroster (2.3.9)
       dry-inflector
       faraday
       faraday_middleware

data/lib/one_roster/client.rb

@@ -4,7 +4,7 @@ module OneRoster
   class Client
     attr_accessor :app_id, :app_token, :api_url, :token_url, :roster_app,
                   :app_secret, :logger, :vendor_key,
-                  :username_source, :oauth_strategy, :staff_username_source
+                  :username_source, :oauth_strategy, :staff_username_source, :token_content_type
 
     attr_reader :authenticated
 
@@ -134,9 +134,9 @@ module OneRoster
                             scope: 'https://purl.imsglobal.org/spec/or/v1p1/scope/roster-core.readonly' }
 
       if roster_app == 'infinite_campus'
-        connection.execute(url, :post, credential_params)
+        connection.execute(url, :post, credential_params, nil, token_content_type)
       elsif roster_app == 'synergy'
-        connection.execute(url, :post, nil, credential_params)
+        connection.execute(url, :post, nil, credential_params, token_content_type)
       else
         connection.execute(url, :post)
       end

data/lib/one_roster/connection.rb

@@ -10,8 +10,8 @@ module OneRoster
       @oauth_strategy = oauth_strategy
     end
 
-    def execute(path, method = :get, params = nil, body = nil)
-      Response.new(raw_request(path, method, params, body))
+    def execute(path, method = :get, params = nil, body = nil, content_type = nil)
+      Response.new(raw_request(path, method, params, body, content_type))
     end
 
     def set_auth_headers(token, cookie)
@@ -37,31 +37,37 @@ module OneRoster
 
     private
 
-    def raw_request(path, method, params, body)
+    def raw_request(path, method, params, body, content_type = nil)
       p "request #{path} #{params}"
 
       connection.public_send(method) do |request|
         request.options.open_timeout     = OPEN_TIMEOUT
         request.options.timeout          = TIMEOUT
         request.url path, params
-        request.headers['Content-Type']  = content_type
+        request.headers['Content-Type']  = content_type || set_content_type
         request.headers['Cookie']        = @cookie
-        request.body                     = render_body(body)
+        request.body                     = render_body(body, content_type)
       end
     end
 
-    def content_type
+    def set_content_type
       return 'application/x-www-form-urlencoded' if @client.roster_app == 'synergy'
 
       'application/json'
     end
 
-    def render_body(body)
-      return URI.encode_www_form(body) if !body.nil? && @client.roster_app == 'synergy'
+    def render_body(body, content_type)
+      return URI.encode_www_form(body) if should_encode_body?(body, content_type)
 
       body
     end
 
+    def should_encode_body?(body, content_type)
+      return false if body.nil?
+
+      @client.roster_app == 'synergy' || content_type == 'application/x-www-form-urlencoded'
+    end
+
     def oauth_connection
       Faraday.new(@client.api_url) do |connection|
         connection.request :oauth,

data/lib/one_roster/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OneRoster
-  VERSION = '2.3.6'
+  VERSION = '2.3.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneroster
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.3.9
 platform: ruby
 authors:
 - Robert Julius
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2023-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday