[Reset Password v1] Make auto enrollment required when enabled (#1047)
This commit is contained in:
parent
41ad5aa26d
commit
cc2b717d6b
|
@ -57,7 +57,10 @@ export class OrganizationsComponent implements OnInit {
|
|||
|
||||
allowEnrollmentChanges(org: Organization): boolean {
|
||||
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;
|
||||
|
|
|
@ -3947,13 +3947,13 @@
|
|||
"message": "Automatic Enrollment"
|
||||
},
|
||||
"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": {
|
||||
"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": {
|
||||
"message": "Automatically enroll new users"
|
||||
"message": "Require new users to be enrolled automatically"
|
||||
},
|
||||
"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."
|
||||
|
|
Loading…
Reference in New Issue