cognito_rails 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e26720020fe66850fb2c51baf995cbb22e1bb0713fa84714b18c7c69ba7eeca
-  data.tar.gz: f0fdfbdf0375fb7a8dcd1d3c4d44393947f785a58e33579d4907d97010ea2b40
+  metadata.gz: ba2d4e841753b9cd8ee9405f3cf611d55c69d59ba308278b5571a8f2000fab95
+  data.tar.gz: cfe2bed1bc6691c2b66cd0a1ee4abd25356f7a18cf02f3a0d051207d632f52ee
 SHA512:
-  metadata.gz: ca4c17f11c1e0c9b2619385ae7019632d83505838ef957760a349ccb21dc55e27be8c61c797af9b45db0a93fa17bf0ee6569dd86f8e5275269cab299d991ec96
-  data.tar.gz: b66d984895beb150302232cb7efa59528fd46cd9c61ea3193458fea3a93fc772db27f83af2020879e0c1ca9bb11b861e944570433fcee3222dbc217beaeef4e6
+  metadata.gz: b68f5ce7e60a6f1429062666aa2632902276e004d62ede96706b7adceda29d5d7c6103b352a718e47bad39380fd41be57b24326e4f2b7009b44612d9d7e83ae1
+  data.tar.gz: 26912cfe1cfb2aa7d2d26a579766fa28a2d03d0ae52eafc5be1a669168c7073b5b29cb17a61763a2657e8a87112462e7d92e113578f3711da602deaba370c82e

data/lib/cognito_rails/model.rb

@@ -50,6 +50,13 @@ module CognitoRails
         end
       end
 
+      def sync_from_cognito_id!(external_id)
+        user_data = User.with_credentials(self).find_raw(external_id)
+        sync_user!(user_data) do |user|
+          yield user, user_data if block_given?
+        end
+      end
+
       private
 
       def sync_user!(user_data)
@@ -57,8 +64,9 @@ module CognitoRails
         return if external_id.blank?
 
         user = find_or_initialize_by(_cognito_attribute_name => external_id)
-        user.email = User.extract_cognito_attribute(user_data.attributes, :email)
-        user.phone = User.extract_cognito_attribute(user_data.attributes, :phone_number) if user.respond_to?(:phone)
+        attributes = user_data.respond_to?(:attributes) ? user_data.attributes : user_data.user_attributes
+        user.email = User.extract_cognito_attribute(attributes, :email)
+        user.phone = User.extract_cognito_attribute(attributes, :phone_number) if user.respond_to?(:phone)
         _cognito_resolve_custom_attribute(user, user_data)
 
         yield user if block_given?
@@ -134,7 +142,6 @@ module CognitoRails
 
     def cognito_scope
       @cognito_scope ||= User.with_credentials(self.class)
-
     end
 
     class_methods do

data/lib/cognito_rails/version.rb

@@ -2,5 +2,5 @@
 
 module CognitoRails
   # @return [String] gem version
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
 end

data/spec/cognito_rails/user_spec.rb

@@ -200,6 +200,18 @@ RSpec.describe CognitoRails::User, type: :model do
       end
     end
 
+    context '#sync_from_cognito_id!' do
+      before do
+        expect(fake_cognito_client).to receive(:admin_get_user)
+          .and_return(build_cognito_user_data(sample_cognito_email))
+      end
+      it 'imports the user correctly' do
+        user = User.sync_from_cognito_id!(sample_cognito_id)
+        expect(user).to be_a(User)
+        expect(user.email).to eq(sample_cognito_email)
+      end
+    end
+
     it '#sync_to_cognito!' do
       User.create!(email: sample_cognito_email)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cognito_rails
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Mònade