Merge pull request #2261 from 18F/stages/rc-2018-06-22

Deploy stages/rc-2018-06-22 v2 to int

app/models/concerns/user_access_key_overrides.rb

@@ -23,6 +23,16 @@ def password=(new_password)
     write_legacy_password_attributes(digest)
   end
 
+  # This is a devise method, which we are overriding. This should not be removed
+  # as Devise depends on this for things like building the key to use when
+  # storing the user in the session.
+  def authenticatable_salt
+    return if encrypted_password_digest.blank?
+    Encryption::PasswordVerifier::PasswordDigest.parse_from_string(
+      encrypted_password_digest
+    ).password_salt
+  end
+
   private
 
   def write_legacy_password_attributes(digest)

spec/models/user_spec.rb

@@ -409,6 +409,15 @@
     end
   end
 
+  describe '#authenticatable_salt' do
+    it 'returns the password salt' do
+      user = create(:user)
+      salt = JSON.parse(user.encrypted_password_digest)['password_salt']
+
+      expect(user.authenticatable_salt).to eq(salt)
+    end
+  end
+
   context 'when a password is updated' do
     it 'writes encrypted_password_digest and the legacy password attributes' do
       user = create(:user)