Skip to content

Commit 7fc548f

Browse files
committed
recreated definitions
1 parent 6a13cb2 commit 7fc548f

File tree

2 files changed

+0
-22
lines changed

2 files changed

+0
-22
lines changed

src/Options/Definitions.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -746,26 +746,14 @@ module.exports.PasswordPolicyOptions = {
746746
resetTokenReuseIfValid: {
747747
env: 'PARSE_SERVER_PASSWORD_POLICY_RESET_TOKEN_REUSE_IF_VALID',
748748
help:
749-
<<<<<<< HEAD
750-
<<<<<<< HEAD
751749
'Set to `true` if a password reset token should be reused in case another token is requested but there is a token that is still valid, i.e. has not expired. This avoids the often observed issue that a user requests multiple emails and does not know which link contains a valid token because each newly generated token would invalidate the previous token.<br><br>Default is `false`.',
752-
=======
753-
'Reuse password reset token if it has not expired; requires `resetTokenValidityDuration` to be set. Default is `false`.',
754-
>>>>>>> improved resetTokenReuseIfValid docs
755-
=======
756-
'Is true if the password reset token should be reused if it has not expired; requires `resetTokenValidityDuration` to be set. Default is `false`.',
757-
>>>>>>> improved resetTokenValidityDuration docs
758750
action: parsers.booleanParser,
759751
default: false,
760752
},
761753
resetTokenValidityDuration: {
762754
env: 'PARSE_SERVER_PASSWORD_POLICY_RESET_TOKEN_VALIDITY_DURATION',
763755
help:
764-
<<<<<<< HEAD
765756
'Set the validity duration of the password reset token in seconds after which the token expires. The token is used in the link that is set in the email. After the token expires, the link becomes invalid and a new link has to be sent. If the option is not set or set to `undefined`, then the token never expires.<br><br>For example, to expire the token after 2 hours, set a value of 7200 seconds (= 60 seconds * 60 minutes * 2 hours).<br><br>Default is `undefined`.',
766-
=======
767-
'The time duration in seconds after which a password reset token expires and becomes invalid. Default is indefinite (never expires).',
768-
>>>>>>> improved resetTokenValidityDuration docs
769757
action: parsers.numberParser('resetTokenValidityDuration'),
770758
},
771759
validationError: {

src/Options/docs.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@
173173

174174
/**
175175
* @interface PasswordPolicyOptions
176-
<<<<<<< HEAD
177176
* @property {Boolean} doNotAllowUsername Set to `true` to disallow the username as part of the password.<br><br>Default is `false`.
178177
* @property {Number} maxPasswordAge Set the number of days after which a password expires. Login attempts fail if the user does not reset the password before expiration.
179178
* @property {Number} maxPasswordHistory Set the number of previous password that will not be allowed to be set as new password. If the option is not set or set to `0`, no previous passwords will be considered.<br><br>Valid values are >= `0` and <= `20`.<br>Default is `0`.
@@ -182,15 +181,6 @@
182181
* @property {String} validationError Set the error message to be sent.<br><br>Default is `Password does not meet the Password Policy requirements.`
183182
* @property {Function} validatorCallback Set a callback function to validate a password to be accepted.<br><br>If used in combination with `validatorPattern`, the password must pass both to be accepted.
184183
* @property {String} validatorPattern Set the regular expression validation pattern a password must match to be accepted.<br><br>If used in combination with `validatorCallback`, the password must pass both to be accepted.
185-
=======
186-
* @property {Boolean} doNotAllowUsername disallow username in passwords
187-
* @property {Number} maxPasswordAge days for password expiry
188-
* @property {Number} maxPasswordHistory setting to prevent reuse of previous n passwords
189-
* @property {Boolean} resetTokenReuseIfValid Is true if the password reset token should be reused if it has not expired; requires `resetTokenValidityDuration` to be set. Default is `false`.
190-
* @property {Number} resetTokenValidityDuration The time duration in seconds after which a password reset token expires and becomes invalid. Default is indefinite (never expires).
191-
* @property {Function} validatorCallback a callback function to be invoked to validate the password
192-
* @property {String} validatorPattern a RegExp object or a regex string representing the pattern to enforce
193-
>>>>>>> improved resetTokenReuseIfValid docs
194184
*/
195185

196186
/**

0 commit comments

Comments
 (0)