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

Merge pull request #12306 from vvlladd28/bug/mail-server/oauth2-config

Browse Source 
Fixed enabled to configure OAuth 2.0 authentication in mail server
This commit is contained in:
Igor Kulikov 2024-12-19 18:24:00 +02:00 committed by GitHub
commit b03320c138
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ui-ngx/src/app/modules/home/pages/admin/mail-server.component.html
View File

@ -243,23 +243,11 @@
</mat-error> </mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<mat-form-field class="mat-block flex-1"> <tb-string-items-list
<mat-label translate>admin.oauth2.scope</mat-label> formControlName="scope" required
<mat-chip-grid #scopeList> label="{{ 'admin.oauth2.scope' | translate }}"
<mat-chip-row *ngFor="let scope of mailSettings.get('scope').value; let k = index; trackBy: trackByParams" requiredText="{{ 'admin.oauth2.scope-required' | translate }}">
removable (removed)="removeScope(k)"> </tb-string-items-list>
{{scope}}
<mat-icon matChipRemove>cancel</mat-icon>
</mat-chip-row>
<input [matChipInputFor]="scopeList"
[matChipInputSeparatorKeyCodes]="separatorKeysCodes"
matChipInputAddOnBlur
(matChipInputTokenEnd)="addScope($event)">
</mat-chip-grid>
<mat-error *ngIf="mailSettings.get('scope').hasError('required')">
{{ 'admin.oauth2.scope-required' | translate }}
</mat-error>
</mat-form-field>
</ng-template> </ng-template>
</mat-expansion-panel> </mat-expansion-panel>

60
ui-ngx/src/app/modules/home/pages/admin/mail-server.component.ts
View File

