Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refractor/tomato to sofia #947

Merged
merged 6 commits into from
Nov 27, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ $ EDITOR="code --wait" bundle exec rails credentials:edit
In OAuth AMBER (github.com/csvalpha/amber-api), execute the following command (in `rails console`):

```ruby
app = Doorkeeper::Application.create(name: 'SOFIA - Streepsysteem der C.S.V. Alpha', redirect_uri: 'http://localhost:5000/users/auth/amber_oauth2/callback', scopes: 'public tomato')
app = Doorkeeper::Application.create(name: 'SOFIA - Streepsysteem der C.S.V. Alpha', redirect_uri: 'http://localhost:5000/users/auth/amber_oauth2/callback', scopes: 'public sofia')
app.uid
app.plaintext_secret
```
Expand Down
2 changes: 1 addition & 1 deletion app/models/payment.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def self.create_with_mollie(description, attributes = nil)
mollie_payment = Mollie::Payment.create(
amount: { value: format('%<amount>.2f', amount: attributes[:amount]), currency: 'EUR' },
description: description,
redirect_url: "http://#{Rails.application.config.x.tomato_host}/payments/#{obj.id}/callback"
redirect_url: "http://#{Rails.application.config.x.sofia_host}/payments/#{obj.id}/callback"
)

obj.update(mollie_id: mollie_payment.id)
Expand Down
4 changes: 2 additions & 2 deletions app/views/partials/_footer.html.erb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<footer class="footer d-flex justify-content-between">
<span class="text-danger text-uppercase fw-bold mx-2">
<% if Rails.application.config.x.tomato_host == 'stagingstreep.csvalpha.nl' %>
<% if Rails.application.config.x.sofia_host == 'stagingstreep.csvalpha.nl' %>
For demo and testing purposes only
<% elsif Rails.application.config.x.tomato_host != 'streep.csvalpha.nl' %>
<% elsif Rails.application.config.x.sofia_host != 'streep.csvalpha.nl' %>
Development mode
<% end %>
</span>
Expand Down
4 changes: 2 additions & 2 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ class Application < Rails::Application
Rails.env.to_sym, :amber_client_secret
) || ENV.fetch('AMBER_CLIENT_SECRET', nil)

config.x.amber_host = credentials.dig(Rails.env.to_sym, :amber_host)
config.x.tomato_host = credentials.dig(Rails.env.to_sym, :tomato_host)
config.x.amber_host = credentials.dig(Rails.env.to_sym, :amber_host)
config.x.sofia_host = credentials.dig(Rails.env.to_sym, :sofia_host)

config.x.slack_webhook = credentials.dig(Rails.env.to_sym, :slack_webhook) || ''
config.x.slack_channel = '#monitoring'
Expand Down
2 changes: 1 addition & 1 deletion config/credentials.yml.enc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
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--G8VsFkH0hWoT5VZb--aeMXLt0yLUV+0ugJCIv8TQ==
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--32WLAptEbUz5grLv--qA/GkDJDSgWC8w1geJYPRw==
2 changes: 1 addition & 1 deletion config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
# config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')

config.action_mailer.default_url_options = {
scheme: 'https', host: Rails.application.config.x.tomato_host
scheme: 'https', host: Rails.application.config.x.sofia_host
}

config.action_mailer.delivery_method = :smtp
Expand Down
2 changes: 1 addition & 1 deletion lib/omniauth/strategies/amber_oauth2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class AmberOauth2 < OmniAuth::Strategies::OAuth2

def authorize_params
params = super
params[:scope] = 'public tomato'
params[:scope] = 'public tomato sofia'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it necessary to keep tomato here? just asking, I genuinely don't know

params
end

Expand Down
Loading