trusty 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecc5a4aaa2950c1df33a04997cc6a6785b63cc1a
-  data.tar.gz: 33a98591652aa3f4f5b0d3249482df0d545ec628
+  metadata.gz: 766c8728e87db3008595dbae530b7774cfb4c31d
+  data.tar.gz: 403d9eceb6e0b4b858a21a1e7be1191f54a66b01
 SHA512:
-  metadata.gz: fb4f89d216571b5e6c823e3d64a964b4ea869821ba9b120ff07d746f07601f7846e854ade0cbc0659f2a219c1a0e820752fd8b430cfca71f0204962484a09990
-  data.tar.gz: ca03bc174cd9007085a6c86f3a1cb0675d099ac50591e0fff6dfde37e86a949e23bcfd5dcd409500db1489eb5e4ce0025694ef19c96566aa976b2c0b9d40d004
+  metadata.gz: a4ac7fa3d31cad32e091f70f32b4e7bf1ad9ca4887013aba809acbcd5d1cb1e1d0d8f085831b65a907ef2fa51e1b834b7a6a9ac718e784f0610fe915041bca20
+  data.tar.gz: 6a767f6575043251f26700a221bfcea788b75f52683385fda358749fda853ca8a71a926ea56f98456a44254d3d5fb8cf7da863b30d339f56c2c705d4c811d7ba

data/lib/trusty/omniauth/model_mapper.rb

@@ -4,10 +4,15 @@ module Trusty
   module Omniauth
     class ModelMapper
       include MappingHelpers
+
+      attr_reader :unique_identifiers, :required_criteria
       
       def initialize(provider, options = {})
         @provider = provider
         @options  = options
+
+        @unique_identifiers = @options.fetch(:unique_identifiers, []).map(&:to_s)
+        @required_criteria  = stringify_keys @options.fetch(:required_criteria, {})
       end
       
       def model
@@ -15,11 +20,12 @@ module Trusty
       end
       
       def attribute_names
-        @attribute_names ||= @options[:attribute_names] || column_names
+        # Remove required_criteria so that existing attributes are skipped
+        @attribute_names ||= (@options[:attribute_names] || column_names).map(&:to_s) - required_criteria.keys
       end
       
       def attributes(*filter_attribute_names)
-        @attributes ||= @provider.attributes(*attribute_names).merge!(@options[:attributes])
+        @attributes ||= @provider.attributes(*attribute_names).merge(stringify_keys @options[:attributes]).merge(required_criteria)
         
         if filter_attribute_names.any?
           @attributes.slice(*filter_attribute_names)
@@ -29,9 +35,15 @@ module Trusty
       end
       
       def build_record(additional_attributes = {})
-        model.new(attributes.merge(additional_attributes), without_protection: true)
+        model.new(attributes.merge(required_criteria).merge(additional_attributes), without_protection: true)
       end
       
+      def find_records(additional_criteria = {})
+        conditions = model.where( attributes(*unique_identifiers) )
+        conditions = conditions.where(additional_criteria) unless additional_criteria.empty?
+        conditions.where(required_criteria)
+      end
+
       def update_record!(record)
         if Rails::VERSION::MAJOR >= 4
           record.update_attributes!(attributes)
@@ -49,6 +61,11 @@ module Trusty
           []
         end
       end
+
+      protected
+        def stringify_keys(original_hash)
+          original_hash.each_with_object({}){|(key, value), hash| hash[key.to_s] = value}
+        end
     end
   end
 end

data/lib/trusty/omniauth/provider_mapper.rb

@@ -17,6 +17,8 @@ module Trusty
       # - :identity_model = Identity model
       # - :identity_attributes = Hash of attributes to merge into identity_attributes
       # - :identity_attribute_names = Array of attribute names to copy from Omniauth data (default: Identity.column_names)
+      # - :identity_required_criteria = Hash of criteria to use to find identities, and also to merge into attributes
+      # - :unique_identifiers = Array of column names that identify a model uniquely with omniauth data
       # - :skip_raw_info (default: false) = Boolean whether to exclude OmniAuth "extra" data in identity_attributes[:raw_info]
       # - :skip_nils (default: true) = Boolean whether to remove attributes with nil values
       def initialize(provider_attributes, options = {})
