Compare commits

..

No commits in common. "812700248e0170bb0c3d1e00f60185760ce21735" and "7f4c34ff6aad2fa949e2d7456ab0c844fa8c615d" have entirely different histories.

5 changed files with 4 additions and 9 deletions

View file

@ -1,15 +1,10 @@
<h2>Log in</h2>
<% if @can_use_neopass %>
🌟✨🌟✨🌟✨🌟✨🌟
<br />
<%= button_to "Log in with NeoPass",
auth_user_neopass_omniauth_authorize_path,
data: {turbo: false} # Turbo can't handle this redirect!
%>
🌟✨🌟✨🌟✨🌟✨🌟
<br />
<br />
<% end %>
<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>

View file

@ -125,5 +125,5 @@ Rails.application.configure do
# Set the NeoPass redirect callback URL.
config.neopass_redirect_uri =
"http://localhost:3000/users/auth/neopass/callback"
"http://localhost:3000/auth_users/auth/neopass/callback"
end

View file

@ -144,5 +144,5 @@ Rails.application.configure do
# Set the NeoPass redirect callback URL.
config.neopass_redirect_uri =
"https://impress.openneo.net/users/auth/neopass/callback"
"https://impress.openneo.net/auth_users/auth/neopass/callback"
end

View file

@ -80,5 +80,5 @@ Rails.application.configure do
# Set the NeoPass redirect callback URL.
config.neopass_redirect_uri =
"http://localhost:3000/users/auth/neopass/callback"
"http://localhost:3000/auth_users/auth/neopass/callback"
end

View file

@ -2,7 +2,7 @@ OpenneoImpressItems::Application.routes.draw do
root :to => 'outfits#new'
# Login and account management!
devise_for :auth_users, path: "users"
devise_for :auth_users
# The outfit editor!
# TODO: It's a bit silly that outfits/new points to outfits#edit.