[Reset Password v1] Make auto enrollment required when enabled (#1047)

This commit is contained in:
Vincent Salucci 2021-07-09 13:24:59 -05:00 committed by GitHub
parent 41ad5aa26d
commit cc2b717d6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions

View File

@ -57,7 +57,10 @@ export class OrganizationsComponent implements OnInit {
allowEnrollmentChanges(org: Organization): boolean { allowEnrollmentChanges(org: Organization): boolean {
if (org.usePolicies && org.useResetPassword && org.hasPublicAndPrivateKeys) { if (org.usePolicies && org.useResetPassword && org.hasPublicAndPrivateKeys) {
return this.policies.some(p => p.organizationId === org.id && p.enabled); const policy = this.policies.find(p => p.organizationId === org.id);
if (policy != null && policy.enabled) {
return org.resetPasswordEnrolled && policy.data.autoEnrollEnabled ? false : true;
}
} }
return false; return false;

View File

@ -3947,13 +3947,13 @@
"message": "Automatic Enrollment" "message": "Automatic Enrollment"
}, },
"resetPasswordPolicyAutoEnrollDescription": { "resetPasswordPolicyAutoEnrollDescription": {
"message": "All users will be automatically enrolled in password reset once their invite is accepted." "message": "All users will be automatically enrolled in password reset once their invite is accepted and will not be allowed to withdraw."
}, },
"resetPasswordPolicyAutoEnrollWarning": { "resetPasswordPolicyAutoEnrollWarning": {
"message": "Users already in the organization will not be retroactively enrolled in password reset. They will need to self-enroll before administrators can reset their master password." "message": "Users already in the organization will not be retroactively enrolled in password reset. They will need to self-enroll before administrators can reset their master password."
}, },
"resetPasswordPolicyAutoEnrollCheckbox": { "resetPasswordPolicyAutoEnrollCheckbox": {
"message": "Automatically enroll new users" "message": "Require new users to be enrolled automatically"
}, },
"resetPasswordAutoEnrollInviteWarning": { "resetPasswordAutoEnrollInviteWarning": {
"message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password." "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."