
* Fixed bookmarks not being able to load due to missing [AllowAnonymous] * Downgraded Docnet to 2.4.0-alpha2 which is the version we added our patches to. This might fix reports of broken PDF reading on ARM * Updated all but one api in collections to admin only policy * Ensure all config folders are created or exist on first load * Ensure plugins can authenticate * Updated some headers we use on Kavita to tighten security. * Tightened up cover upload flow to restrict more APIs to only the admin * Enhanced the reset password flow to ensure that the user passes their existing password in (if already authenticated). Admins can still change other users without having existing password. * Removed an additional copy during build and copied over the prod appsettings and not Development. * Fixed up the caching mechanism for cover resets and migrated to profiles. Left an etag filter for reference. * Fixed up manual jump key calculation to include period in # * Added jumpbar to reading lists page * Fixed a double scrollbar on library detail page * Fixed weird scroll issues with want to read * Fixed a bug where remove from want to read list wasn't hooked up on series card * Cleaned up Clear bookmarks to use a dedicated api for bulk clearing. Converted Bookmark page to OnPush. * Fixed jump bar being offset when clicking a jump key * Ensure we don't overflow on add to reading list * Fixed a bad name format on reading list items
254 lines
12 KiB
TypeScript
254 lines
12 KiB
TypeScript
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
|
|
import { FormControl, FormGroup, Validators } from '@angular/forms';
|
|
import { ToastrService } from 'ngx-toastr';
|
|
import { map, shareReplay, take, takeUntil } from 'rxjs/operators';
|
|
import { Title } from '@angular/platform-browser';
|
|
import { BookService } from 'src/app/book-reader/book.service';
|
|
import { readingDirections, scalingOptions, pageSplitOptions, readingModes, Preferences, bookLayoutModes, layoutModes, pageLayoutModes } from 'src/app/_models/preferences/preferences';
|
|
import { User } from 'src/app/_models/user';
|
|
import { AccountService } from 'src/app/_services/account.service';
|
|
import { ActivatedRoute, Router } from '@angular/router';
|
|
import { SettingsService } from 'src/app/admin/settings.service';
|
|
import { bookColorThemes } from 'src/app/book-reader/reader-settings/reader-settings.component';
|
|
import { BookPageLayoutMode } from 'src/app/_models/book-page-layout-mode';
|
|
import { forkJoin, Observable, of, Subject } from 'rxjs';
|
|
|
|
enum AccordionPanelID {
|
|
ImageReader = 'image-reader',
|
|
BookReader = 'book-reader',
|
|
GlobalSettings = 'global-settings'
|
|
}
|
|
|
|
@Component({
|
|
selector: 'app-user-preferences',
|
|
templateUrl: './user-preferences.component.html',
|
|
styleUrls: ['./user-preferences.component.scss'],
|
|
changeDetection: ChangeDetectionStrategy.OnPush
|
|
})
|
|
export class UserPreferencesComponent implements OnInit, OnDestroy {
|
|
|
|
readingDirections = readingDirections;
|
|
scalingOptions = scalingOptions;
|
|
pageSplitOptions = pageSplitOptions;
|
|
readingModes = readingModes;
|
|
layoutModes = layoutModes;
|
|
bookLayoutModes = bookLayoutModes;
|
|
bookColorThemes = bookColorThemes;
|
|
pageLayoutModes = pageLayoutModes;
|
|
|
|
settingsForm: FormGroup = new FormGroup({});
|
|
passwordChangeForm: FormGroup = new FormGroup({});
|
|
user: User | undefined = undefined;
|
|
hasChangePasswordAbility: Observable<boolean> = of(false);
|
|
|
|
passwordsMatch = false;
|
|
resetPasswordErrors: string[] = [];
|
|
|
|
observableHandles: Array<any> = [];
|
|
fontFamilies: Array<string> = [];
|
|
|
|
tabs: Array<{title: string, fragment: string}> = [
|
|
{title: 'Preferences', fragment: ''},
|
|
{title: 'Password', fragment: 'password'},
|
|
{title: '3rd Party Clients', fragment: 'clients'},
|
|
{title: 'Theme', fragment: 'theme'},
|
|
];
|
|
active = this.tabs[0];
|
|
opdsEnabled: boolean = false;
|
|
makeUrl: (val: string) => string = (val: string) => {return this.transformKeyToOpdsUrl(val)};
|
|
|
|
private onDestroy = new Subject<void>();
|
|
|
|
get AccordionPanelID() {
|
|
return AccordionPanelID;
|
|
}
|
|
|
|
public get password() { return this.passwordChangeForm.get('password'); }
|
|
public get confirmPassword() { return this.passwordChangeForm.get('confirmPassword'); }
|
|
|
|
constructor(private accountService: AccountService, private toastr: ToastrService, private bookService: BookService,
|
|
private titleService: Title, private route: ActivatedRoute, private settingsService: SettingsService,
|
|
private router: Router, private readonly cdRef: ChangeDetectorRef) {
|
|
this.fontFamilies = this.bookService.getFontFamilies().map(f => f.title);
|
|
this.cdRef.markForCheck();
|
|
|
|
this.route.fragment.subscribe(frag => {
|
|
const tab = this.tabs.filter(item => item.fragment === frag);
|
|
if (tab.length > 0) {
|
|
this.active = tab[0];
|
|
} else {
|
|
this.active = this.tabs[0]; // Default to first tab
|
|
}
|
|
this.cdRef.markForCheck();
|
|
});
|
|
|
|
this.settingsService.getOpdsEnabled().subscribe(res => {
|
|
this.opdsEnabled = res;
|
|
this.cdRef.markForCheck();
|
|
});
|
|
}
|
|
|
|
ngOnInit(): void {
|
|
this.titleService.setTitle('Kavita - User Preferences');
|
|
|
|
this.hasChangePasswordAbility = this.accountService.currentUser$.pipe(takeUntil(this.onDestroy), shareReplay(), map(user => {
|
|
return user !== undefined && (this.accountService.hasAdminRole(user) || this.accountService.hasChangePasswordRole(user));
|
|
}));
|
|
this.cdRef.markForCheck();
|
|
|
|
forkJoin({
|
|
user: this.accountService.currentUser$.pipe(take(1)),
|
|
pref: this.accountService.getPreferences()
|
|
}).subscribe(results => {
|
|
if (results.user === undefined) {
|
|
this.router.navigateByUrl('/login');
|
|
return;
|
|
}
|
|
|
|
this.user = results.user;
|
|
this.user.preferences = results.pref;
|
|
|
|
if (this.fontFamilies.indexOf(this.user.preferences.bookReaderFontFamily) < 0) {
|
|
this.user.preferences.bookReaderFontFamily = 'default';
|
|
}
|
|
|
|
this.settingsForm.addControl('readingDirection', new FormControl(this.user.preferences.readingDirection, []));
|
|
this.settingsForm.addControl('scalingOption', new FormControl(this.user.preferences.scalingOption, []));
|
|
this.settingsForm.addControl('pageSplitOption', new FormControl(this.user.preferences.pageSplitOption, []));
|
|
this.settingsForm.addControl('autoCloseMenu', new FormControl(this.user.preferences.autoCloseMenu, []));
|
|
this.settingsForm.addControl('showScreenHints', new FormControl(this.user.preferences.showScreenHints, []));
|
|
this.settingsForm.addControl('readerMode', new FormControl(this.user.preferences.readerMode, []));
|
|
this.settingsForm.addControl('layoutMode', new FormControl(this.user.preferences.layoutMode, []));
|
|
this.settingsForm.addControl('bookReaderFontFamily', new FormControl(this.user.preferences.bookReaderFontFamily, []));
|
|
this.settingsForm.addControl('bookReaderFontSize', new FormControl(this.user.preferences.bookReaderFontSize, []));
|
|
this.settingsForm.addControl('bookReaderLineSpacing', new FormControl(this.user.preferences.bookReaderLineSpacing, []));
|
|
this.settingsForm.addControl('bookReaderMargin', new FormControl(this.user.preferences.bookReaderMargin, []));
|
|
this.settingsForm.addControl('bookReaderReadingDirection', new FormControl(this.user.preferences.bookReaderReadingDirection, []));
|
|
this.settingsForm.addControl('bookReaderTapToPaginate', new FormControl(!!this.user.preferences.bookReaderTapToPaginate, []));
|
|
this.settingsForm.addControl('bookReaderLayoutMode', new FormControl(this.user.preferences.bookReaderLayoutMode || BookPageLayoutMode.Default, []));
|
|
this.settingsForm.addControl('bookReaderThemeName', new FormControl(this.user?.preferences.bookReaderThemeName || bookColorThemes[0].name, []));
|
|
this.settingsForm.addControl('bookReaderImmersiveMode', new FormControl(this.user?.preferences.bookReaderImmersiveMode, []));
|
|
|
|
this.settingsForm.addControl('theme', new FormControl(this.user.preferences.theme, []));
|
|
this.settingsForm.addControl('globalPageLayoutMode', new FormControl(this.user.preferences.globalPageLayoutMode, []));
|
|
this.settingsForm.addControl('blurUnreadSummaries', new FormControl(this.user.preferences.blurUnreadSummaries, []));
|
|
this.settingsForm.addControl('promptForDownloadSize', new FormControl(this.user.preferences.promptForDownloadSize, []));
|
|
|
|
this.cdRef.markForCheck();
|
|
});
|
|
|
|
this.passwordChangeForm.addControl('password', new FormControl('', [Validators.required]));
|
|
this.passwordChangeForm.addControl('confirmPassword', new FormControl('', [Validators.required]));
|
|
this.passwordChangeForm.addControl('oldPassword', new FormControl('', [Validators.required]));
|
|
|
|
|
|
|
|
this.observableHandles.push(this.passwordChangeForm.valueChanges.subscribe(() => {
|
|
const values = this.passwordChangeForm.value;
|
|
this.passwordsMatch = values.password === values.confirmPassword;
|
|
this.cdRef.markForCheck();
|
|
}));
|
|
|
|
this.settingsForm.get('bookReaderImmersiveMode')?.valueChanges.pipe(takeUntil(this.onDestroy)).subscribe(mode => {
|
|
if (mode) {
|
|
this.settingsForm.get('bookReaderTapToPaginate')?.setValue(true);
|
|
this.cdRef.markForCheck();
|
|
}
|
|
});
|
|
this.cdRef.markForCheck();
|
|
}
|
|
|
|
ngOnDestroy() {
|
|
this.observableHandles.forEach(o => o.unsubscribe());
|
|
this.onDestroy.next();
|
|
this.onDestroy.complete();
|
|
}
|
|
|
|
|
|
resetForm() {
|
|
if (this.user === undefined) { return; }
|
|
this.settingsForm.get('readingDirection')?.setValue(this.user.preferences.readingDirection);
|
|
this.settingsForm.get('scalingOption')?.setValue(this.user.preferences.scalingOption);
|
|
this.settingsForm.get('autoCloseMenu')?.setValue(this.user.preferences.autoCloseMenu);
|
|
this.settingsForm.get('showScreenHints')?.setValue(this.user.preferences.showScreenHints);
|
|
this.settingsForm.get('readerMode')?.setValue(this.user.preferences.readerMode);
|
|
this.settingsForm.get('layoutMode')?.setValue(this.user.preferences.layoutMode);
|
|
this.settingsForm.get('pageSplitOption')?.setValue(this.user.preferences.pageSplitOption);
|
|
this.settingsForm.get('bookReaderFontFamily')?.setValue(this.user.preferences.bookReaderFontFamily);
|
|
this.settingsForm.get('bookReaderFontSize')?.setValue(this.user.preferences.bookReaderFontSize);
|
|
this.settingsForm.get('bookReaderLineSpacing')?.setValue(this.user.preferences.bookReaderLineSpacing);
|
|
this.settingsForm.get('bookReaderMargin')?.setValue(this.user.preferences.bookReaderMargin);
|
|
this.settingsForm.get('bookReaderTapToPaginate')?.setValue(this.user.preferences.bookReaderTapToPaginate);
|
|
this.settingsForm.get('bookReaderReadingDirection')?.setValue(this.user.preferences.bookReaderReadingDirection);
|
|
this.settingsForm.get('bookReaderLayoutMode')?.setValue(this.user.preferences.bookReaderLayoutMode);
|
|
this.settingsForm.get('bookReaderThemeName')?.setValue(this.user.preferences.bookReaderThemeName);
|
|
this.settingsForm.get('theme')?.setValue(this.user.preferences.theme);
|
|
this.settingsForm.get('bookReaderImmersiveMode')?.setValue(this.user.preferences.bookReaderImmersiveMode);
|
|
this.settingsForm.get('globalPageLayoutMode')?.setValue(this.user.preferences.globalPageLayoutMode);
|
|
this.settingsForm.get('blurUnreadSummaries')?.setValue(this.user.preferences.blurUnreadSummaries);
|
|
this.settingsForm.get('promptForDownloadSize')?.setValue(this.user.preferences.promptForDownloadSize);
|
|
this.cdRef.markForCheck();
|
|
}
|
|
|
|
resetPasswordForm() {
|
|
this.passwordChangeForm.get('password')?.setValue('');
|
|
this.passwordChangeForm.get('confirmPassword')?.setValue('');
|
|
this.passwordChangeForm.get('oldPassword')?.setValue('');
|
|
this.resetPasswordErrors = [];
|
|
this.cdRef.markForCheck();
|
|
}
|
|
|
|
save() {
|
|
if (this.user === undefined) return;
|
|
const modelSettings = this.settingsForm.value;
|
|
const data: Preferences = {
|
|
readingDirection: parseInt(modelSettings.readingDirection, 10),
|
|
scalingOption: parseInt(modelSettings.scalingOption, 10),
|
|
pageSplitOption: parseInt(modelSettings.pageSplitOption, 10),
|
|
autoCloseMenu: modelSettings.autoCloseMenu,
|
|
readerMode: parseInt(modelSettings.readerMode, 10),
|
|
layoutMode: parseInt(modelSettings.layoutMode, 10),
|
|
showScreenHints: modelSettings.showScreenHints,
|
|
backgroundColor: modelSettings.backgroundColor,
|
|
bookReaderFontFamily: modelSettings.bookReaderFontFamily,
|
|
bookReaderLineSpacing: modelSettings.bookReaderLineSpacing,
|
|
bookReaderFontSize: modelSettings.bookReaderFontSize,
|
|
bookReaderMargin: modelSettings.bookReaderMargin,
|
|
bookReaderTapToPaginate: modelSettings.bookReaderTapToPaginate,
|
|
bookReaderReadingDirection: parseInt(modelSettings.bookReaderReadingDirection, 10),
|
|
bookReaderLayoutMode: parseInt(modelSettings.bookReaderLayoutMode, 10),
|
|
bookReaderThemeName: modelSettings.bookReaderThemeName,
|
|
theme: modelSettings.theme,
|
|
bookReaderImmersiveMode: modelSettings.bookReaderImmersiveMode,
|
|
globalPageLayoutMode: parseInt(modelSettings.globalPageLayoutMode, 10),
|
|
blurUnreadSummaries: modelSettings.blurUnreadSummaries,
|
|
promptForDownloadSize: modelSettings.promptForDownloadSize,
|
|
};
|
|
|
|
this.observableHandles.push(this.accountService.updatePreferences(data).subscribe((updatedPrefs) => {
|
|
this.toastr.success('Server settings updated');
|
|
if (this.user) {
|
|
this.user.preferences = updatedPrefs;
|
|
this.cdRef.markForCheck();
|
|
}
|
|
this.resetForm();
|
|
}));
|
|
}
|
|
|
|
savePasswordForm() {
|
|
if (this.user === undefined) { return; }
|
|
|
|
const model = this.passwordChangeForm.value;
|
|
this.resetPasswordErrors = [];
|
|
this.observableHandles.push(this.accountService.resetPassword(this.user?.username, model.confirmPassword, model.oldPassword).subscribe(() => {
|
|
this.toastr.success('Password has been updated');
|
|
this.resetPasswordForm();
|
|
}, err => {
|
|
this.resetPasswordErrors = err;
|
|
}));
|
|
}
|
|
|
|
transformKeyToOpdsUrl(key: string) {
|
|
return `${location.origin}/api/opds/${key}`;
|
|
}
|
|
}
|