From 37add27a00d38e4edaaec945ed9f44a123523884 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Tue, 27 Nov 2018 14:34:05 +0100 Subject: Improve token authenticable tests and exceptions --- app/models/concerns/token_authenticatable_strategies/base.rb | 8 ++++---- app/models/concerns/token_authenticatable_strategies/encrypted.rb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'app/models/concerns/token_authenticatable_strategies') diff --git a/app/models/concerns/token_authenticatable_strategies/base.rb b/app/models/concerns/token_authenticatable_strategies/base.rb index 23ee34962c7..4c63c0dd629 100644 --- a/app/models/concerns/token_authenticatable_strategies/base.rb +++ b/app/models/concerns/token_authenticatable_strategies/base.rb @@ -47,17 +47,17 @@ module TokenAuthenticatableStrategies options[:fallback] == true end - def self.fabricate(instance, field, options) + def self.fabricate(model, field, options) if options[:digest] && options[:encrypted] raise ArgumentError, 'Incompatible options set!' end if options[:digest] - TokenAuthenticatableStrategies::Digest.new(instance, field, options) + TokenAuthenticatableStrategies::Digest.new(model, field, options) elsif options[:encrypted] - TokenAuthenticatableStrategies::Encrypted.new(instance, field, options) + TokenAuthenticatableStrategies::Encrypted.new(model, field, options) else - TokenAuthenticatableStrategies::Insecure.new(instance, field, options) + TokenAuthenticatableStrategies::Insecure.new(model, field, options) end end diff --git a/app/models/concerns/token_authenticatable_strategies/encrypted.rb b/app/models/concerns/token_authenticatable_strategies/encrypted.rb index 8e052a3ef68..c23d78b050a 100644 --- a/app/models/concerns/token_authenticatable_strategies/encrypted.rb +++ b/app/models/concerns/token_authenticatable_strategies/encrypted.rb @@ -46,7 +46,7 @@ module TokenAuthenticatableStrategies raise ArgumentError unless token.present? instance[encrypted_field] = Gitlab::CryptoHelper.aes256_gcm_encrypt(token) - instance[token_field] = nil + fallback_strategy.set_token(instance, nil) if fallback? token end -- cgit v1.2.1