sync_attr_with_auth0 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b29ebf79d97e921bb5e8cb4f8faed85f37d626e6637a3ade34a4e551d7e005a
-  data.tar.gz: b1f528e810d6c6eb2eee5f2381f1ba1d337f1c83ced7c4ed63d795eb7fa8e804
+  metadata.gz: 78b6cc16ee90ef4923134f94be42fd6f9f5507a04f76855d53fbaed46d6f780f
+  data.tar.gz: 07ac9b9cc8ee2e07a21bae95964a082e5c2a6fd5bc8db63e3721b97b2d2a8e6e
 SHA512:
-  metadata.gz: 86e479e00c7f1e86cb2b02b8e1a3fc7b922e04d05cf750b1e233f39462cf2ae98e2d8810e6d706fc872bbd9a6704eb23ae3963b3eb4f42c581bb2d06f03d7c75
-  data.tar.gz: 1152e5d70a71e5e5cd4b208a6bafa39e788e6c4f03661aacd41d5497648008dcee15114bdf01f362f63a9be4472d73109be0f083f5bd40dd95bcd7ac0b354f5c
+  metadata.gz: '01239ff7161e9a1f6787b7e41161c9edf354463168af54cd941f5ede9172cf68ed4ad053edeea662e2411381d696362c8e014521d9ea63b056fec57837f8cfea'
+  data.tar.gz: '09dba8dcf96b0b8dd28bec491bb372ded1d53f426837e664b5d462aaf9ea524e301b22009eccb86af16c38bb67d8bb3503e2a2f3340d9a90e96a147fd4e5eb34'

data/lib/sync_attr_with_auth0/adapters/active_record/auth0_sync.rb

@@ -96,9 +96,10 @@ module SyncAttrWithAuth0
 
           response = SyncAttrWithAuth0::Auth0.create_user(params, config: auth0_sync_configuration)
 
-          # Update the record with the uid and picture after_commit
-          @auth0_uid = response['user_id']
-          @auth0_picture = response['picture']
+          # Update the record with the uid and picture
+          auth0_uid = response['user_id']
+          auth0_picture = response['picture']
+          update_uid_and_picture_from_auth0 auth0_uid, auth0_picture
         end # create_in_auth0
 
 
@@ -109,8 +110,9 @@ module SyncAttrWithAuth0
             response = SyncAttrWithAuth0::Auth0.patch_user(user_uid, auth0_update_params(user_uid), config: auth0_sync_configuration)
 
             # Update the record with the uid after_commit (in case it doesn't match what's on file).
-            @auth0_uid = user_uid
-            @auth0_picture = response['picture']
+            auth0_uid = user_uid
+            auth0_picture = response['picture']
+            update_uid_and_picture_from_auth0 auth0_uid, auth0_picture
           rescue ::Auth0::NotFound => e
             # For whatever reason, the passed in uid was invalid,
             # determine how to proceed.
@@ -125,9 +127,10 @@ module SyncAttrWithAuth0
               # and update the one on file.
               response = SyncAttrWithAuth0::Auth0.patch_user(found_user['user_id'], auth0_update_params(found_user['user_id']), config: auth0_sync_configuration)
 
-              # Update the record with the uid after_commit
-              @auth0_uid = found_user['user_id']
-              @auth0_picture = response['picture']
+              # Update the record with the uid
+              auth0_uid = found_user['user_id']
+              auth0_picture = response['picture']
+              update_uid_and_picture_from_auth0 auth0_uid, auth0_picture
             end
 
           rescue Exception => e
@@ -203,25 +206,20 @@ module SyncAttrWithAuth0
         end # auth0_update_params
 
 
-        def update_uid_and_picture_from_auth0
+        def update_uid_and_picture_from_auth0(auth0_uid, auth0_picture)
           data = {}
 
-          if @auth0_uid
+          if auth0_uid
             attr = auth0_sync_configuration.auth0_uid_attribute
-            data[attr] = @auth0_uid if respond_to?(attr) && @auth0_uid != public_send(attr)
+            data[attr] = auth0_uid if respond_to?(attr) && auth0_uid != public_send(attr)
           end
 
-          if @auth0_picture
+          if auth0_picture
             attr = auth0_sync_configuration.picture_attribute
-            data[attr] = @auth0_picture if respond_to?(attr) && @auth0_picture != public_send(attr)
+            data[attr] = auth0_picture if respond_to?(attr) && auth0_picture != public_send(attr)
           end
 
           update_columns data unless data.empty?
-
-          remove_instance_variable :@auth0_uid if defined? @auth0_uid
-          remove_instance_variable :@auth0_picture if defined? @auth0_picture
-
-          true # don't abort the callback chain
         end # update_uid_and_picture_from_auth0
 
       end

data/lib/sync_attr_with_auth0/adapters/active_record.rb

@@ -36,7 +36,6 @@ module SyncAttrWithAuth0
           after_validation :validate_email_with_auth0
           after_create :save_to_auth0_after_create
           after_update :save_to_auth0_after_update
-          after_commit :update_uid_and_picture_from_auth0
         end # sync_attr_with_auth0
 
       end # ClassMethods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sync_attr_with_auth0
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Patrick McGraw
@@ -71,16 +71,16 @@ dependencies:
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: auth0
   requirement: !ruby/object:Gem::Requirement
@@ -127,16 +127,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: Synchronize attributes on a local ActiveRecord user model with the user
   metadata store on Auth0
 email: patrick@mcgraw-tech.com
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Synchronize attributes on a local ActiveRecord user model with the user metadata