Commit 5eff5bf9526d3a723233540437a57027352c2d31
1 parent
dd90e51d
Exists in
staging
and in
4 other branches
oauth_client: fix login with disabled provider
Showing
1 changed file
with
2 additions
and
1 deletions
Show diff stats
plugins/oauth_client/controllers/public/oauth_client_plugin_public_controller.rb
| @@ -36,7 +36,8 @@ class OauthClientPluginPublicController < PublicController | @@ -36,7 +36,8 @@ class OauthClientPluginPublicController < PublicController | ||
| 36 | unless user_provider | 36 | unless user_provider |
| 37 | user_provider = user.oauth_user_providers.create(:user => user, :provider => provider, :enabled => true) | 37 | user_provider = user.oauth_user_providers.create(:user => user, :provider => provider, :enabled => true) |
| 38 | end | 38 | end |
| 39 | - if user_provider.enabled? && provider.enabled? | 39 | + # FIXME find a better way to disable providers |
| 40 | + if user_provider.enabled?# && provider.enabled? | ||
| 40 | session[:user] = user.id | 41 | session[:user] = user.id |
| 41 | else | 42 | else |
| 42 | session[:notice] = _("Can't login with #{provider.name}") | 43 | session[:notice] = _("Can't login with #{provider.name}") |