summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2017-06-07 08:45:34 +0000
committerTimothy Andrew <mail@timothyandrew.net>2017-07-03 16:25:10 +0000
commit5b649ac64dc2a987e2bede544dd13c1fab2d55a4 (patch)
treef60fc3328d8205cdfd4d296152dae97734c517f9 /app
parentc8eef2d2a62f6ac7304c8ab4d50282613e21ec8a (diff)
downloadgitlab-ce-5b649ac64dc2a987e2bede544dd13c1fab2d55a4.tar.gz
Implement "remember me" for OAuth-based login.
- Pass a `remember_me` query parameter along with the initial OAuth request, and pick this parameter up during the omniauth callback from request.env['omniauth.params']` - For 2FA-based login, copy the `remember_me` param from `omniauth.params` to `params`, which the 2FA process will pick up. - For non-2FA-based login, simply call the `remember_me` devise method to set the session cookie.
Diffstat (limited to 'app')
-rw-r--r--app/controllers/omniauth_callbacks_controller.rb8
-rw-r--r--app/views/devise/shared/_omniauth_box.html.haml19
2 files changed, 26 insertions, 1 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index b82681b197e..c5adadfa529 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -1,5 +1,6 @@
class OmniauthCallbacksController < Devise::OmniauthCallbacksController
include AuthenticatesWithTwoFactor
+ include Devise::Controllers::Rememberable
protect_from_forgery except: [:kerberos, :saml, :cas3]
@@ -115,8 +116,10 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
if @user.persisted? && @user.valid?
log_audit_event(@user, with: oauth['provider'])
if @user.two_factor_enabled?
+ params[:remember_me] = '1' if remember_me?
prompt_for_two_factor(@user)
else
+ remember_me(@user) if remember_me?
sign_in_and_redirect(@user)
end
else
@@ -147,4 +150,9 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
AuditEventService.new(user, user, options)
.for_authentication.security_event
end
+
+ def remember_me?
+ request_params = request.env['omniauth.params']
+ request_params['remember_me'] == '1'
+ end
end
diff --git a/app/views/devise/shared/_omniauth_box.html.haml b/app/views/devise/shared/_omniauth_box.html.haml
index f92f89e73ff..acb38c300b9 100644
--- a/app/views/devise/shared/_omniauth_box.html.haml
+++ b/app/views/devise/shared/_omniauth_box.html.haml
@@ -6,4 +6,21 @@
- providers.each do |provider|
%span.light
- has_icon = provider_has_icon?(provider)
- = link_to provider_image_tag(provider), omniauth_authorize_path(:user, provider), method: :post, class: (has_icon ? 'oauth-image-link' : 'btn')
+ = link_to provider_image_tag(provider), omniauth_authorize_path(:user, provider), method: :post, class: 'oauth-login' + (has_icon ? ' oauth-image-link' : ' btn')
+ %fieldset
+ = check_box_tag :remember_me
+ = label_tag :remember_me, "Remember Me"
+
+:javascript
+ $("#remember_me").click(function(event){
+ var rememberMe = $(event.target).is(":checked");
+ $(".oauth-login").each(function(i, element) {
+ var href = $(element).attr('href');
+
+ if (rememberMe) {
+ $(element).attr('href', href + '?remember_me=1');
+ } else {
+ $(element).attr('href', href.replace('?remember_me=1', ''));
+ }
+ });
+ });