luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Fix small TtlPIcker2 bug (#17376) 

* fix

* add changelog

* wrong file name for changelog

* update from what core responded with re: type duration
This commit is contained in:
Angel Garbarino 2022-09-30 15:28:27 -07:00 committed by GitHub
parent 25f4cfac6b
commit 4cfd47d5fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/17376.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
ui: Remove default value of 30 to TtlPicker2 if no value is passed in.
```

1
ui/app/models/mfa-method.js
View File

@ -123,6 +123,7 @@ export default class MfaMethod extends Model {
editType: 'ttl',
helperTextEnabled: 'How long each generated TOTP is valid.',
hideToggle: true,
defaultValue: 30, // API accepts both an integer as seconds and sting with unit e.g 30 || '30s'
})
period;
@attr('number', {

1
ui/app/models/pki/pki-role-engine.js
View File

@ -41,6 +41,7 @@ export default class PkiRoleEngineModel extends Model {
'Also called the not_before_duration property. Allows certificates to be valid for a certain time period before now. This is useful to correct clock misalignment on various systems when setting up your CA.',
editType: 'ttl',
hideToggle: true,
defaultValue: '30s', // type in API is duration which accepts both an integer and string e.g. 30 || '30s'
})
notBeforeDuration;

5
ui/lib/core/addon/components/ttl-picker2.js
View File

@ -13,7 +13,7 @@
* @param helperTextDisabled="Allow tokens to be used indefinitely" {String} - This helper text is shown under the label when the toggle is switched off
* @param helperTextEnabled="Disable the use of the token after" {String} - This helper text is shown under the label when the toggle is switched on
* @param description="Longer description about this value, what it does, and why it is useful. Shows up in tooltip next to helpertext"
* @param time=30 {Number} - The time (in the default units) which will be adjustable by the user of the form
* @param time='' {Number} - The time (in the default units) which will be adjustable by the user of the form
* @param unit="s" {String} - This is the unit key which will show by default on the form. Can be one of `s` (seconds), `m` (minutes), `h` (hours), `d` (days)
* @param recalculationTimeout=5000 {Number} - This is the time, in milliseconds, that `recalculateSeconds` will be be true after time is updated
* @param initialValue=null {String} - This is the value set initially (particularly from a string like '30h')
@ -50,7 +50,7 @@ export default TtlForm.extend({
helperTextDisabled: 'Allow tokens to be used indefinitely',
helperTextEnabled: 'Disable the use of the token after',
description: '',
time: 30,
time: '', // if defaultValue is NOT set, then do not display a defaultValue.
unit: 's',
initialValue: null,
changeOnInit: false,
@ -62,6 +62,7 @@ export default TtlForm.extend({
const enable = this.initialEnabled;
const changeOnInit = this.changeOnInit;
// if initial value is unset use params passed in as defaults
// and if no defaultValue is passed in display no time
if (!value && value !== 0) {
return;
}