mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-06-03 21:54:47 -04:00
efb527035d
* Moved the Server Settings out into a button on nav header * Refactored Mange Users page to the new design (skeleton). Implemented skeleton code for Invite User. * Hashed out more of the code, but need to move all the email code to a Kavita controlled API server due to password credentials. * Cleaned up some warnings * When no user exists for an api key in Plugin controller, throw 401. * Hooked in the ability to check if the Kavita instance can be accessed externally so we can determine if the user can invite or not. * Hooked up some logic if the user's server isn't accessible, then default to old flow * Basic flow is working for confirm email. Needs validation, error handling, etc. * Refactored Password validation to account service * Cleaned up the code in confirm-email to work much better. * Refactored the login page to have a container functionality, so we can reuse the styles on multiple pages (registration pages). Hooked up the code for confirm email. * Messy code, but making progress. Refactored Register to be used only for first time user registration. Added a new register component to handle first time flow only. * Invite works much better, still needs a bit of work for non-accessible server setup. Started work on underlying manage users page to meet new design. * Changed (you) to a star to indicate who you're logged in as. * Inviting a user is now working and tested fully. * Removed the register member component as we now have invite and confirm components. * Editing a user is now working. Username change and Role/Library access from within one screen. Email changing is on hold. * Cleaned up code for edit user and disabled email field for now. * Cleaned up the code to indicate changing a user's email is not possible. * Implemented a migration for existing accounts so they can validate their emails and still login. * Change url for email server * Implemented the ability to resend an email confirmation code (or regenerate for non accessible servers). Fixed an overflow on the confirm dialog. * Took care of some code cleanup * Removed 3 db calls from cover refresh and some misc cleanup * Fixed a broken test
63 lines
2.0 KiB
TypeScript
63 lines
2.0 KiB
TypeScript
import { Component, Input, OnInit } from '@angular/core';
|
|
import { FormGroup, FormControl, Validators } from '@angular/forms';
|
|
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
|
|
import { ConfirmService } from 'src/app/shared/confirm.service';
|
|
import { Library } from 'src/app/_models/library';
|
|
import { Member } from 'src/app/_models/member';
|
|
import { AccountService } from 'src/app/_services/account.service';
|
|
import { ServerService } from 'src/app/_services/server.service';
|
|
|
|
// TODO: Rename this to EditUserModal
|
|
@Component({
|
|
selector: 'app-edit-user',
|
|
templateUrl: './edit-user.component.html',
|
|
styleUrls: ['./edit-user.component.scss']
|
|
})
|
|
export class EditUserComponent implements OnInit {
|
|
|
|
@Input() member!: Member;
|
|
|
|
selectedRoles: Array<string> = [];
|
|
selectedLibraries: Array<number> = [];
|
|
isSaving: boolean = false;
|
|
|
|
userForm: FormGroup = new FormGroup({});
|
|
|
|
public get email() { return this.userForm.get('email'); }
|
|
public get username() { return this.userForm.get('username'); }
|
|
public get password() { return this.userForm.get('password'); }
|
|
|
|
constructor(public modal: NgbActiveModal, private accountService: AccountService, private serverService: ServerService,
|
|
private confirmService: ConfirmService) { }
|
|
|
|
ngOnInit(): void {
|
|
this.userForm.addControl('email', new FormControl(this.member.email, [Validators.required, Validators.email]));
|
|
this.userForm.addControl('username', new FormControl(this.member.username, [Validators.required]));
|
|
|
|
this.userForm.get('email')?.disable();
|
|
}
|
|
|
|
updateRoleSelection(roles: Array<string>) {
|
|
this.selectedRoles = roles;
|
|
}
|
|
|
|
updateLibrarySelection(libraries: Array<Library>) {
|
|
this.selectedLibraries = libraries.map(l => l.id);
|
|
}
|
|
|
|
close() {
|
|
this.modal.close(false);
|
|
}
|
|
|
|
save() {
|
|
const model = this.userForm.getRawValue();
|
|
model.userId = this.member.id;
|
|
model.roles = this.selectedRoles;
|
|
model.libraries = this.selectedLibraries;
|
|
this.accountService.update(model).subscribe(() => {
|
|
this.modal.close(true);
|
|
});
|
|
}
|
|
|
|
}
|