You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2021/12/01 09:05:14 UTC
[incubator-streampipes] branch dev updated (544e4d0 -> 85b6e6e)
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git.
from 544e4d0 [hotfix] Add cypress batdge to readme
new a796e3e [STREAMPIPES-426] Fix update of user profile data
new d47938a [STREAMPIPES-426] Allow admins to change usernames of existing users
new a3e775f [STREAMPIPES-426] Disable feature to auto-create password if mail system is not configured
new 85b6e6e Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../edit-user-dialog.component.html | 23 ++++++++++++---------
.../edit-user-dialog.component.scss | 6 ++++++
.../edit-user-dialog/edit-user-dialog.component.ts | 24 ++++++++++++++++++----
.../platform-services/model/email-config.model.ts | 2 +-
.../general-profile-settings.component.html | 4 ++--
ui/src/app/profile/profile.service.ts | 2 +-
6 files changed, 43 insertions(+), 18 deletions(-)
[incubator-streampipes] 01/04: [STREAMPIPES-426] Fix update of user profile data
Posted by ri...@apache.org.
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 a796e3e1883271652ee32420ecc8441637071c4d
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Wed Dec 1 09:39:49 2021 +0100
[STREAMPIPES-426] Fix update of user profile data
---
.../components/general/general-profile-settings.component.html | 4 ++--
ui/src/app/profile/profile.service.ts | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ui/src/app/profile/components/general/general-profile-settings.component.html b/ui/src/app/profile/components/general/general-profile-settings.component.html
index ee6eb36..ca852c5 100644
--- a/ui/src/app/profile/components/general/general-profile-settings.component.html
+++ b/ui/src/app/profile/components/general/general-profile-settings.component.html
@@ -19,12 +19,12 @@
<div fxLayout="row" class="page-container-padding">
<div fxFlex="100" fxLayout="column" fxLayoutAlign="start start" *ngIf="profileLoaded">
<sp-split-section title="Main Settings" subtitle="Manage your basic profile settings here.">
- <mat-form-field fxFlex>
+ <mat-form-field fxFlex color="accent">
<mat-label>Email</mat-label>
<input [(ngModel)]="userData.username" matInput type="email" name="email" disabled/>
<mat-hint>Your mail address can't be changed currently.</mat-hint>
</mat-form-field>
- <mat-form-field fxFlex>
+ <mat-form-field fxFlex color="accent">
<mat-label>Full Name</mat-label>
<input [(ngModel)]="userData.fullName" matInput/>
</mat-form-field>
diff --git a/ui/src/app/profile/profile.service.ts b/ui/src/app/profile/profile.service.ts
index dbe7af1..c018d3b 100644
--- a/ui/src/app/profile/profile.service.ts
+++ b/ui/src/app/profile/profile.service.ts
@@ -39,7 +39,7 @@ export class ProfileService {
}
updateUserProfile(userData: UserAccount): Observable<Message> {
- return this.http.put(this.profilePath + '/' + userData.username, userData).pipe(map(response => {
+ return this.http.put(this.profilePath + '/user/' + userData.principalId, userData).pipe(map(response => {
return Message.fromData(response as any);
}));
}
[incubator-streampipes] 04/04: Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
Posted by ri...@apache.org.
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 85b6e6ec205645f02fa002cee985340e189bf362
Merge: a3e775f 544e4d0
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Wed Dec 1 10:05:01 2021 +0100
Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
.github/workflows/cypress-test.yml | 1 +
README.md | 1 +
ui/cypress/support/utils/AdapterUtils.ts | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
[incubator-streampipes] 03/04: [STREAMPIPES-426] Disable feature to auto-create password if mail system is not configured
Posted by ri...@apache.org.
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 <do...@gmail.com>
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;
[incubator-streampipes] 02/04: [STREAMPIPES-426] Allow admins to change usernames of existing users
Posted by ri...@apache.org.
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 d47938a8c6771da86432ff133f7c7626dfedf835
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Wed Dec 1 09:59:02 2021 +0100
[STREAMPIPES-426] Allow admins to change usernames of existing users
---
.../edit-user-dialog.component.html | 21 ++++++++++++---------
.../edit-user-dialog.component.scss | 6 ++++++
.../edit-user-dialog/edit-user-dialog.component.ts | 16 ++++++++++++++--
3 files changed, 32 insertions(+), 11 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 7f3c131..224264a 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
@@ -37,6 +37,7 @@
data-cy="new-user-email">
<mat-error>Must be a valid email address.</mat-error>
</mat-form-field>
+ <div class="email-changed" *ngIf="emailChanged">Changing the current user's email will require a re-login.</div>
<mat-form-field color="accent" *ngIf="isUserAccount">
<mat-label>Full Name</mat-label>
<input formControlName="fullName" fxFlex
@@ -110,15 +111,17 @@
</div>
<mat-divider></mat-divider>
<div class="sp-dialog-actions">
- <div fxLayout="row">
- <button mat-button mat-raised-button color="accent" (click)="save()" style="margin-right:10px;"
- [disabled]="!parentForm.valid"
- data-cy="sp-element-edit-user-save">
- <i class="material-icons">save</i><span> Save</span>
- </button>
- <button mat-button mat-raised-button class="mat-basic" (click)="close(false)">
- Cancel
- </button>
+ <div fxLayout="column">
+ <div fxLayout="row">
+ <button mat-button mat-raised-button color="accent" (click)="save()" style="margin-right:10px;"
+ [disabled]="!parentForm.valid"
+ data-cy="sp-element-edit-user-save">
+ <i class="material-icons">save</i><span> Save</span>
+ </button>
+ <button mat-button mat-raised-button class="mat-basic" (click)="close(false)">
+ Cancel
+ </button>
+ </div>
</div>
</div>
</div>
diff --git a/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.scss b/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.scss
index aad1d42..71c46ee 100644
--- a/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.scss
+++ b/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.scss
@@ -26,3 +26,9 @@
.form-field .mat-form-field-infix {
border-top: 0;
}
+
+.email-changed {
+ color: var(--color-warn);
+ font-size: small;
+ margin-bottom: 10px;
+}
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 7044766..d29eede 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
@@ -39,6 +39,8 @@ import { UserService } from '../../../platform-services/apis/user.service';
import { UserGroupService } from '../../../platform-services/apis/user-group.service';
import { RoleDescription } from '../../../_models/auth.model';
import { AvailableRolesService } from '../../../services/available-roles.service';
+import {AuthService} from "../../../services/auth.service";
+import {Router} from "@angular/router";
@Component({
selector: 'sp-edit-user-dialog',
@@ -64,12 +66,15 @@ export class EditUserDialogComponent implements OnInit {
registrationError: string;
sendPasswordToUser = false;
+ emailChanged = false;
constructor(private dialogRef: DialogRef<EditUserDialogComponent>,
private availableRolesService: AvailableRolesService,
private fb: FormBuilder,
private userService: UserService,
- private userGroupService: UserGroupService) {
+ private userGroupService: UserGroupService,
+ private authService: AuthService,
+ private router: Router) {
}
ngOnInit(): void {
@@ -105,6 +110,7 @@ export class EditUserDialogComponent implements OnInit {
this.clonedUser.accountLocked = v.accountLocked;
this.clonedUser.accountEnabled = v.accountEnabled;
if (this.clonedUser instanceof UserAccount) {
+ this.emailChanged = (this.clonedUser.username !== this.user.username) && this.user.username === this.authService.getCurrentUser().username && this.editMode;
this.clonedUser.fullName = v.fullName;
if (!this.editMode) {
this.sendPasswordToUser = v.sendPasswordToUser;
@@ -149,7 +155,13 @@ export class EditUserDialogComponent implements OnInit {
if (this.editMode) {
if (this.isUserAccount) {
this.userService.updateUser(this.clonedUser as UserAccount).subscribe(() => {
- this.close(true);
+ if (this.emailChanged) {
+ this.authService.logout();
+ this.close(false);
+ this.router.navigate(['login']);
+ } else {
+ this.close(true);
+ }
});
} else {
this.userService.updateService(this.clonedUser as ServiceAccount).subscribe(() => {