kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Updating OAuthRememberMe to use new common utility functions when manipulating query parameters on OAuth buttons. This ensures the 'remember_me' parameter is safely added and removed when other query parameters are present.

Browse source
This commit is contained in:
Scott Escue 2018-06-04 16:30:59 -05:00 committed by Mike Greiling
parent 4dcaa4df36
commit 6b067fe470
No known key found for this signature in database
GPG key ID: 0303DF507FA67596
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/pages/sessions/new/oauth_remember_me.js
View file

@ -1,4 +1,5 @@
import $ from 'jquery';
import { setUrlParam, removeUrlParam } from '~/lib/utils/common_utils';
/**
* OAuth-based login buttons have a separate "remember me" checkbox.
@ -24,9 +25,9 @@ export default class OAuthRememberMe {
const href = $(element).attr('href');
if (rememberMe) {
$(element).attr('href', `${href}?remember_me=1`);
$(element).attr('href', setUrlParam(href, 'remember_me', 1));
} else {
$(element).attr('href', href.replace('?remember_me=1', ''));
$(element).attr('href', removeUrlParam(href, 'remember_me'));
}
});
}

1
spec/javascripts/fixtures/oauth_remember_me.html.haml
View file

@ -3,3 +3,4 @@
%a.oauth-login.twitter{ href: "http://example.com/" }
%a.oauth-login.github{ href: "http://example.com/" }
%a.oauth-login.facebook{ href: "http://example.com/?redirect_fragment=L1" }

5
spec/javascripts/oauth_remember_me_spec.js
View file

@ -20,6 +20,10 @@ describe('OAuthRememberMe', () => {
expect($('#oauth-container .oauth-login.github').attr('href')).toBe(
'http://example.com/?remember_me=1',
);
expect($('#oauth-container .oauth-login.facebook').attr('href')).toBe(
'http://example.com/?redirect_fragment=L1&remember_me=1'
);
});
it('removes the "remember_me" query parameter from all OAuth login buttons', () => {
@ -28,5 +32,6 @@ describe('OAuthRememberMe', () => {
expect($('#oauth-container .oauth-login.twitter').attr('href')).toBe('http://example.com/');
expect($('#oauth-container .oauth-login.github').attr('href')).toBe('http://example.com/');
expect($('#oauth-container .oauth-login.facebook').attr('href')).toBe('http://example.com/?redirect_fragment=L1');
});
});