diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-11-14 14:58:11 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-11-14 14:58:11 +0100 |
| commit | c04f56d3b449ed3cc9b3ecc611fe0bd663d1ee41 (patch) | |
| tree | f288efbee89e7ffd296a89d54a33abdfd0adbd43 /app/models/concerns/token_authenticatable_strategies | |
| parent | ce22c7e10ffeb86f1dc6322521b281057d43e2aa (diff) | |
| download | gitlab-ce-c04f56d3b449ed3cc9b3ecc611fe0bd663d1ee41.tar.gz | |
Add specs scaffold for encrypted token authenticatable
Diffstat (limited to 'app/models/concerns/token_authenticatable_strategies')
| -rw-r--r-- | app/models/concerns/token_authenticatable_strategies/encrypted.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/concerns/token_authenticatable_strategies/encrypted.rb b/app/models/concerns/token_authenticatable_strategies/encrypted.rb index a9ecc10cee6..e2a5a973d4f 100644 --- a/app/models/concerns/token_authenticatable_strategies/encrypted.rb +++ b/app/models/concerns/token_authenticatable_strategies/encrypted.rb @@ -20,7 +20,8 @@ module TokenAuthenticatableStrategies def get_token(instance) raw_token = instance.read_attribute(encrypted_field) token = Gitlab::CryptoHelper.aes256_gcm_decrypt(raw_token) - token ||= fallback_strategy.get_token(instance) if fallback? + + token || (fallback_strategy.get_token(instance) if fallback?) end def set_token(instance, token) |