cognito_rails 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d8bc1e0dc872a16d7406a72e5028da49b62c80c5297d6c4428ea45efd5293a1
-  data.tar.gz: 71d87358a0e584eba16ada273a582caa7e560b84ba58b06d6b5752b7d1769f9e
+  metadata.gz: bf2686f37e8a52be09eb2a043f21055fca0823015460b964e448ccc27e7a5637
+  data.tar.gz: d5d983d923769b5ff58325e05d5a5f942b69efe80b9e0adbcc9ca384fe3b8960
 SHA512:
-  metadata.gz: c22e85bfa4b48b5f5614314ae5cf2f696342fdf3ca204ca92a9d23107a1097da897dcd23a67d7635f1a2cd83b8ecaacbf4bdf20bfeba785fb0c9a1328fb671e9
-  data.tar.gz: def01df4152f2fa0e0fc3991e1438d5898af2d3485be0824f0d59e83987d65d27268897e90308e353fdc04e7b8658ff88f0e54fd92dad41d263292fed80756d9
+  metadata.gz: bf8e6743abb4d4a7968598b84c08a92c04b1838fdab5754e75d6157626b7f1b8106397a917799872693e0da51e0f310b3e353759b36e2c77bc6fbb0d85d321c0
+  data.tar.gz: bc2b2a108801f6d108d13db71b1ac7c86ab3c9bf16fbf0cb93d0bd1e59f488b16eb7009df04088eaec9ac6c68706dfb651a30db7b856e36f8a2b7ef03835bdbb

data/lib/cognito_rails/model.rb

@@ -12,6 +12,7 @@ module CognitoRails
       class_attribute :_cognito_verify_phone
       class_attribute :_cognito_custom_attributes
       class_attribute :_cognito_attribute_name
+      class_attribute :_cognito_password_policy
       self._cognito_custom_attributes = []
 
       before_create do
@@ -142,6 +143,10 @@ module CognitoRails
         self._cognito_verify_phone = true
       end
 
+      def cognito_password_policy(type)
+        self._cognito_password_policy = type
+      end
+
       # @param name [String] attribute name
       # @param value [String] attribute name
       def define_cognito_attribute(name, value)

data/lib/cognito_rails/user.rb

@@ -171,6 +171,11 @@ module CognitoRails
       user_class._cognito_verify_phone
     end
 
+    # @return [Symbol] :temporary | :user_provided
+    def cognito_password_policy
+      user_class._cognito_password_policy || :temporary
+    end
+
     # @return [Array<Hash>]
     def general_user_attributes
       [
@@ -188,18 +193,41 @@ module CognitoRails
       ]
     end
 
+    # @return [Array<Hash>]
+    def password_attributes
+      if cognito_password_policy == :user_provided
+        { message_action: 'SUPPRESS' }
+      else
+        { temporary_password: password }
+      end
+    end
+
+    def set_user_provided_password
+      cognito_client.admin_set_user_password(
+        {
+          user_pool_id: CognitoRails::Config.aws_user_pool_id,
+          username: email,
+          password: password,
+          permanent: true
+        }
+      )
+    end
+
     def save_for_create
       resp = cognito_client.admin_create_user(
         {
           user_pool_id: CognitoRails::Config.aws_user_pool_id,
           username: email,
-          temporary_password: password,
           user_attributes: [
             *general_user_attributes,
             *verify_user_attributes
-          ]
+          ],
+          **password_attributes
         }
       )
+
+      set_user_provided_password if cognito_password_policy == :user_provided
+
       self.id = resp.user.attributes.find { |a| a[:name] == 'sub' }[:value]
     end
 

data/lib/cognito_rails/version.rb

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

data/spec/cognito_rails/user_spec.rb

@@ -7,6 +7,7 @@ RSpec.describe CognitoRails::User, type: :model do
 
   let(:sample_cognito_email) { 'some@mail.com' }
   let(:sample_cognito_phone) { '123456789' }
+  let(:sample_cognito_password) { '123qweASD!@#' }
 
   it 'validates email presence' do
     expect(subject).to have(1).error_on(:email)
@@ -136,6 +137,14 @@ RSpec.describe CognitoRails::User, type: :model do
 
       User.create!(email: sample_cognito_email, name: 'TestName')
     end
+
+    it 'creates a cognito user with user_provided' do
+      expect(fake_cognito_client).to receive(:admin_set_user_password).exactly(1).time.and_return(OpenStruct.new)
+
+      allow_any_instance_of(CognitoRails::User).to receive(:cognito_client).and_return(fake_cognito_client)
+      PasswordProvidedUser.create!(email: sample_cognito_email, password: sample_cognito_password)
+      User.create!(email: sample_cognito_email)
+    end
   end
 
   context 'class methods' do
@@ -184,8 +193,8 @@ RSpec.describe CognitoRails::User, type: :model do
         end.to change { EnrichedUser.count }.by(2)
 
         expect(EnrichedUser.pluck(:email)).to match_array(['some@example.com', 'some2@example.com'])
-        expect(EnrichedUser.order(:id).pluck(:first_name)).to match_array(['John1', 'John2'])
-        expect(EnrichedUser.order(:id).pluck(:last_name)).to match_array(['Doe', 'Doe'])
+        expect(EnrichedUser.order(:id).pluck(:first_name)).to match_array(%w[John1 John2])
+        expect(EnrichedUser.order(:id).pluck(:last_name)).to match_array(%w[Doe Doe])
       end
     end
 

data/spec/support/cognito_helpers.rb

@@ -11,8 +11,7 @@ module CognitoRails::Helpers
         expect(params).to match_structure(
           user_pool_id: one_of(String, nil),
           username: String,
-          temporary_password: String,
-          user_attributes: a_list_of(name: String, value: one_of(String, nil))
+          user_attributes: a_list_of(name: String, value: one_of(String, nil)),
         )
         OpenStruct.new(user: OpenStruct.new(attributes: [{ name: 'sub', value: sample_cognito_id }]))
       end

data/spec/support/schema.rb

@@ -42,6 +42,20 @@ class Admin < ActiveRecord::Base
   define_cognito_attribute 'role', 'admin'
 end
 
+
+class PasswordProvidedUser < ActiveRecord::Base
+  validates :email, presence: true
+  validates :email, uniqueness: true
+
+  as_cognito_user
+  cognito_verify_email
+  cognito_password_policy :user_provided
+  define_cognito_attribute 'role', 'user'
+  define_cognito_attribute 'name', :name
+
+  attr_accessor :password
+end
+
 module Schema
   def self.create
     ActiveRecord::Migration.verbose = false
@@ -68,6 +82,13 @@ module Schema
         t.string "cognito_id", null: false
         t.timestamps null: false
       end
+
+      create_table :password_provided_users, force: true do |t|
+        t.string "email", null: false
+        t.string "name"
+        t.string "external_id", null: false
+        t.timestamps null: false
+      end
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cognito_rails
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Mònade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-23 00:00:00.000000000 Z
+date: 2023-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport