sync_attr_with_auth0 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d47864e5208a3f13c3ff36733e1ee8dcac70253
-  data.tar.gz: 83cb612d3328cb3edbf86573b81bc1e7aa64cce5
+  metadata.gz: 1349703e7bb7429f17470b43f1bb8d9f8991f59f
+  data.tar.gz: 0a2de574896e0cd1505c1fcc9641fdedc906d2e2
 SHA512:
-  metadata.gz: 03e2982ecd4fbea464189dcec8b2f92c0307c702f44e44657f7e0d3bce085c69441ebd7bfe6470dca9b41a5f2ef781710c91d5f7dd4a33c0cb08b96c27c56f54
-  data.tar.gz: 9fdfc779cac98b76990d802917661e172cc729a22b5d1f688e47b66255084f53f3a51552a86010396663496018e740bc2a61cd489c4728a0e50cc0fd9a5b908f
+  metadata.gz: 1ac3a2fdf6a6530d79668202a629ad60cabdd44a290c4067b4a039f576c2a354eff6fb1c6b66b5420e52fee91d3c3cb97d83d525b63d7a0d06a59853f294d0d9
+  data.tar.gz: e620c9046049335bc937e3deb0a5f0d457a3a1331a2c9558c2a47d361231237ddf2c06cb0670065c37d54784e268a4f230b9aae6c3602ea288f0498b179cff25

data/lib/sync_attr_with_auth0/model.rb

@@ -13,8 +13,8 @@ module SyncAttrWithAuth0
         merge_default_options(options)
 
         after_validation :validate_email_with_auth0
-        after_create :create_user_in_auth0
-        after_update :sync_attr_with_auth0
+        after_create :auth0_create
+        after_update :auth0_update
       end
 
     private
@@ -70,7 +70,7 @@ module SyncAttrWithAuth0
       return true
     end
 
-    def create_user_in_auth0
+    def auth0_create
       # When creating a new user, create the user in auth0.
 
       ok_to_sync = (self.respond_to?(:sync_with_auth0_on_create) and !self.sync_with_auth0_on_create.nil?  ? self.sync_with_auth0_on_create : true)
@@ -83,31 +83,13 @@ module SyncAttrWithAuth0
       end
 
       if ok_to_sync
-        user_metadata = auth0_user_metadata
-
-        password = auth0_user_password
-        email_verified = auth0_email_verified?
-        args = {
-          'email' => self.send(auth0_sync_options[:email_att]),
-          'password' => password,
-          'connection' => auth0_sync_options[:connection_name],
-          'email_verified' => email_verified,
-          'user_metadata' => user_metadata
-        }
-
-        auth0 = SyncAttrWithAuth0::Auth0.create_auth0_client
-
-        response = auth0.create_user(self.send(auth0_sync_options[:name_att]), args)
-
-        # Update the record with the uid
-        self.send("#{auth0_sync_options[:uid_att]}=", response['user_id'])
-        self.save
+        create_user_in_auth0
       end
 
       true # don't abort the callback chain
     end
 
-    def sync_attr_with_auth0
+    def auth0_update
       ok_to_sync = (self.respond_to?(:sync_with_auth0_on_update) and !self.sync_with_auth0_on_update.nil? ? self.sync_with_auth0_on_update : true)
 
       if ok_to_sync
@@ -115,38 +97,12 @@ module SyncAttrWithAuth0
         # Get the auth0 uid
         uid = self.send(auth0_sync_options[:uid_att])
 
-        # Don't try to update auth0 if the user doesn't have a uid
-        unless uid.nil?
-          user_metadata = auth0_user_metadata
-
-          auth0 = SyncAttrWithAuth0::Auth0.create_auth0_client
-
-          args = {
-            'app_metadata' => {
-              'name' => self.send(auth0_sync_options[:name_att]),
-              'nickname' => self.send(auth0_sync_options[:name_att]),
-              'given_name' => self.send(auth0_sync_options[:given_name_att]),
-              'family_name' => self.send(auth0_sync_options[:family_name_att])
-            }
-          }
-
-          if (
-            auth0_sync_options[:sync_atts].index(auth0_sync_options[:password_att]) and
-            # Because the password being passed to auth0 probably is not a real
-            # field (and if it is it needs to be the unencrypted value), we
-            # can't rely on checking if the password attribute changed (chances
-            # are, that method does not exist). So assume the password attribute
-            # is only set if it's being changed.
-            !self.send(auth0_sync_options[:password_att]).nil?
-          )
-            # The password should be sync'd and was changed
-            args['password'] = self.send(auth0_sync_options[:password_att])
-            args['verify_password'] = auth0_verify_password?
-          end
-
-          args['user_metadata'] = user_metadata
-
-          response = auth0.patch_user(uid, args)
+        if uid.nil?
+          # Create the user in auth0
+          create_user_in_auth0
+        else
+          # Update the user in auth0
+          update_user_in_auth0
         end
 
       end
@@ -154,6 +110,65 @@ module SyncAttrWithAuth0
       true # don't abort the callback chain
     end
 
+    def create_user_in_auth0
+      user_metadata = auth0_user_metadata
+
+      password = auth0_user_password
+      email_verified = auth0_email_verified?
+      args = {
+        'email' => self.send(auth0_sync_options[:email_att]),
+        'password' => password,
+        'connection' => auth0_sync_options[:connection_name],
+        'email_verified' => email_verified,
+        'user_metadata' => user_metadata
+      }
+
+      auth0 = SyncAttrWithAuth0::Auth0.create_auth0_client
+
+      response = auth0.create_user(self.send(auth0_sync_options[:name_att]), args)
+
+      # Update the record with the uid
+      self.send("#{auth0_sync_options[:uid_att]}=", response['user_id'])
+      self.save
+    end
+
+    def update_user_in_auth0
+      user_metadata = auth0_user_metadata
+
+      auth0 = SyncAttrWithAuth0::Auth0.create_auth0_client
+
+      args = {
+        'app_metadata' => {
+          'name' => self.send(auth0_sync_options[:name_att]),
+          'nickname' => self.send(auth0_sync_options[:name_att]),
+          'given_name' => self.send(auth0_sync_options[:given_name_att]),
+          'family_name' => self.send(auth0_sync_options[:family_name_att])
+        }
+      }
+
+      if (
+        auth0_sync_options[:sync_atts].index(auth0_sync_options[:password_att]) and
+        # Because the password being passed to auth0 probably is not a real
+        # field (and if it is it needs to be the unencrypted value), we
+        # can't rely on checking if the password attribute changed (chances
+        # are, that method does not exist). So assume the password attribute
+        # is only set if it's being changed.
+        !self.send(auth0_sync_options[:password_att]).nil?
+      )
+        # The password should be sync'd and was changed
+        args['password'] = self.send(auth0_sync_options[:password_att])
+        args['verify_password'] = auth0_verify_password?
+      end
+
+      args['user_metadata'] = user_metadata
+
+      response = auth0.patch_user(uid, args)
+
+      if response.code == 404
+        create_user_in_auth0
+      end
+    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.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Patrick McGraw