Merge pull request #347 from eandersson/allow_password-_-

Allow the password... password
This commit is contained in:
Skot 2024-09-24 18:24:55 -05:00 committed by GitHub
commit 0c361e474b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 8 deletions

View File

@ -147,10 +147,10 @@ export class EditComponent implements OnInit {
Validators.max(65353)
]],
stratumUser: [info.stratumUser, [Validators.required]],
stratumPassword: ['password', [Validators.required]],
stratumPassword: ['*****', [Validators.required]],
hostname: [info.hostname, [Validators.required]],
ssid: [info.ssid, [Validators.required]],
wifiPass: ['password'],
wifiPass: ['*****'],
coreVoltage: [info.coreVoltage, [Validators.required]],
frequency: [info.frequency, [Validators.required]],
autofanspeed: [info.autofanspeed == 1, [Validators.required]],
@ -187,10 +187,13 @@ export class EditComponent implements OnInit {
const form = this.form.getRawValue();
if (form.wifiPass === 'password') {
// Allow an empty wifi password
form.wifiPass = form.wifiPass == null ? '' : form.wifiPass;
if (form.wifiPass === '*****') {
delete form.wifiPass;
}
if (form.stratumPassword === 'password') {
if (form.stratumPassword === '*****') {
delete form.stratumPassword;
}

View File

@ -70,9 +70,9 @@ export class SettingsComponent {
Validators.max(65353)
]],
stratumUser: [info.stratumUser, [Validators.required]],
stratumPassword: ['password', [Validators.required]],
stratumPassword: ['*****', [Validators.required]],
ssid: [info.ssid, [Validators.required]],
wifiPass: ['password'],
wifiPass: ['*****'],
coreVoltage: [info.coreVoltage, [Validators.required]],
frequency: [info.frequency, [Validators.required]],
autofanspeed: [info.autofanspeed == 1, [Validators.required]],
@ -116,10 +116,13 @@ export class SettingsComponent {
form.invertfanpolarity = form.invertfanpolarity == true ? 1 : 0;
form.autofanspeed = form.autofanspeed == true ? 1 : 0;
if (form.wifiPass === 'password') {
// Allow an empty wifi password
form.wifiPass = form.wifiPass == null ? '' : form.wifiPass;
if (form.wifiPass === '*****') {
delete form.wifiPass;
}
if (form.stratumPassword === 'password') {
if (form.stratumPassword === '*****') {
delete form.stratumPassword;
}