bearcat 1.5.28 → 1.5.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be5f900048edb3be390f3c36ad38c23da1605bdc164cffc2056f0f16f959de8e
-  data.tar.gz: cc1e4b0fa57bf2ce326f278ab0f855cdebd7f4a1d943f661aaf61a766eee5e13
+  metadata.gz: c8f8b63caed1ff5f931ed35d4d7612cc95b1a55ef320b2ea62d6c37cd58d7961
+  data.tar.gz: e4d46c06cc72391ca389cd8e988aea15daab9d849d34b43f8da836cea7baa0d0
 SHA512:
-  metadata.gz: 7f51b3b96e155b3684aa019cfe75f30fff3e84947cbe13bac43a7277a9ed5d13ceafbb5ff7bd3fb4ed16ab07814343fb435c4e92e4ac17173ee3e9aa26fc108e
-  data.tar.gz: b24a814fefd13793b6931621019397db41588b45604f16cfcb2c7305a79b0d3847351f64c21e4425ceb936f8fa6d7568895491c1ae54e3463c00ee56152e8871
+  metadata.gz: 4692fb709e0bda0e0e7090bc58173be51a7583f540b1da2d725215f0254733fd62fdc376790cbc09fdcbec4d47765cdd3a83e4ad1e67bc5ad63193acf8fa330a
+  data.tar.gz: 6898bcfbb4f30848164b1ea84588821f4a3736378df6e50fd20037f36e3d8e008d9ebb43e75cc67728df84f5230ca59c985246a806a03f4b5676dc0f5adab12b

data/lib/badgrcat/client/methods.rb

@@ -3,6 +3,28 @@ module Badgrcat
     module Methods
       extend Bearcat::Client::ClientModule
 
+      prefix "v1" do
+        prefix "/orgs" do
+          prefix "/:organization" do
+            prefix "/pathways" do
+              get :pathways
+            end
+          end
+        end
+
+        prefix "/pathways" do
+          prefix "/:pathway" do
+            get :pathway
+
+            prefix "/progress" do
+              prefix "/recipient?recipientId=:recepientId" do
+                get :user_pathway_progress
+              end
+            end
+          end
+        end
+      end
+
       prefix "/v2/issuers" do
         get :issuers
         post :create_issuer

data/lib/badgrcat/client.rb

@@ -12,25 +12,45 @@ module Badgrcat
 
     # Override Footrest request for ApiArray support
     def request(method, &block)
-      begin
-        response = connection.send(method, &block)
+      response = begin
+        connection.send(method, &block)
+      rescue Footrest::HttpError::NotFound => e
+        raise e unless connection.headers[:authorization].nil?
+
+        # Reauthenticate and retry if authorization header is nil
+        authenticate!
+        connection.send(method, &block)
       rescue Footrest::HttpError::Unauthorized
         # Reauthenticate and retry
         authenticate!
-        response = connection.send(method, &block)
+        connection.send(method, &block)
       end
 
       Badgrcat::ApiArray.process_response(response, self)
     end
 
+    # Override Footrest request for sending params in body as json
+    def request_with_params_in_body(method, path, options)
+      request(method) do |r|
+        r.path = fullpath(path)
+        r.body = options.to_json unless options.empty?
+      end
+    end
+
     def authenticate!
       connection.headers[:authorization] = nil
 
+      auth_url = config[:auth_url]
+
       tok_params = {
         scope: config[:scope],
         client_id: config[:client_id],
+        client_secret: config[:client_secret],
+        grant_type: config[:grant_type],
       }
 
+      tok_params.reject! { |_k, v| v.nil? }
+
       if @refresh_token
         tok_params.merge!({
           grant_type: "refresh_token",
@@ -43,11 +63,14 @@ module Badgrcat
         })
       end
 
-      authresp = connection.send(:post, "o/token", tok_params)
+      authresp = connection.send(:post, auth_url, tok_params)
       authdata = authresp.body
 
       @refresh_token = authdata["refresh_token"].presence || @refresh_token
       connection.headers[:authorization] = "#{authdata['token_type']} #{authdata['access_token']}"
+
+      # Set content type as application/json
+      connection.headers['Content-Type'] = "application/json"
     end
   end
 end

data/lib/bearcat/version.rb

@@ -1,3 +1,3 @@
 module Bearcat
-  VERSION = '1.5.28' unless defined?(Bearcat::VERSION)
+  VERSION = '1.5.30' unless defined?(Bearcat::VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bearcat
 version: !ruby/object:Gem::Version
-  version: 1.5.28
+  version: 1.5.30
 platform: ruby
 authors:
 - Instructure CustomDev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-02 00:00:00.000000000 Z
+date: 2024-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake