mpana/sc-portal
Archived
1
0
Fork 0
Code Issues 15 Pull Requests Projects Releases Wiki Activity

fixed bug where a new user couldn't be created

Browse Source
This commit is contained in:
Dragos 2021-05-27 09:49:30 +03:00
parent 7fd17cecc9
commit 75005db046
1 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
app/src/app/security/user-editor/user-editor.component.ts
View File

@ -15,8 +15,7 @@ import { ToastrService } from 'ngx-toastr';
templateUrl: './user-editor.component.html',
styleUrls: ['./user-editor.component.scss']
})
export class UserEditorComponent implements OnInit
{
export class UserEditorComponent implements OnInit {
@Input()
user: User;
@ -35,8 +34,7 @@ export class UserEditorComponent implements OnInit
private readonly router: Router,
private readonly fb: FormBuilder,
private readonly securityService: SecurityService,
private readonly toastr: ToastrService)
{ // When the user navigates away from this route, hide the modal
private readonly toastr: ToastrService) { // When the user navigates away from this route, hide the modal
router.events
.pipe(
takeUntil(this.destroy$),
@ -46,8 +44,7 @@ export class UserEditorComponent implements OnInit
}
// ----------------------------------------------------------------------------------------------------------------
private createForm()
{
private createForm() {
this.editorForm = this.fb.group(
{
id: [this.user?.id],
@ -71,8 +68,7 @@ export class UserEditorComponent implements OnInit
}
// --------------------------------------------------------------------------------------------------
private passwordsValidator: ValidatorFn = (group: FormGroup): ValidationErrors | null =>
{
private passwordsValidator: ValidatorFn = (group: FormGroup): ValidationErrors | null => {
if (!this.changePassword && !!this.user)
return null;
@ -96,47 +92,47 @@ export class UserEditorComponent implements OnInit
}
// ----------------------------------------------------------------------------------------------------------------
close()
{
close() {
this.modalRef.hide();
}
// ----------------------------------------------------------------------------------------------------------------
saveChanges()
{
saveChanges() {
this.working = true;
let observable: Observable<UserResponse>;
const changes = this.editorForm.getRawValue();
if (this.changePassword)
{
if (this.changePassword) {
observable = this.securityService.changeUserPassword(this.user.id, changes.password, changes.passwordConfirmation);
}
else
{
const user = {
else {
const user: any = {
login: changes.username,
email: changes.email,
firstName: changes.firstName,
lastName: changes.lastName,
phone: changes.phone,
password: changes.password
password: changes.password.password
};
if (changes.firstName)
user.firstName = changes.firstName;
if (changes.lastName)
user.lastName = changes.lastName;
if (changes.phone)
user.phone = changes.phone;
observable = this.user
? this.securityService.editUser(this.user.id, user)
: this.securityService.addUser(user);
}
observable.subscribe(x =>
{
observable.subscribe(x => {
this.save.next(x as User);
this.close();
}, err =>
{
}, err => {
this.toastr.error(err.error.message);
this.working = false;
@ -144,8 +140,7 @@ export class UserEditorComponent implements OnInit
}
// ----------------------------------------------------------------------------------------------------------------
ngOnInit(): void
{
ngOnInit(): void {
if (!this.user)
this.changePassword = false;