Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Release 1.179.1 (#1144)

Thomas Kaule4e0a7d9f024
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0989dc25fc..d2f6c31a22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-## 1.179.0 - 13.08.2022
+## 1.179.1 - 13.08.2022
### Added
diff --git a/apps/api/src/app/subscription/subscription.service.ts b/apps/api/src/app/subscription/subscription.service.ts
index 5a4f75c208..fa061f369d 100644
--- a/apps/api/src/app/subscription/subscription.service.ts
+++ b/apps/api/src/app/subscription/subscription.service.ts
@@ -1,5 +1,6 @@
import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
import { PrismaService } from '@ghostfolio/api/services/prisma.service';
+import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config';
import { SubscriptionType } from '@ghostfolio/common/types/subscription.type';
import { Injectable, Logger } from '@nestjs/common';
import { Subscription } from '@prisma/client';
@@ -33,7 +34,9 @@ export class SubscriptionService {
userId: string;
}) {
const checkoutSessionCreateParams: Stripe.Checkout.SessionCreateParams = {
- cancel_url: `${this.configurationService.get('ROOT_URL')}/account`,
+ cancel_url: `${this.configurationService.get(
+ 'ROOT_URL'
+ )}/${DEFAULT_LANGUAGE_CODE}/account`,
client_reference_id: userId,
line_items: [
{
diff --git a/apps/client/src/app/core/auth.guard.ts b/apps/client/src/app/core/auth.guard.ts
index 6161df1f22..591479742a 100644
--- a/apps/client/src/app/core/auth.guard.ts
+++ b/apps/client/src/app/core/auth.guard.ts
@@ -48,6 +48,8 @@ export class AuthGuard implements CanActivate {
.get()
.pipe(
catchError(() => {
+ console.log(`TODO: canActivate error (${state.url})`);
+
if (utmSource === 'ios') {
this.router.navigate(['/demo']);
resolve(false);
@@ -72,6 +74,8 @@ export class AuthGuard implements CanActivate {
})
)
.subscribe((user) => {
+ console.log(`TODO: canActivate`, user);
+
if (
state.url.startsWith('/home') &&
user.settings.viewMode === ViewMode.ZEN
diff --git a/apps/client/src/app/pages/auth/auth-page.component.ts b/apps/client/src/app/pages/auth/auth-page.component.ts
index 7764c45ffc..69d14bc00b 100644
--- a/apps/client/src/app/pages/auth/auth-page.component.ts
+++ b/apps/client/src/app/pages/auth/auth-page.component.ts
@@ -24,10 +24,15 @@ export class AuthPageComponent implements OnDestroy, OnInit {
) {}
public ngOnInit() {
+ console.log('TODO: Init AuthPageComponent');
+
this.route.params
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe((params) => {
const jwt = params['jwt'];
+
+ console.log(`TODO: ${jwt}`);
+
this.tokenStorageService.saveToken(
jwt,
this.settingsStorageService.getSetting(STAY_SIGNED_IN) === 'true'
diff --git a/apps/client/src/app/services/token-storage.service.ts b/apps/client/src/app/services/token-storage.service.ts
index 5980f56e10..a37d0b9943 100644
--- a/apps/client/src/app/services/token-storage.service.ts
+++ b/apps/client/src/app/services/token-storage.service.ts
@@ -22,6 +22,8 @@ export class TokenStorageService {
}
public saveToken(token: string, staySignedIn = false): void {
+ console.log('TODO: saveToken', token);
+
if (staySignedIn) {
window.localStorage.setItem(TOKEN_KEY, token);
}
diff --git a/package.json b/package.json
index ac57083eb0..62987ab333 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "ghostfolio",
- "version": "1.179.0",
+ "version": "1.179.1",
"homepage": "https://ghostfol.io",
"license": "AGPL-3.0",
"scripts": {