dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: Minor fix style and fix signing key validation

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2022-11-15 11:29:12 +02:00
parent 581af4da0f
commit 4d97b355d3
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui-ngx/src/app/modules/home/pages/admin/security-settings.component.html
View File

@ -180,6 +180,7 @@
<mat-label translate>admin.jwt.signings-key</mat-label> <mat-label translate>admin.jwt.signings-key</mat-label>
<input matInput (focus)="markAsTouched()" required formControlName="tokenSigningKey"/> <input matInput (focus)="markAsTouched()" required formControlName="tokenSigningKey"/>
<button type="button" <button type="button"
style="line-height: 32px"
matSuffix matSuffix
mat-button mat-button
(click)="generateSigningKey()" (click)="generateSigningKey()"

5
ui-ngx/src/app/modules/home/pages/admin/security-settings.component.ts
View File

@ -172,9 +172,12 @@ export class SecuritySettingsComponent extends PageComponent implements HasConfi
} }
private base64Format(control: FormControl): { [key: string]: boolean } | null { private base64Format(control: FormControl): { [key: string]: boolean } | null {
if (control.value === '' || control.value === 'thingsboardDefaultSigningKey') {
return null;
}
try { try {
const value = atob(control.value); const value = atob(control.value);
if (value.length < 32 && control.value !== 'thingsboardDefaultSigningKey') { if (value.length < 32) {
return {minLength: true}; return {minLength: true};
} }
return null; return null;