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

tech: add api_token_id to graphql logs

Browse source
This commit is contained in:
simon lehericey 2023-11-08 11:21:45 +01:00
parent a431287db0
commit 52752c95ec
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/graphql/api/v2/context.rb
View file

@ -61,7 +61,8 @@ class API::V2::Context < GraphQL::Query::Context
graphql_variables: query.provided_variables&.to_json, graphql_variables: query.provided_variables&.to_json,
graphql_mutation: mutation?, graphql_mutation: mutation?,
graphql_null_error: errors.any? { _1.is_a? GraphQL::InvalidNullError }.presence, graphql_null_error: errors.any? { _1.is_a? GraphQL::InvalidNullError }.presence,
graphql_timeout_error: errors.any? { _1.is_a? GraphQL::Schema::Timeout::TimeoutError }.presence graphql_timeout_error: errors.any? { _1.is_a? GraphQL::Schema::Timeout::TimeoutError }.presence,
graphql_api_token_id: self[:api_token_id]
}.compact }.compact
end end

1
app/models/api_token.rb
View file

@ -8,6 +8,7 @@ class APIToken < ApplicationRecord
def context def context
{ {
administrateur_id:, administrateur_id:,
api_token_id: id,
procedure_ids:, procedure_ids:,
write_access: write_access:
} }

14
spec/models/api_token_spec.rb
View file

@ -14,7 +14,7 @@ describe APIToken, type: :model do
expect(api_token.version).to eq(3) expect(api_token.version).to eq(3)
expect(api_token.write_access?).to eq(true) expect(api_token.write_access?).to eq(true)
expect(api_token.procedure_ids).to eq([]) expect(api_token.procedure_ids).to eq([])
expect(api_token.context).to eq(administrateur_id: administrateur.id, procedure_ids: [], write_access: true) expect(api_token.context).to eq(administrateur_id: administrateur.id, procedure_ids: [], write_access: true, api_token_id: api_token.id)
expect(api_token.full_access?).to be_truthy expect(api_token.full_access?).to be_truthy
end end
@ -22,7 +22,7 @@ describe APIToken, type: :model do
before { api_token.update(write_access: false) } before { api_token.update(write_access: false) }
it do it do
expect(api_token.context).to eq(administrateur_id: administrateur.id, procedure_ids: [], write_access: false) expect(api_token.context).to eq(administrateur_id: administrateur.id, procedure_ids: [], write_access: false, api_token_id: api_token.id)
end end
end end
@ -38,7 +38,7 @@ describe APIToken, type: :model do
expect(api_token.full_access?).to be_truthy expect(api_token.full_access?).to be_truthy
expect(api_token.procedure_ids).to eq([procedure.id]) expect(api_token.procedure_ids).to eq([procedure.id])
expect(api_token.procedures).to eq([procedure]) expect(api_token.procedures).to eq([procedure])
expect(api_token.context).to eq(administrateur_id: administrateur.id, procedure_ids: [procedure.id], write_access: true) expect(api_token.context).to eq(administrateur_id: administrateur.id, procedure_ids: [procedure.id], write_access: true, api_token_id: api_token.id)
end end
context 'and another procedure, but access only to the first one' do context 'and another procedure, but access only to the first one' do
@ -54,7 +54,7 @@ describe APIToken, type: :model do
expect(api_token.full_access?).to be_falsey expect(api_token.full_access?).to be_falsey
expect(api_token.procedure_ids).to match_array([procedure.id]) expect(api_token.procedure_ids).to match_array([procedure.id])
expect(api_token.targetable_procedures).to eq([other_procedure]) expect(api_token.targetable_procedures).to eq([other_procedure])
expect(api_token.context).to eq(administrateur_id: administrateur.id, procedure_ids: [procedure.id], write_access: true) expect(api_token.context).to eq(administrateur_id: administrateur.id, procedure_ids: [procedure.id], write_access: true, api_token_id: api_token.id)
end end
context 'and then gain full access' do context 'and then gain full access' do
@ -83,7 +83,7 @@ describe APIToken, type: :model do
expect(api_token.full_access?).to be_falsey expect(api_token.full_access?).to be_falsey
expect(api_token.procedure_ids).to eq([]) expect(api_token.procedure_ids).to eq([])
expect(api_token.targetable_procedures).to eq([procedure]) expect(api_token.targetable_procedures).to eq([procedure])
expect(api_token.context).to eq(administrateur_id: administrateur.id, procedure_ids: [], write_access: true) expect(api_token.context).to eq(administrateur_id: administrateur.id, procedure_ids: [], write_access: true, api_token_id: api_token.id)
end end
end end
@ -100,7 +100,7 @@ describe APIToken, type: :model do
expect(api_token.full_access?).to be_falsey expect(api_token.full_access?).to be_falsey
expect(api_token.procedure_ids).to eq([]) expect(api_token.procedure_ids).to eq([])
expect(api_token.targetable_procedures).to eq([]) expect(api_token.targetable_procedures).to eq([])
expect(api_token.context).to eq(administrateur_id: administrateur.id, procedure_ids: [], write_access: true) expect(api_token.context).to eq(administrateur_id: administrateur.id, procedure_ids: [], write_access: true, api_token_id: api_token.id)
end end
end end
@ -119,7 +119,7 @@ describe APIToken, type: :model do
expect(api_token.full_access?).to be_falsey expect(api_token.full_access?).to be_falsey
expect(api_token.procedure_ids).to eq([]) expect(api_token.procedure_ids).to eq([])
expect(api_token.targetable_procedures).to eq([other_procedure]) expect(api_token.targetable_procedures).to eq([other_procedure])
expect(api_token.context).to eq(administrateur_id: administrateur.id, procedure_ids: [], write_access: true) expect(api_token.context).to eq(administrateur_id: administrateur.id, procedure_ids: [], write_access: true, api_token_id: api_token.id)
end end
end end
end end