admin/cmc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

27.7. Excluded current username from FormData (#27)

Browse Source
This commit is contained in:
Art
2021-09-28 21:06:26 +03:00
parent 84d8b264b9
commit 65b29ce2a1
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
support-portal-frontend/src/app/component/user/user.component.ts
View File

@ -33,7 +33,6 @@ export class UserComponent implements OnInit, OnDestroy {
public profileImageFileName: string | null; public profileImageFileName: string | null;
public profileImage: File | null; public profileImage: File | null;
public editUser: User = new User(); public editUser: User = new User();
private currentUsername: string;
public fileUploadStatus: FileUploadStatus = new FileUploadStatus(); public fileUploadStatus: FileUploadStatus = new FileUploadStatus();
@ -97,7 +96,7 @@ export class UserComponent implements OnInit, OnDestroy {
} }
public onAddNewUser(userForm: NgForm): void { public onAddNewUser(userForm: NgForm): void {
let formData = this.userService.createUserFormData(null, userForm.value, this.profileImage); let formData = this.userService.createUserFormData(userForm.value, this.profileImage);
this.subs.sink = this.userService.addUser(formData) this.subs.sink = this.userService.addUser(formData)
.subscribe( .subscribe(
(user: User) => { (user: User) => {
@ -150,12 +149,11 @@ export class UserComponent implements OnInit, OnDestroy {
public onEditUser(user: User): void { public onEditUser(user: User): void {
this.editUser = user; this.editUser = user;
this.currentUsername = user.username;
this.clickButton('openUserEdit'); this.clickButton('openUserEdit');
} }
public onUpdateUser(): void { public onUpdateUser(): void {
const formData = this.userService.createUserFormData(this.currentUsername, this.editUser, this.profileImage); const formData = this.userService.createUserFormData(this.editUser, this.profileImage);
this.subs.sink = this.userService.updateUser(this.editUser.userId, formData) this.subs.sink = this.userService.updateUser(this.editUser.userId, formData)
.subscribe( .subscribe(
(user: User) => { (user: User) => {
@ -204,7 +202,6 @@ export class UserComponent implements OnInit, OnDestroy {
} }
onUpdateCurrentUser(user: User) { onUpdateCurrentUser(user: User) {
this.currentUsername = this.authenticationService.getUserFromLocalStorage().username;
const userId = this.authenticationService.getUserFromLocalStorage().userId; const userId = this.authenticationService.getUserFromLocalStorage().userId;
this.refreshing = true; this.refreshing = true;
@ -212,10 +209,7 @@ export class UserComponent implements OnInit, OnDestroy {
if (user.active == undefined) user.active = this.loggedInUser.active; if (user.active == undefined) user.active = this.loggedInUser.active;
if (user.notLocked == undefined) user.notLocked = this.loggedInUser.notLocked; if (user.notLocked == undefined) user.notLocked = this.loggedInUser.notLocked;
console.log(user); const formData = this.userService.createUserFormData(user, this.profileImage);
console.log(this.loggedInUser);
const formData = this.userService.createUserFormData(this.currentUsername, user, this.profileImage);
this.subs.sink = this.userService.updateUser(userId, formData) this.subs.sink = this.userService.updateUser(userId, formData)
.subscribe( .subscribe(
(user: User) => { (user: User) => {

4
support-portal-frontend/src/app/service/user.service.ts
View File

@ -62,12 +62,10 @@ export class UserService {
return []; return [];
} }
public createUserFormData(loggedInUsername: string | null, user: User, profileImage: File | null): FormData { public createUserFormData(user: User, profileImage: File | null): FormData {
const formData = new FormData(); const formData = new FormData();
if (loggedInUsername)
formData.append('currentUsername', loggedInUsername);
formData.append('firstName', user.firstName); formData.append('firstName', user.firstName);
formData.append('lastName', user.lastName); formData.append('lastName', user.lastName);
formData.append("username", user.username); formData.append("username", user.username);