Skip to content

Fix hiding of fields in authorization source page (#10734) #10752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 19, 2020
Merged

Fix hiding of fields in authorization source page (#10734) #10752

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ae314d
FIx hiding of fields in authorization source page (#10734)
lafriks Mar 17, 2020
8458b6a
Merge branch 'release/v1.11' into backport/fix/auth_source_fields
lafriks Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions web_src/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1886,18 +1886,11 @@ function initAdmin() {
$('.oauth2_use_custom_url_field input[required]').removeAttr('required');

if ($('#oauth2_use_custom_url').is(':checked')) {
if (!$('#oauth2_token_url').val()) {
$('#oauth2_token_url').val($(`#${provider}_token_url`).val());
}
if (!$('#oauth2_auth_url').val()) {
$('#oauth2_auth_url').val($(`#${provider}_auth_url`).val());
}
if (!$('#oauth2_profile_url').val()) {
$('#oauth2_profile_url').val($(`#${provider}_profile_url`).val());
}
if (!$('#oauth2_email_url').val()) {
$('#oauth2_email_url').val($(`#${provider}_email_url`).val());
}
$('#oauth2_token_url').val($(`#${provider}_token_url`).val());
$('#oauth2_auth_url').val($(`#${provider}_auth_url`).val());
$('#oauth2_profile_url').val($(`#${provider}_profile_url`).val());
$('#oauth2_email_url').val($(`#${provider}_email_url`).val());

switch (provider) {
case 'github':
$('.oauth2_token_url input, .oauth2_auth_url input, .oauth2_profile_url input, .oauth2_email_url input').attr('required', 'required');
Expand All @@ -1916,7 +1909,7 @@ function initAdmin() {
// New authentication
if ($('.admin.new.authentication').length > 0) {
$('#auth_type').change(function () {
$('.ldap, .dldap, .smtp, .pam, .oauth2, .has-tls .search-page-size .sspi').hide();
$('.ldap, .dldap, .smtp, .pam, .oauth2, .has-tls, .search-page-size, .sspi').hide();

$('.ldap input[required], .binddnrequired input[required], .dldap input[required], .smtp input[required], .pam input[required], .oauth2 input[required], .has-tls input[required], .sspi input[required]').removeAttr('required');
$('.binddnrequired').removeClass('required');
Expand Down