app/models/disco_app/concerns/user.rb in disco_app-0.13.4 vs app/models/disco_app/concerns/user.rb in disco_app-0.13.5

@@ -3,16 +3,18 @@
 
   included do
     belongs_to :shop
 
     def self.create_from_auth(shopify_user, shop)
-      user = self.find_or_create_by(id: shopify_user.id, shop: shop)
+      user = self.find_or_create_by!(id: shopify_user.id, shop: shop)
       user.update(
         first_name: shopify_user.first_name || '',
         last_name: shopify_user.last_name || '',
         email: shopify_user.email
       )
       user
+    rescue ActiveRecord::RecordNotUnique, PG::UniqueViolation
+      retry
     end
 
   end
 end