sync_attr_with_auth0 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2441467a77240b5be6d8fe7f33dfa57b5b3521945606c47803f928124b3b70f
-  data.tar.gz: 0231f6a6f5864485447a81c3c7e2c9e49beeb3d8def264e23f3a2cf5d863e7d6
+  metadata.gz: 78b6cc16ee90ef4923134f94be42fd6f9f5507a04f76855d53fbaed46d6f780f
+  data.tar.gz: 07ac9b9cc8ee2e07a21bae95964a082e5c2a6fd5bc8db63e3721b97b2d2a8e6e
 SHA512:
-  metadata.gz: 15b3328e06d33cc34c39e4367b41ebfb13475679c3f9c4137c9a996b6a450396bfef27921b5ae7c29780af36cceeb92612a706e63f7043a01eae8b8f00174ca4
-  data.tar.gz: 40381d9b91a763b6a7722ce7da08192d0008eeb0bef7329129e473a977808e0cb7538df22ed061945e67ff5dc207cec5572c2c473f33e01484ed1f2e634f8d93
+  metadata.gz: '01239ff7161e9a1f6787b7e41161c9edf354463168af54cd941f5ede9172cf68ed4ad053edeea662e2411381d696362c8e014521d9ea63b056fec57837f8cfea'
+  data.tar.gz: '09dba8dcf96b0b8dd28bec491bb372ded1d53f426837e664b5d462aaf9ea524e301b22009eccb86af16c38bb67d8bb3503e2a2f3340d9a90e96a147fd4e5eb34'

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

@@ -94,11 +94,12 @@ module SyncAttrWithAuth0
         def create_in_auth0
           params = auth0_create_params
 
-          response = SyncAttrWithAuth0::Auth0.create_user(auth0_user_name, params, config: auth0_sync_configuration)
+          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

data/lib/sync_attr_with_auth0/auth0.rb

@@ -17,7 +17,7 @@ module SyncAttrWithAuth0
         'jti' => UUIDTools::UUID.random_create.to_s
       }
 
-      jwt = JWT.encode(payload, JWT.base64url_decode(global_client_secret))
+      jwt = JWT.encode(payload, JWT::Base64.url_decode(global_client_secret), 'HS256', { typ: 'JWT' })
 
       return jwt
     end # ::create_auth0_jwt
@@ -86,10 +86,9 @@ module SyncAttrWithAuth0
     end # ::find_users_by_email
 
 
-    def self.create_user(name, params, config: SyncAttrWithAuth0.configuration)
+    def self.create_user(params, config: SyncAttrWithAuth0.configuration)
       auth0 = SyncAttrWithAuth0::Auth0.create_auth0_client(config: config)
-
-      return auth0.create_user(name, params)
+      return auth0.create_user(params.delete('connection'), params)
     end # ::create_user
 
 

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: sync_attr_with_auth0
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - Patrick McGraw
 - Mike Oliver
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2016-07-26 00:00:00.000000000 Z
@@ -71,44 +71,44 @@ 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
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rails
   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
@@ -154,7 +154,7 @@ homepage: http://rubygems.org/gems/sync_attr_with_auth0
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -169,8 +169,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Synchronize attributes on a local ActiveRecord user model with the user metadata
   store on Auth0