Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #15391 from edx/bexline/ent_authentication_flow

Browse Source 
ENT-447 Add ability to hide auth warnings for enterprise context.
This commit is contained in:
Brittney Exline
2017-06-23 15:55:03 -04:00
committed by GitHub
parent 4766d18a4c 611af39d53
commit cc460bbb0d
5 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lms/static/js/student_account/views/AccessView.js
View File

@@ -74,6 +74,7 @@
this.supportURL = options.support_link;
this.passwordResetSupportUrl = options.password_reset_support_link;
this.createAccountOption = options.account_creation_allowed;
this.hideAuthWarnings = options.hide_auth_warnings || false;
// The login view listens for 'sync' events from the reset model
this.resetModel = new PasswordResetModel({}, {
@@ -131,7 +132,8 @@
platformName: this.platformName,
supportURL: this.supportURL,
passwordResetSupportUrl: this.passwordResetSupportUrl,
createAccountOption: this.createAccountOption
createAccountOption: this.createAccountOption,
hideAuthWarnings: this.hideAuthWarnings
});
// Listen for 'password-help' event to toggle sub-views
@@ -167,7 +169,8 @@
fields: data.fields,
model: model,
thirdPartyAuth: this.thirdPartyAuth,
platformName: this.platformName
platformName: this.platformName,
hideAuthWarnings: this.hideAuthWarnings
});
// Listen for 'auth-complete' event so we can enroll/redirect the user appropriately.

7
lms/static/js/student_account/views/LoginView.js
View File

@@ -48,6 +48,7 @@
this.passwordResetSupportUrl = data.passwordResetSupportUrl;
this.createAccountOption = data.createAccountOption;
this.accountActivationMessages = data.accountActivationMessages;
this.hideAuthWarnings = data.hideAuthWarnings;
this.listenTo(this.model, 'sync', this.saveSuccess);
this.listenTo(this.resetModel, 'sync', this.resetEmail);
@@ -193,8 +194,10 @@
if (error.status === 403 &&
error.responseText === 'third-party-auth' &&
this.currentProvider) {
this.clearFormErrors();
this.renderAuthWarning();
if (!this.hideAuthWarnings) {
this.clearFormErrors();
this.renderAuthWarning();
}
} else {
this.renderErrors(this.defaultFormErrorsTitle, this.errors);
}

3
lms/static/js/student_account/views/RegisterView.js
View File

@@ -37,6 +37,7 @@
this.errorMessage = data.thirdPartyAuth.errorMessage || '';
this.platformName = data.platformName;
this.autoSubmit = data.thirdPartyAuth.autoSubmitRegForm;
this.hideAuthWarnings = data.hideAuthWarnings;
this.listenTo(this.model, 'sync', this.saveSuccess);
},
@@ -63,7 +64,7 @@
// Must be called after postRender, since postRender sets up $formFeedback.
if (this.errorMessage) {
this.renderErrors(formErrorsTitle, [this.errorMessage]);
} else if (this.currentProvider) {
} else if (this.currentProvider && !this.hideAuthWarnings) {
this.renderAuthWarning();
}