From 17409dd2a70797414d5197f299a8359759986780 Mon Sep 17 00:00:00 2001 From: Joe Milazzo Date: Thu, 10 Aug 2023 08:43:56 -0500 Subject: [PATCH] Shakeout (#2195) * Fixed some localization issues. Fixed double slash on base url. * Weblate Changes (#2194) * Translated using Weblate (Spanish) Currently translated at 40.9% (585 of 1427 strings) Translation: Kavita/ui Translate-URL: https://hosted.weblate.org/projects/kavita/ui/es/ * Translated using Weblate (Spanish) Currently translated at 40.9% (585 of 1427 strings) Translation: Kavita/ui Translate-URL: https://hosted.weblate.org/projects/kavita/ui/es/ * Translated using Weblate (Dutch) Currently translated at 48.5% (693 of 1427 strings) Translation: Kavita/ui Translate-URL: https://hosted.weblate.org/projects/kavita/ui/nl/ * Translated using Weblate (Portuguese) Currently translated at 96.8% (153 of 158 strings) Translation: Kavita/backend Translate-URL: https://hosted.weblate.org/projects/kavita/backend/pt/ * Translated using Weblate (Portuguese) Currently translated at 24.3% (348 of 1427 strings) Translation: Kavita/ui Translate-URL: https://hosted.weblate.org/projects/kavita/ui/pt/ * Translated using Weblate (Spanish) Currently translated at 3.7% (6 of 158 strings) Translation: Kavita/backend Translate-URL: https://hosted.weblate.org/projects/kavita/backend/es/ * Translated using Weblate (Italian) Currently translated at 11.2% (161 of 1427 strings) Translation: Kavita/ui Translate-URL: https://hosted.weblate.org/projects/kavita/ui/it/ --------- Co-authored-by: ThePromidius Co-authored-by: gallegonovato Co-authored-by: Hans Kalisvaart Co-authored-by: Duarte Silva Co-authored-by: Tomas Battistini --------- Co-authored-by: Weblate (bot) Co-authored-by: ThePromidius Co-authored-by: gallegonovato Co-authored-by: Hans Kalisvaart Co-authored-by: Duarte Silva Co-authored-by: Tomas Battistini --- API/Controllers/AccountController.cs | 15 ++++++++++++++- API/config/appsettings.Development.json | 7 ++++--- .../admin/invite-user/invite-user.component.html | 4 +--- .../admin/invite-user/invite-user.component.ts | 3 ++- .../manage-library/manage-library.component.ts | 2 +- openapi.json | 2 +- 6 files changed, 23 insertions(+), 10 deletions(-) diff --git a/API/Controllers/AccountController.cs b/API/Controllers/AccountController.cs index b14bac8c1..0ff5882d5 100644 --- a/API/Controllers/AccountController.cs +++ b/API/Controllers/AccountController.cs @@ -1018,7 +1018,20 @@ public class AccountController : BaseApiController if (!string.IsNullOrEmpty(serverSettings.HostName)) origin = serverSettings.HostName; var baseUrl = string.Empty; - if (!string.IsNullOrEmpty(serverSettings.BaseUrl) && !serverSettings.BaseUrl.Equals(Configuration.DefaultBaseUrl)) baseUrl = serverSettings.BaseUrl + "/"; + if (!string.IsNullOrEmpty(serverSettings.BaseUrl) && + !serverSettings.BaseUrl.Equals(Configuration.DefaultBaseUrl)) + { + baseUrl = serverSettings.BaseUrl + "/"; + if (baseUrl.EndsWith("//")) + { + baseUrl = baseUrl.Replace("//", "/"); + } + + if (baseUrl.StartsWith("/")) + { + baseUrl = baseUrl.Substring(1, baseUrl.Length - 1); + } + } return Ok(origin + "/" + baseUrl + "api/opds/" + user!.ApiKey); } diff --git a/API/config/appsettings.Development.json b/API/config/appsettings.Development.json index 54f42804c..90faa9e5f 100644 --- a/API/config/appsettings.Development.json +++ b/API/config/appsettings.Development.json @@ -2,6 +2,7 @@ "TokenKey": "super secret unguessable key that is longer because we require it", "Port": 5000, "IpAddresses": "", - "BaseUrl": "/", - "Cache": 90 -} + "BaseUrl": "/test/", + "Cache": 90, + "XFrameOrigins": "SAMEORIGIN" +} \ No newline at end of file diff --git a/UI/Web/src/app/admin/invite-user/invite-user.component.html b/UI/Web/src/app/admin/invite-user/invite-user.component.html index 5b848049c..7a9220bfa 100644 --- a/UI/Web/src/app/admin/invite-user/invite-user.component.html +++ b/UI/Web/src/app/admin/invite-user/invite-user.component.html @@ -5,9 +5,7 @@
-

- {{t('description')}} -

+

diff --git a/UI/Web/src/app/admin/invite-user/invite-user.component.ts b/UI/Web/src/app/admin/invite-user/invite-user.component.ts index 37158a1ca..678c142f9 100644 --- a/UI/Web/src/app/admin/invite-user/invite-user.component.ts +++ b/UI/Web/src/app/admin/invite-user/invite-user.component.ts @@ -13,13 +13,14 @@ import { LibrarySelectorComponent } from '../library-selector/library-selector.c import { RoleSelectorComponent } from '../role-selector/role-selector.component'; import { NgIf } from '@angular/common'; import {translate, TranslocoDirective} from "@ngneat/transloco"; +import {SafeHtmlPipe} from "../../pipe/safe-html.pipe"; @Component({ selector: 'app-invite-user', templateUrl: './invite-user.component.html', styleUrls: ['./invite-user.component.scss'], standalone: true, - imports: [NgIf, ReactiveFormsModule, RoleSelectorComponent, LibrarySelectorComponent, RestrictionSelectorComponent, ApiKeyComponent, TranslocoDirective] + imports: [NgIf, ReactiveFormsModule, RoleSelectorComponent, LibrarySelectorComponent, RestrictionSelectorComponent, ApiKeyComponent, TranslocoDirective, SafeHtmlPipe] }) export class InviteUserComponent implements OnInit { diff --git a/UI/Web/src/app/admin/manage-library/manage-library.component.ts b/UI/Web/src/app/admin/manage-library/manage-library.component.ts index c5e8840f2..644173ca9 100644 --- a/UI/Web/src/app/admin/manage-library/manage-library.component.ts +++ b/UI/Web/src/app/admin/manage-library/manage-library.component.ts @@ -118,7 +118,7 @@ export class ManageLibraryComponent implements OnInit { } async deleteLibrary(library: Library) { - if (await this.confirmService.confirm(translate('toast.confirm-library-delete', {name: library.name}))) { + if (await this.confirmService.confirm(translate('toasts.confirm-library-delete', {name: library.name}))) { this.deletionInProgress = true; this.libraryService.delete(library.id).pipe(take(1)).subscribe(() => { this.deletionInProgress = false; diff --git a/openapi.json b/openapi.json index 8a829ef82..fc9c84213 100644 --- a/openapi.json +++ b/openapi.json @@ -7,7 +7,7 @@ "name": "GPL-3.0", "url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE" }, - "version": "0.7.6.14" + "version": "0.7.6.15" }, "servers": [ {