@@ -30,36 +32,66 @@ module Trusty
         }.merge(options)
         
         @provider_identity = ModelMapper.new(self,
-          :model            => @options[:identity_model] || Identity,
-          :attributes       => @options[:identity_attributes],
-          :attribute_names  => @options[:identity_attribute_names]
+          :model              => @options[:identity_model] || Identity,
+          :attributes         => @options[:identity_attributes],
+          :attribute_names    => @options[:identity_attribute_names],
+          :unique_identifiers => @options[:unique_identifiers] || [:provider, :uid],
+          :required_criteria  => @options[:identity_required_criteria]
         )
         @provider_user = ModelMapper.new(self,
-          :model            => @options[:user_model] || User,
-          :attributes       => @options[:user_attributes],
-          :attribute_names  => @options[:user_attribute_names]
+          :model              => @options[:user_model] || User,
+          :attributes         => @options[:user_attributes],
+          :attribute_names    => @options[:user_attribute_names],
+          :unique_identifiers => @options[:unique_identifiers] || [:email]
         )
       end
       
       # Query existing
+
+      def find_identities_for_user(user)
+        @provider_identity.find_records(user_id: user.id)
+      end
       
-      def user
-        # first try to find the user based on provider/uid combo
-        @user ||= find_user_by_identity
-        # find the user by email if not found by identity
-        @user ||= find_user_by_email
+      # Matched identities based on omniauth unique identifiers (provider, uid)
+      def matched_identities
+        @matched_identities ||= @provider_identity.find_records
+      end
+
+      def identities_exist?
+        matched_identities.any?
+      end
+
+      def single_identity?
+        matched_identities.size == 1
+      end
+
+      def multiple_identities?
+        matched_identities.size > 1
       end
       
-      def identity
-        @identity ||= find_identity_by_user
+      # Matched users based on omniauth unique identifiers (email)
+      def matched_users
+        @matched_users ||= @provider_user.find_records
+      end
+
+      def users_exist?
+        matched_users.any?
+      end
+
+      def single_user?
+        matched_users.size == 1
+      end
+
+      def multiple_users?
+        matched_users.size > 1
       end
       
-      def user_exists?
-        !user.nil?
+      def single_user
+        @single_user ||= matched_users.first if single_user?
       end
       
-      def identity_exists?
-        !identity.nil?
+      def single_identity
+        @single_identity ||= matched_identities.first if single_identity?
       end
       
       # USER
@@ -75,16 +107,15 @@ module Trusty
       end
       
       def build_identity_for_user(user)
-        build_identity.tap do |identity|
-          # this assumes there is an inverse relationship automatically created
-          # such as user.identities would now contain this identity for the user
-          identity.user = user
-        end
+        # build_identity.tap do |identity|
+        #   # this assumes there is an inverse relationship automatically created
+        #   # such as user.identities would now contain this identity for the user
+        #   identity.user = user
+        # end
+        build_identity(user: user)
       end
       
-      def update_existing_identity!
-        raise "Identity doesn't exist!" unless identity
-        
+      def update_identity!(identity)
         @provider_identity.update_record!(identity)
       end
       
@@ -113,6 +144,7 @@ module Trusty
             :phone          => clean(info['phone']),
             :image_url      => info['image'],
             :profile_url    => info.fetch('urls', {})['public_profile'],
+            :token_type     => clean(credentials['token_type']),
             :token          => clean(credentials['token']),
             :secret         => clean(credentials['secret']),
             :refresh_token  => clean(credentials['refresh_token']),
@@ -136,26 +168,6 @@ module Trusty
         end
       end
       
-      private
-      
-      def find_user_by_identity
-        if defined?(Mongoid::Document) && @provider_user.model.include?(Mongoid::Document)
-          @provider_user.model.elem_match(:identities => @provider_identity.attributes(:provider, :uid)).first
-        else
-          @provider_user.model.where(
-            :id => @provider_identity.model.where( @provider_identity.attributes(:provider, :uid) ).select(:user_id)
-          ).first
-        end
-      end
-      
-      def find_user_by_email
-        @provider_user.model.where( @provider_identity.attributes(:email) ).first
-      end
-      
-      def find_identity_by_user
-        user && user.identities.where( @provider_identity.attributes(:provider, :uid) ).first
-      end
-      
     end
   end
 end

data/lib/trusty/version.rb

@@ -1,3 +1,3 @@
 module Trusty
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Joel Van Horn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-17 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler