oauth_im 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3157351b7b2f1b010967a23541e3661835a7dc600a4e37d75d26f512e71169d6
-  data.tar.gz: b54781e3b5e79d8f167a09e9d1c36e09a4f975a3bf47d2a8279d9fb0adb8be74
+  metadata.gz: 22d12f50a39c1a642f23bcbaa44e9714ca0c6524cfa364e6872a14b41a7ce582
+  data.tar.gz: 1aca1d5f3683936829fa3886c58570ba89095542c6ceb5447c77afdc86e3edd1
 SHA512:
-  metadata.gz: 14694090ee6a56ad6498adeb3980ac65405437953a603507a699eb40d987d9938baadf1e293c58f7c5b0869f2c0bea8fa674eed97eefa9c229ce76c32925d066
-  data.tar.gz: 3a03bee203ffc14fc59cf50319fae33d4dbdc4603d93d68a93fe12ca78dd89d2e6b8e1415fa1fca441e39f8108a6f171f7d056cff6618df9b7cefad05f143922
+  metadata.gz: 567b8a9267a062b6b06d18930d85b94e14eeb8cffc8f4bd25fdbfbbbf4b30de3475c3ace6d2c7defe24a57bd3da4262142e0ab68a622407b9a55b6df04203c09
+  data.tar.gz: fa168d58bf0786d43f04d209e5b6b7bf7b4ac201702f8f0730984bd63e50fecbb748ee2a9e9b17c5b085a9eff85f11c654a0bf26664561216ede2d1e707dcd69

data/app/services/oauth_im/admin_client.rb

@@ -15,10 +15,14 @@ module OauthIm
     end
 
     def proxy_user_for(user_id:)
+      ProxyUser.new proxy_attrs_for(user_id: user_id)
+    end
+
+    def proxy_attrs_for(user_id:)
       response = client.retrieve_user(user_id).success_response
       raise "No user for id #{user_id}" if response.blank?
 
-      ProxyUser.new response.user
+      response.user
     end
 
     private

data/app/services/oauth_im/has_registration_data.rb

@@ -2,6 +2,13 @@
 
 require 'fusionauth/fusionauth_client'
 
+############################################################
+# # EDC: memoizing state for these methods is problematic. #
+# # without care, an object's local state can diverge from #
+# # the remote state returned by the API. so for now       #
+# # it seems safest to leave things unmemoized             #
+############################################################
+
 module OauthIm
   module HasRegistrationData
     delegate :email, to: :attrs
@@ -18,8 +25,20 @@ module OauthIm
     delegate :name, :id,
              to: :state, prefix: true
 
+    def registrations
+      attrs[:registrations] || []
+    end
+
+    def registration
+      registrations.first
+    end
+
     def registration_data
-      @registration_data ||= attrs[:registrations]&.first&.data || {}
+      registration&.data || {}
+    end
+
+    def application_id
+      registration&.applicationId
     end
 
     def active?
@@ -47,7 +66,7 @@ module OauthIm
     end
 
     def full_name
-      @full_name ||= "#{first_name} #{last_name}"
+      "#{first_name} #{last_name}"
     end
   end
 end

data/app/services/oauth_im/proxy_user.rb

@@ -1,36 +1,107 @@
 # frozen_string_literal: true
 
+############################################################
+# # EDC: memoizing state for these methods is problematic. #
+# # without care, an object's local state can diverge from #
+# # the remote state returned by the API. so for now       #
+# # it seems safest to leave things unmemoized             #
+############################################################
+
 module OauthIm
   class ProxyUser < IdpClient
     include HasRegistrationData
 
-    attr_reader :attrs
-
-    delegate :to_h, to: :attrs
-
     def self.for(user_id:)
       AdminClient.new.proxy_user_for user_id: user_id
     end
 
+    attr_reader :attrs
+
     def initialize(attrs)
       @attrs = attrs
       super()
     end
 
+    def grant_sponsorship
+      update_registration { |data| data[:sponsor] = 'true' }
+    end
+
+    def revoke_sponsorship
+      update_registration { |data| data[:sponsor] = 'false' }
+    end
+
+    def to_h
+      os_to_h attrs
+    end
+
     def user_id
-      @user_id ||= attrs[:id]
+      attrs[:id]
     end
 
     def send_reset_password_email
       client.forgot_password loginId: login_id
+      reset_attrs
     end
 
     def deactivate
       client.deactivate_user user_id
+      reset_attrs
     end
 
     def reactivate
       client.reactivate_user user_id
+      reset_attrs
+    end
+
+    private
+
+    def update_registration
+      os_to_h(registration_data).then do |data|
+        yield data
+        client.patch_registration user_id, params_for(data)
+      end
+      reset_attrs
+    end
+
+    def params_for(data)
+      { registration:
+          { applicationId: application_id,
+            data: data } }
+    end
+
+    def reset_attrs
+      @attrs = AdminClient.new.proxy_attrs_for(user_id: user_id)
+      self
+    end
+
+    ########################################################
+    # # EDC: even though the FusionAuth client returns     #
+    # # an OpenStruct with nested OpenStruct values, the   #
+    # # patch_registration method does not seem to handle  #
+    # # nested OpenStruct objects.                         #
+    # #                                                    #
+    # # this method recurses over these structures and     #
+    # # turns them into ordinary nested hashes that seem   #
+    # # to be correctly handled.                           #
+    # #                                                    #
+    # # see this SO thread for inspiration:                #
+    # # https://stackoverflow.com/a/62804063/778174        #
+    ########################################################
+    def os_to_h(obj) # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity
+      case obj
+      when Hash, OpenStruct # rubocop:disable Style/OpenStructUse
+        obj.to_h.transform_values do |val|
+          case val
+          when OpenStruct then os_to_h(val) # rubocop:disable Style/OpenStructUse
+          when Array
+            val.map { |entry| os_to_h(entry) }
+          else val
+          end
+        end
+      when Array
+        obj.map { |entry| os_to_h(entry) }
+      else obj
+      end
     end
   end
 end

data/lib/oauth_im/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OauthIm
-  VERSION = '0.10.2'
+  VERSION = '0.10.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oauth_im
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Eric Connally
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 2022-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusionauth_client