add home path, payment provider and payment currency to config

Author: chriskapp

projects/fusio-sdk/src/lib/component/login/login.component.ts

@@ -1,12 +1,12 @@
-import {Component, OnInit} from '@angular/core';
+import {Component, Inject, OnInit} from '@angular/core';
 import {Message} from "fusio-sdk/dist/src/generated/consumer/Message";
 import axios from "axios";
 import {Router} from "@angular/router";
 import {UserAccount} from "fusio-sdk/dist/src/generated/consumer/UserAccount";
 import {ProviderService} from "../../service/provider.service";
 import {UserService} from "../../service/user.service";
 import {ConsumerService} from "../../service/consumer.service";
-import {Provider} from "../../config/config";
+import {Config, FUSIO_CONFIG, Provider} from "../../config/config";
 
 @Component({
   selector: 'fusio-login',
@@ -25,7 +25,7 @@ export class LoginComponent implements OnInit {
 
   providers: Array<Provider> = [];
 
-  constructor(private consumer: ConsumerService, private router: Router, private user: UserService<UserAccount>, private provider: ProviderService) {
+  constructor(private consumer: ConsumerService, private router: Router, private user: UserService<UserAccount>, private provider: ProviderService, @Inject(FUSIO_CONFIG) private config: Config) {
   }
 
   ngOnInit(): void {
@@ -42,7 +42,12 @@ export class LoginComponent implements OnInit {
 
       this.user.login(response.data);
 
-      this.router.navigate(['/account']).then(() => {
+      let homePath = '/account';
+      if (this.config.homePath) {
+        homePath = this.config.homePath;
+      }
+
+      this.router.navigate([homePath]).then(() => {
         location.reload();
       });
     } catch (error) {

projects/fusio-sdk/src/lib/component/login/provider/provider.component.ts

@@ -1,4 +1,4 @@
-import {Component, OnInit} from '@angular/core';
+import {Component, Inject, OnInit} from '@angular/core';
 import axios from "axios";
 import {Message} from "fusio-sdk/dist/src/generated/consumer/Message";
 import {SessionTokenStore} from "sdkgen-client";
@@ -9,6 +9,7 @@ import {ProviderService} from "../../../service/provider.service";
 import {UserService} from "../../../service/user.service";
 import {ConsumerService} from "../../../service/consumer.service";
 import {ErrorConverter} from "../../../util/error-converter";
+import {Config, FUSIO_CONFIG} from "../../../config/config";
 
 @Component({
   selector: 'fusio-login-provider',
@@ -19,7 +20,7 @@ export class ProviderComponent implements OnInit {
 
   response?: Message;
 
-  constructor(private consumer: ConsumerService, private router: Router, private user: UserService<UserAccount>, protected route: ActivatedRoute, private provider: ProviderService) { }
+  constructor(private consumer: ConsumerService, private router: Router, private user: UserService<UserAccount>, protected route: ActivatedRoute, private provider: ProviderService, @Inject(FUSIO_CONFIG) private config: Config) { }
 
   async ngOnInit(): Promise<void> {
     const provider = this.route.snapshot.paramMap.get('provider');
@@ -74,7 +75,12 @@ export class ProviderComponent implements OnInit {
 
     this.user.login(response.data);
 
-    this.router.navigate(['/account']).then(() => {
+    let homePath = '/account';
+    if (this.config.homePath) {
+      homePath = this.config.homePath;
+    }
+
+    this.router.navigate([homePath]).then(() => {
       location.reload();
     });
   }

projects/fusio-sdk/src/lib/component/subscription/subscription.component.ts

@@ -1,9 +1,10 @@
-import {Component, Input, OnInit} from '@angular/core';
+import {Component, Inject, Input, OnInit} from '@angular/core';
 import {Plan} from "fusio-sdk/dist/src/generated/consumer/Plan";
 import {Message} from "fusio-sdk/dist/src/generated/consumer/Message";
 import {ConsumerService} from "../../service/consumer.service";
 import {LocationStrategy} from "@angular/common";
 import {ErrorConverter} from "../../util/error-converter";
+import {Config, FUSIO_CONFIG} from "../../config/config";
 
 @Component({
   selector: 'fusio-subscription',
@@ -12,32 +13,28 @@ import {ErrorConverter} from "../../util/error-converter";
 })
 export class SubscriptionComponent implements OnInit {
 
-  @Input()
-  provider: string = 'stripe';
-
-  @Input()
-  currencyCode: string = 'USD';
-
-  @Input()
-  redirectPath: string = '/account';
-
+  currencyCode: string = 'EUR';
   plans?: Array<Plan>
   response?: Message;
 
-  constructor(private consumer: ConsumerService, private location: LocationStrategy) { }
+  constructor(private consumer: ConsumerService, private location: LocationStrategy, @Inject(FUSIO_CONFIG) private config: Config) { }
 
   async ngOnInit(): Promise<void> {
     const plan = await this.consumer.getClient().getConsumerPlan();
     const response = await plan.consumerActionPlanGetAll({count: 1024});
     this.plans = response.data.entry;
+
+    if (this.config.paymentCurrency) {
+      this.currencyCode = this.config.paymentCurrency;
+    }
   }
 
   async doBillingPortal() {
     try {
-      const path = this.location.prepareExternalUrl(this.redirectPath);
+      const path = this.location.prepareExternalUrl(this.getHomePath());
       const redirectUrl = location.origin + path;
 
-      const portal = await this.consumer.getClient().getConsumerPaymentByProviderPortal(this.provider);
+      const portal = await this.consumer.getClient().getConsumerPaymentByProviderPortal(this.getPaymentProvider());
       const response = await portal.consumerActionPaymentPortal({
         returnUrl: redirectUrl
       });
@@ -54,10 +51,10 @@ export class SubscriptionComponent implements OnInit {
 
   async doPurchase(plan: Plan) {
     try {
-      const path = this.location.prepareExternalUrl(this.redirectPath);
+      const path = this.location.prepareExternalUrl(this.getHomePath());
       const redirectUrl = location.origin + path;
 
-      const checkout = await this.consumer.getClient().getConsumerPaymentByProviderCheckout(this.provider);
+      const checkout = await this.consumer.getClient().getConsumerPaymentByProviderCheckout(this.getPaymentProvider());
       const response = await checkout.consumerActionPaymentCheckout({
         planId: plan.id,
         returnUrl: redirectUrl,
@@ -71,4 +68,20 @@ export class SubscriptionComponent implements OnInit {
     }
   }
 
+  private getHomePath(): string {
+    if (this.config.homePath) {
+      return this.config.homePath;
+    } else {
+      return '/account';
+    }
+  }
+
+  private getPaymentProvider(): string {
+    if (this.config.paymentProvider) {
+      return this.config.paymentProvider;
+    } else {
+      return 'stripe';
+    }
+  }
+
 }

projects/fusio-sdk/src/lib/config/config.ts

@@ -2,6 +2,9 @@ import {InjectionToken} from "@angular/core";
 
 export interface Config {
   baseUrl: string,
+  homePath: string,
+  paymentProvider: string,
+  paymentCurrency: string,
   providers?: Array<Provider>,
   recaptcha?: string,
 }