Skip to content

Commit 50e2ea9

Browse files
committed
Try to patch omniauth host uri
1 parent 461dadd commit 50e2ea9

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

app/controllers/application_controller.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ def set_sss_id_for_user
3838
def default_url_options(options={})
3939
{
4040
locale: I18n.locale,
41-
host: ENV["HACK_URI"] || ENV["LAYERS_API_URI"] || options[:host],
4241
}.merge options
4342
end
4443

@@ -73,7 +72,7 @@ def force_authenticate_and_redirect_back
7372
end
7473
end
7574
end
76-
redirect_to user_omniauth_authorize_path(:learning_layers_oidc)
75+
redirect_to user_omniauth_authorize_url(:learning_layers_oidc, protocol: 'https')
7776
true
7877
else
7978
false

app/views/layouts/application.html.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@
7777
<% if Rails.env.production? %>
7878
<%#= link_to t('sign_in.learning_layers'), user_omniauth_authorize_url(:learning_layers_oidc, protocol: 'https'), class: "mdl-navigation__link" %>
7979
<%#= Temporarily don't redirect to HTTPS %>
80-
<%= link_to t('sign_in.learning_layers'), user_omniauth_authorize_path(:learning_layers_oidc), class: "mdl-navigation__link" %>
80+
<%= link_to t('sign_in.learning_layers'), user_omniauth_authorize_url(:learning_layers_oidc), class: "mdl-navigation__link" %>
8181
<% else %>
82-
<%= link_to t('sign_in.developer'), user_omniauth_authorize_path(:developer), class: "mdl-navigation__link" %>
82+
<%= link_to t('sign_in.developer'), user_omniauth_authorize_url(:developer), class: "mdl-navigation__link" %>
8383
<% end %>
8484

8585
<% end %>

config/environments/production.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@
8181
config.active_record.dump_schema_after_migration = false
8282
end
8383

84-
Rails.application.routes.default_url_options[:host] = 'achrails.herokuapp.com'
84+
Rails.application.routes.default_url_options[:host] = ENV["HACK_URI"] || ENV["LAYERS_API_URI"]
85+
Rails.application.routes.default_url_options[:port] = 80
8586

8687
ActionMailer::Base.smtp_settings = {
8788
address: 'smtp.sendgrid.net',
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
if Rails.env.production?
2+
module OmniAuth
3+
module Strategy
4+
def full_host
5+
ENV["HACK_URI"] || ENV["LAYERS_API_URI"]
6+
end
7+
end
8+
end
9+
end

0 commit comments

Comments
 (0)