DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

rename find_and_verify => authenticate

Browse source
This commit is contained in:
simon lehericey 2023-08-03 15:27:33 +02:00
parent 87933d3567
commit 40ed59a231
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api/v2/base_controller.rb
View file

@ -33,7 +33,7 @@ class API::V2::BaseController < ApplicationController
def api_token def api_token
if @api_token.nil? if @api_token.nil?
@api_token = APIToken @api_token = APIToken
.find_and_verify(authorization_bearer_token) .authenticate(authorization_bearer_token)
&.tap { _1.touch(:last_v2_authenticated_at) } || false &.tap { _1.touch(:last_v2_authenticated_at) } || false
end end
@api_token @api_token

2
app/controllers/api_controller.rb
View file

@ -4,7 +4,7 @@ class APIController < ApplicationController
protected protected
def find_administrateur_for_token(procedure) def find_administrateur_for_token(procedure)
api_token = APIToken.find_and_verify(authorization_bearer_token) api_token = APIToken.authenticate(authorization_bearer_token)
if api_token.present? && api_token.context.fetch(:procedure_ids).include?(procedure.id) if api_token.present? && api_token.context.fetch(:procedure_ids).include?(procedure.id)
api_token.touch(:last_v1_authenticated_at) api_token.touch(:last_v1_authenticated_at)
api_token.administrateur api_token.administrateur

2
app/models/api_token.rb
View file

@ -55,7 +55,7 @@ class APIToken < ApplicationRecord
[api_token, bearer.to_string] [api_token, bearer.to_string]
end end
def find_and_verify(bearer_string) def authenticate(bearer_string)
bearer = BearerToken.from_string(bearer_string) bearer = BearerToken.from_string(bearer_string)
return if bearer.nil? return if bearer.nil?

4
spec/models/api_token_spec.rb
View file

@ -107,13 +107,13 @@ describe APIToken, type: :model do
end end
end end
describe '#find_and_verify' do describe '#authenticate' do
let(:api_token_and_packed_token) { APIToken.generate(administrateur) } let(:api_token_and_packed_token) { APIToken.generate(administrateur) }
let(:api_token) { api_token_and_packed_token.first } let(:api_token) { api_token_and_packed_token.first }
let(:packed_token) { api_token_and_packed_token.second } let(:packed_token) { api_token_and_packed_token.second }
let(:bearer_token) { packed_token } let(:bearer_token) { packed_token }
subject { APIToken.find_and_verify(bearer_token) } subject { APIToken.authenticate(bearer_token) }
context 'with the legit packed token' do context 'with the legit packed token' do
it { is_expected.to eq(api_token) } it { is_expected.to eq(api_token) }