This is an automated email from the ASF dual-hosted git repository. riemer pushed a commit to branch dev in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit a3e775f32c413a6c12090c9fad3cd74ad6abf884 Author: Dominik Riemer <[email protected]> AuthorDate: Wed Dec 1 10:04:52 2021 +0100 [STREAMPIPES-426] Disable feature to auto-create password if mail system is not configured --- .../edit-user-dialog/edit-user-dialog.component.html | 2 +- .../edit-user-dialog/edit-user-dialog.component.ts | 10 +++++++--- ui/src/app/platform-services/model/email-config.model.ts | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.html b/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.html index 224264a..07453fa 100644 --- a/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.html +++ b/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.html @@ -48,7 +48,7 @@ </div> <div fxLayout="column" class="general-options-panel" *ngIf="!editMode && isUserAccount"> <span class="general-options-header">Password</span> - <mat-checkbox formControlName="sendPasswordToUser">Auto-create password and send to user</mat-checkbox> + <mat-checkbox formControlName="sendPasswordToUser" *ngIf="emailConfigured">Auto-create password and send to user</mat-checkbox> <mat-form-field color="accent" *ngIf="!sendPasswordToUser"> <mat-label>Initial password</mat-label> <input formControlName="password" fxFlex diff --git a/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.ts b/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.ts index d29eede..e303757 100644 --- a/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.ts +++ b/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.ts @@ -41,6 +41,7 @@ import { RoleDescription } from '../../../_models/auth.model'; import { AvailableRolesService } from '../../../services/available-roles.service'; import {AuthService} from "../../../services/auth.service"; import {Router} from "@angular/router"; +import {MailConfigService} from "../../../platform-services/apis/mail-config.service"; @Component({ selector: 'sp-edit-user-dialog', @@ -67,19 +68,22 @@ export class EditUserDialogComponent implements OnInit { sendPasswordToUser = false; emailChanged = false; + emailConfigured = false; - constructor(private dialogRef: DialogRef<EditUserDialogComponent>, + constructor(private dialogRef: DialogRef<EditUserDialogComponent>, private availableRolesService: AvailableRolesService, private fb: FormBuilder, private userService: UserService, private userGroupService: UserGroupService, private authService: AuthService, - private router: Router) { + private router: Router, + private mailConfigService: MailConfigService) { } ngOnInit(): void { const filterObject = this.user instanceof UserAccount ? UserRole.ROLE_SERVICE_ADMIN : UserRole.ROLE_ADMIN; - this.availableRoles = this.availableRolesService.availableRoles.filter(role => role.role !== filterObject); + this.availableRoles = this.availableRolesService.availableRoles.filter(role => role.role !== filterObject) + this.mailConfigService.getMailConfig().subscribe(config => this.emailConfigured = config.emailConfigured); this.userGroupService.getAllUserGroups().subscribe(response => { this.availableGroups = response; }); diff --git a/ui/src/app/platform-services/model/email-config.model.ts b/ui/src/app/platform-services/model/email-config.model.ts index df4b319..09445f7 100644 --- a/ui/src/app/platform-services/model/email-config.model.ts +++ b/ui/src/app/platform-services/model/email-config.model.ts @@ -17,7 +17,7 @@ */ export interface EmailConfig { - emailConfigured: string; + emailConfigured: boolean; transportStrategy: 'SMTP' | 'SMTPS' | 'SMTP_TLS'; smtpServerHost: string; smtpServerPort: number;
