diff --git a/app/controllers/internal_controller.rb b/app/controllers/internal_controller.rb index f0b6bade..83bca757 100644 --- a/app/controllers/internal_controller.rb +++ b/app/controllers/internal_controller.rb @@ -8,7 +8,7 @@ class InternalController < ApplicationController def validate_token service_token = request.headers['X-WCA-Service-Token'] unless service_token.present? - return render json: { error: "Missing Authentication" }, status: :forbidden + return render json: { error: 'Missing Authentication' }, status: :forbidden end # The Vault CLI can't parse the response from identity/oidc/introspect so # we need to request it instead see https://github.com/hashicorp/vault/issues/9080 @@ -25,8 +25,8 @@ def validate_token headers: { 'X-Vault-Token' => vault_token_data[:id], 'Content-Type' => 'application/json' }) if response.ok? - unless response["active"] - render json: { error: "Authentication Expired or Token Invalid" }, status: :forbidden + unless response['active'] + render json: { error: 'Authentication Expired or Token Invalid' }, status: :forbidden end else raise "Introspection failed with the following error: #{response.status}, #{response.body}" @@ -41,6 +41,6 @@ def update_payment_status payment_status = params.require(:payment_status) registration = Registration.find(attendee_id) registration.update_payment_lane(payment_id, iso_amount, currency_iso, payment_status) - render json: { status: "ok" } + render json: { status: 'ok' } end -end \ No newline at end of file +end diff --git a/app/helpers/lane_factory.rb b/app/helpers/lane_factory.rb index d8cd5a30..88f1e062 100644 --- a/app/helpers/lane_factory.rb +++ b/app/helpers/lane_factory.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require 'time' class LaneFactory @@ -25,7 +26,7 @@ def self.payment_lane(fee_lowest_denominator, currency_code, payment_id) payment_id: payment_id, currency_code: currency_code, last_updated: Time.now, - payment_history: [] + payment_history: [], } payment_lane end diff --git a/app/models/registration.rb b/app/models/registration.rb index c4e01277..9566c8a2 100644 --- a/app/models/registration.rb +++ b/app/models/registration.rb @@ -117,17 +117,17 @@ def update_payment_lane(id, iso_amount, currency_iso, status) # TODO: Should we only add payments to the payment_history # if there is a new payment_id? lane.lane_details['payment_history'].append({ - status: lane.lane_state, - payment_id: old_details["payment_id"], - currency_code: old_details["currency_code"], - amount_lowest_denominator: old_details["amount_lowest_denominator"], - last_updated: old_details["last_updated"] - }) + status: lane.lane_state, + payment_id: old_details['payment_id'], + currency_code: old_details['currency_code'], + amount_lowest_denominator: old_details['amount_lowest_denominator'], + last_updated: old_details['last_updated'], + }) lane.lane_state = status - lane.lane_details["payment_id"] = id - lane.lane_details["amount_lowest_denominator"] = iso_amount - lane.lane_details["currency_code"] = currency_iso - lane.lane_details["last_updated"] = Time.now + lane.lane_details['payment_id'] = id + lane.lane_details['amount_lowest_denominator'] = iso_amount + lane.lane_details['currency_code'] = currency_iso + lane.lane_details['last_updated'] = Time.now end lane end