@ -18,8 +18,7 @@ import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppState } from '@core/core.state'; import { AppState } from '@core/core.state';
import { PageComponent } from '@shared/components/page.component'; import { PageComponent } from '@shared/components/page.component';
import { FormBuilder, FormGroup, UntypedFormArray, Validators } from '@angular/forms'; import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';
import { import {
AdminSettings, AdminSettings,
MailConfigTemplate, MailConfigTemplate,
@ -37,9 +36,6 @@ import { forkJoin, Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators'; import { takeUntil } from 'rxjs/operators';
import { DomainSchema, domainSchemaTranslations, } from '@shared/models/oauth2.models'; import { DomainSchema, domainSchemaTranslations, } from '@shared/models/oauth2.models';
import { WINDOW } from '@core/services/window.service'; import { WINDOW } from '@core/services/window.service';
import { AuthService } from '@core/auth/auth.service';
import { COMMA, ENTER } from '@angular/cdk/keycodes';
import { MatChipInputEvent } from '@angular/material/chips';
@Component({ @Component({
selector: 'tb-mail-server', selector: 'tb-mail-server',
@ -51,7 +47,7 @@ export class MailServerComponent extends PageComponent implements OnInit, OnDest
smtpProtocols = Object.values(SmtpProtocol); smtpProtocols = Object.values(SmtpProtocol);
showChangePassword = false; showChangePassword = false;
protocols = Object.values(DomainSchema).filter(value => value !== DomainSchema.MIXED); protocols: DomainSchema[] = Object.values(DomainSchema).filter(value => value !== DomainSchema.MIXED);
domainSchemaTranslations = domainSchemaTranslations; domainSchemaTranslations = domainSchemaTranslations;
mailServerOauth2Provider = MailServerOauth2Provider; mailServerOauth2Provider = MailServerOauth2Provider;
@ -64,8 +60,6 @@ export class MailServerComponent extends PageComponent implements OnInit, OnDest
templateProvider = ['CUSTOM']; templateProvider = ['CUSTOM'];
readonly separatorKeysCodes: number[] = [ENTER, COMMA];
private destroy$ = new Subject<void>(); private destroy$ = new Subject<void>();
private DOMAIN_AND_PORT_REGEXP = /^(?:\w+(?::\w+)?@)?[^\s/]+(?::\d+)?$/; private DOMAIN_AND_PORT_REGEXP = /^(?:\w+(?::\w+)?@)?[^\s/]+(?::\d+)?$/;
private URL_REGEXP = /^[A-Za-z][A-Za-z\d.+-]*:\/*(?:\w+(?::\w+)?@)?[^\s/]+(?::\d+)?(?:\/[\w#!:.,?+=&%@\-/]*)?$/; private URL_REGEXP = /^[A-Za-z][A-Za-z\d.+-]*:\/*(?:\w+(?::\w+)?@)?[^\s/]+(?::\d+)?(?:\/[\w#!:.,?+=&%@\-/]*)?$/;
@ -98,7 +92,7 @@ export class MailServerComponent extends PageComponent implements OnInit, OnDest
providerTenantId: [{value: '', disabled: true}, [Validators.required]], providerTenantId: [{value: '', disabled: true}, [Validators.required]],
authUri: [{value: '', disabled: true}, [Validators.required, Validators.pattern(this.URL_REGEXP)]], authUri: [{value: '', disabled: true}, [Validators.required, Validators.pattern(this.URL_REGEXP)]],
tokenUri: [{value: '', disabled: true}, [Validators.required, Validators.pattern(this.URL_REGEXP)]], tokenUri: [{value: '', disabled: true}, [Validators.required, Validators.pattern(this.URL_REGEXP)]],
scope: [], scope: this.fb.control<Array<string>>({value: [], disabled: true}, Validators.required),
redirectUri: [{ value:'', disabled: true}] redirectUri: [{ value:'', disabled: true}]
}); });
@ -134,10 +128,7 @@ export class MailServerComponent extends PageComponent implements OnInit, OnDest
}); });
constructor(protected store: Store<AppState>, constructor(protected store: Store<AppState>,
private router: Router,
private route: ActivatedRoute,
private adminService: AdminService, private adminService: AdminService,
private authService: AuthService,
private translate: TranslateService, private translate: TranslateService,
public fb: FormBuilder, public fb: FormBuilder,
@Inject(WINDOW) private window: Window) { @Inject(WINDOW) private window: Window) {
@ -148,14 +139,14 @@ export class MailServerComponent extends PageComponent implements OnInit, OnDest
this.mailServerSettingsForm(); this.mailServerSettingsForm();
this.domainFormConfiguration(); this.domainFormConfiguration();
forkJoin([ forkJoin({
this.adminService.getLoginProcessingUrl(), loginProcessingUrl: this.adminService.getLoginProcessingUrl(),
this.adminService.getMailConfigTemplate(), mailConfigTemplate: this.adminService.getMailConfigTemplate(),
this.adminService.getAdminSettings<MailServerSettings>('mail') adminSettings: this.adminService.getAdminSettings<MailServerSettings>('mail')
]).subscribe(([loginProcessingUrl, mailConfigTemplate, adminSettings]) => { }).subscribe((data) => {
this.loginProcessingUrl = loginProcessingUrl; this.loginProcessingUrl = data.loginProcessingUrl;
this.initTemplates(mailConfigTemplate); this.initTemplates(data.mailConfigTemplate);
this.adminSettings = adminSettings; this.adminSettings = data.adminSettings;
if (this.adminSettings.jsonValue && isString(this.adminSettings.jsonValue.enableTls)) { if (this.adminSettings.jsonValue && isString(this.adminSettings.jsonValue.enableTls)) {
this.adminSettings.jsonValue.enableTls = (this.adminSettings.jsonValue.enableTls as any) === 'true'; this.adminSettings.jsonValue.enableTls = (this.adminSettings.jsonValue.enableTls as any) === 'true';
} }
@ -187,7 +178,7 @@ export class MailServerComponent extends PageComponent implements OnInit, OnDest
super.ngOnDestroy(); super.ngOnDestroy();
} }
private initTemplates(templates): void { private initTemplates(templates: Array<MailConfigTemplate>): void {
templates.map(provider => { templates.map(provider => {
delete provider.additionalInfo; delete provider.additionalInfo;
this.templates.set(provider.providerId, provider); this.templates.set(provider.providerId, provider);
@ -294,6 +285,7 @@ export class MailServerComponent extends PageComponent implements OnInit, OnDest
this.mailSettings.get('clientId').enable({emitEvent: false}); this.mailSettings.get('clientId').enable({emitEvent: false});
this.mailSettings.get('clientSecret').enable({emitEvent: false}); this.mailSettings.get('clientSecret').enable({emitEvent: false});
this.mailSettings.get('redirectUri').enable({emitEvent: false}); this.mailSettings.get('redirectUri').enable({emitEvent: false});
this.mailSettings.get('scope').enable({emitEvent: false});
if (this.mailSettings.get('providerId').value === this.mailServerOauth2Provider.CUSTOM) { if (this.mailSettings.get('providerId').value === this.mailServerOauth2Provider.CUSTOM) {
this.mailSettings.get('authUri').enable({emitEvent: false}); this.mailSettings.get('authUri').enable({emitEvent: false});
this.mailSettings.get('tokenUri').enable({emitEvent: false}); this.mailSettings.get('tokenUri').enable({emitEvent: false});
@ -307,6 +299,7 @@ export class MailServerComponent extends PageComponent implements OnInit, OnDest
this.mailSettings.get('redirectUri').disable({emitEvent: false}); this.mailSettings.get('redirectUri').disable({emitEvent: false});
this.mailSettings.get('authUri').disable({emitEvent: false}); this.mailSettings.get('authUri').disable({emitEvent: false});
this.mailSettings.get('tokenUri').disable({emitEvent: false}); this.mailSettings.get('tokenUri').disable({emitEvent: false});
this.mailSettings.get('scope').disable({emitEvent: false});
} }
} }
@ -422,31 +415,6 @@ export class MailServerComponent extends PageComponent implements OnInit, OnDest
return formValue; return formValue;
} }
trackByParams(index: number): number {
return index;
}
removeScope(i: number): void {
const controller = this.mailSettings.get('scope') as UntypedFormArray;
controller.removeAt(i);
controller.markAsTouched();
controller.markAsDirty();
}
addScope(event: MatChipInputEvent): void {
const input = event.chipInput.inputElement;
const value = event.value;
const controller = this.mailSettings.get('scope') as UntypedFormArray;
if ((value.trim() !== '')) {
controller.push(this.fb.control(value.trim()));
controller.markAsDirty();
}
if (input) {
input.value = '';
}
}
toggleEditMode(path: string): void { toggleEditMode(path: string): void {
this.mailSettings.get(path).disabled ? this.mailSettings.get(path).enable() : this.mailSettings.get(path).disable(); this.mailSettings.get(path).disabled ? this.mailSettings.get(path).enable() : this.mailSettings.get(path).disable();
} }