sync_attr_with_auth0 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 150f4f03236db891bc4d1282f1f80ebedbe40799
-  data.tar.gz: 8472efd778006cd84e1c49cef5e70a6ac03b5229
+  metadata.gz: 0fb1101e092bccf7062ac9ca3a6f02e351c94ef5
+  data.tar.gz: d12bca90a91da479fa0834d320a2742afbe0259f
 SHA512:
-  metadata.gz: 615714c6687b570fe7d11b3ff45a7ed75f12d128dc93567f5c0697dc8c030f6d9ebb5b19eca47f51ea0e65b7f1dad4de1d792ad07dd754b25d3d9935ddcaa1b6
-  data.tar.gz: 6048ab73ee2eb08455ec72d5f2da74ff9766bab860bb99197c63c1d08efbbee4ff0685af739e08bb66ee133f5c18f9add09630d5f11191983cd4c3b790d11693
+  metadata.gz: ce1e10fbb37dfaf2371dbb9931485ac13ce85d4dbf496978de9d5345100c23f24d16782f6e82a92847d67a183613cfdaef3c0562b93c6af71e329b57e977abe9
+  data.tar.gz: d00fdd4c41d1235fe2ea36207cb3527e5c9c47face0872c8431af2b89ebadb7a17412ba9e3136484d5ec7e289137f180885437d7e642500024563dca3391f75e

data/lib/sync_attr_with_auth0/model.rb

@@ -60,9 +60,7 @@ module SyncAttrWithAuth0
       ok_to_validate = (self.respond_to?(:validate_with_auth0) and !self.validate_with_auth0.nil? ? self.validate_with_auth0 : true)
 
       if ok_to_validate and self.email_changed?
-        auth0 = SyncAttrWithAuth0::Auth0.create_auth0_client(api_version: 1)
-
-        response = auth0.users("email:#{self.send(auth0_sync_options[:email_att])}")
+        response = find_user_in_auth0
 
         return response.empty?
       end
@@ -100,7 +98,7 @@ module SyncAttrWithAuth0
         # TODO: create a user if the uid is nil
         unless uid.nil?
           # Update the user in auth0
-          update_user_in_auth0
+          update_user_in_auth0(uid)
         end
 
       end
@@ -108,10 +106,15 @@ module SyncAttrWithAuth0
       true # don't abort the callback chain
     end
 
-    def create_user_in_auth0
+    def create_user_in_auth0()
       user_metadata = auth0_user_metadata
 
       password = auth0_user_password
+
+      if password.nil?
+        password = auth0_default_password
+      end
+
       email_verified = auth0_email_verified?
       args = {
         'email' => self.send(auth0_sync_options[:email_att]),
@@ -130,7 +133,7 @@ module SyncAttrWithAuth0
       self.save
     end
 
-    def update_user_in_auth0
+    def update_user_in_auth0(uid)
       user_metadata = auth0_user_metadata
 
       auth0 = SyncAttrWithAuth0::Auth0.create_auth0_client
@@ -161,10 +164,24 @@ module SyncAttrWithAuth0
       args['user_metadata'] = user_metadata
 
       begin
-        response = auth0.patch_user(uid, args)
+        auth0.patch_user(uid, args)
 
       rescue ::Auth0::NotFound => e
         # TODO: We need to attempt to find the correct UID by email or nil the UID on the user.
+        response = find_user_in_auth0
+        found_user = response.first
+
+        if found_user.nil?
+          # Could not find the user, create it in auth0
+          create_user_in_auth0
+        else
+          # Update with the new uid and correct the one on file
+          auth0 = SyncAttrWithAuth0::Auth0.create_auth0_client
+          auth0.patch_user(found_user['user_id'], args)
+
+          self.send("#{auth0_sync_options[:uid_att]}=", found_user['user_id'])
+          self.save
+        end
 
       rescue Exception => e
         ::Rails.logger.error e.message
@@ -174,6 +191,14 @@ module SyncAttrWithAuth0
       end
     end
 
+    def find_user_in_auth0
+      auth0 = SyncAttrWithAuth0::Auth0.create_auth0_client(api_version: 1)
+
+      response = auth0.users("email:#{self.send(auth0_sync_options[:email_att])}")
+
+      return response
+    end
+
     def auth0_user_password
       self.respond_to?(auth0_sync_options[:password_att]) ? self.send(auth0_sync_options[:password_att]) : auth0_default_password
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sync_attr_with_auth0
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Patrick McGraw