add fusio sdk config and forRoot method

Author: chriskapp

package-lock.json

@@ -20,6 +20,8 @@
     "@angular/router": "~13.3.0",
     "@ng-bootstrap/ng-bootstrap": "^12.1.2",
     "fusio-sdk": "^2.2.5",
+    "ngx-captcha": "^11.0.0",
+    "ngx-gravatar": "^13.0.0",
     "ng-packagr": "~13.3.0",
     "rxjs": "~7.5.0",
     "tslib": "^2.3.0",

package.json

@@ -3,9 +3,10 @@ import {Message} from "fusio-sdk/dist/src/generated/consumer/Message";
 import axios from "axios";
 import {Router} from "@angular/router";
 import {User_Account} from "fusio-sdk/dist/src/generated/consumer/User_Account";
-import {Provider, ProviderService} from "../../service/provider.service";
+import {ProviderService} from "../../service/provider.service";
 import {UserService} from "../../service/user.service";
 import {ConsumerService} from "../../service/consumer.service";
+import {Provider} from "../../config/config";
 
 @Component({
   selector: 'fusio-login',

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

@@ -1,10 +1,10 @@
-import {Component, OnInit} from '@angular/core';
+import {Component, Inject, OnInit} from '@angular/core';
 import {Message} from "fusio-sdk/dist/src/generated/consumer/Message";
 import {ActivatedRoute} from "@angular/router";
 import axios from "axios";
 import {User_Email} from "fusio-sdk/dist/src/generated/consumer/User_Email";
-import {RecaptchaConfig} from "../../register/register.component";
 import {ConsumerService} from "../../../service/consumer.service";
+import {Config, FUSIO_CONFIG} from "../../../config/config";
 
 @Component({
   selector: 'fusio-password-reset',
@@ -22,11 +22,11 @@ export class ResetComponent implements OnInit {
   response?: Message;
   loading = false
 
-  constructor(private consumer: ConsumerService, protected route: ActivatedRoute, private config: RecaptchaConfig) {
+  constructor(private consumer: ConsumerService, protected route: ActivatedRoute, @Inject(FUSIO_CONFIG) private config: Config) {
   }
 
   ngOnInit(): void {
-    let captchaKey = this.config.getKey()
+    let captchaKey = this.config.recaptcha;
     if (captchaKey) {
       this.captchaKey = captchaKey;
     }

projects/fusio-sdk/src/lib/component/password/reset/reset.component.ts

@@ -1,8 +1,9 @@
-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 {User_Register} from "fusio-sdk/dist/src/generated/consumer/User_Register";
 import {ConsumerService} from "../../service/consumer.service";
+import {Config, FUSIO_CONFIG} from "../../config/config";
 
 @Component({
   selector: 'fusio-register',
@@ -23,11 +24,11 @@ export class RegisterComponent implements OnInit {
   response?: Message;
   loading = false
 
-  constructor(private consumer: ConsumerService, private config: RecaptchaConfig) {
+  constructor(private consumer: ConsumerService, @Inject(FUSIO_CONFIG) private config: Config) {
   }
 
   ngOnInit(): void {
-    let captchaKey = this.config.getKey()
+    let captchaKey = this.config.recaptcha;
     if (captchaKey) {
       this.captchaKey = captchaKey;
     }
@@ -72,7 +73,3 @@ export class RegisterComponent implements OnInit {
   }
 
 }
-
-export interface RecaptchaConfig {
-  getKey(): string|null;
-}

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

@@ -0,0 +1,17 @@
+import {InjectionToken} from "@angular/core";
+
+export interface Config {
+  baseUrl: string,
+  providers?: Array<Provider>,
+  recaptcha?: string,
+}
+
+export interface Provider {
+  name: string,
+  icon: string,
+  key: string
+  url: string,
+  params: Record<string, string>
+}
+
+export const FUSIO_CONFIG = new InjectionToken<Config>('FUSIO_CONFIG');

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

@@ -1,4 +1,4 @@
-import {NgModule} from '@angular/core';
+import {ModuleWithProviders, NgModule, Optional, SkipSelf} from '@angular/core';
 import {NgbModule} from "@ng-bootstrap/ng-bootstrap";
 import {CommonModule} from "@angular/common";
 import {FormsModule} from "@angular/forms";
@@ -17,6 +17,8 @@ import {ConfirmComponent} from "./component/password/confirm/confirm.component";
 import {ResetComponent} from "./component/password/reset/reset.component";
 import {RegisterComponent} from "./component/register/register.component";
 import {ActivateComponent} from "./component/register/activate/activate.component";
+import {Config, FUSIO_CONFIG} from "./config/config";
+import {NgxCaptchaModule} from "ngx-captcha";
 
 @NgModule({
   declarations: [
@@ -40,6 +42,7 @@ import {ActivateComponent} from "./component/register/activate/activate.componen
     FormsModule,
     RouterModule,
     NgbModule,
+    NgxCaptchaModule,
   ],
   exports: [
     EmptyComponent,
@@ -50,4 +53,23 @@ import {ActivateComponent} from "./component/register/activate/activate.componen
     SidebarComponent,
   ]
 })
-export class FusioSdkModule { }
+export class FusioSdkModule {
+
+  constructor(@Optional() @SkipSelf() parentModule?: FusioSdkModule) {
+    if (parentModule) {
+      throw new Error(
+        'FusioSdkModule is already loaded. Import it in the AppModule only');
+    }
+  }
+
+  static forRoot(config?: Config): ModuleWithProviders<FusioSdkModule> {
+    return({
+      ngModule: FusioSdkModule,
+      providers: [{
+        provide: FUSIO_CONFIG,
+        useValue: config
+      }]
+    });
+  }
+
+}

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

@@ -1,8 +1,9 @@
-import {Injectable} from '@angular/core';
+import {Inject, Injectable} from '@angular/core';
 import {TokenStoreInterface} from "sdkgen-client/dist/src/TokenStoreInterface";
 import {SessionTokenStore} from "sdkgen-client/dist/src/TokenStore/SessionTokenStore";
 import {ClientCredentials} from "sdkgen-client/dist/src/Credentials/ClientCredentials";
 import {ClientAbstract, CredentialsInterface} from "sdkgen-client";
+import {Config, FUSIO_CONFIG} from "../config/config";
 
 @Injectable({
   providedIn: 'root'
@@ -12,13 +13,8 @@ export abstract class FusioService<T extends ClientAbstract> {
   private readonly baseUrl: string;
   private readonly store: TokenStoreInterface;
 
-  constructor() {
-    let baseUrl;
-    if (typeof FUSIO_URL === 'string') {
-      baseUrl = FUSIO_URL;
-    } else {
-      baseUrl = FusioService.guessFusioEndpointUrl(false);
-    }
+  constructor(@Inject(FUSIO_CONFIG) private config: Config) {
+    let baseUrl = this.config.baseUrl;
 
     this.baseUrl = FusioService.normalizeBaseUrl(baseUrl);
     this.store = new SessionTokenStore();
@@ -92,13 +88,4 @@ export abstract class FusioService<T extends ClientAbstract> {
     }
   }
 
-  private static guessFusioEndpointUrl(urlRewrite: boolean) {
-    let url = window.location.href
-    const pos = url.lastIndexOf('/fusio')
-    if (pos !== -1) {
-      url = url.substring(0, pos)
-    }
-    return url + (urlRewrite ? '/' : '/index.php/')
-  }
-
 }

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

@@ -1,5 +1,6 @@
-import {Injectable} from '@angular/core';
-import {LocationStrategy, PlatformLocation} from "@angular/common";
+import {Inject, Injectable} from '@angular/core';
+import {LocationStrategy} from "@angular/common";
+import {Config, FUSIO_CONFIG, Provider} from "../config/config";
 
 @Injectable({
   providedIn: 'root'
@@ -8,7 +9,7 @@ export class ProviderService {
 
   providers: Array<Provider> = [];
 
-  constructor(private location: LocationStrategy, private config: ProviderServiceConfig) {
+  constructor(private location: LocationStrategy, @Inject(FUSIO_CONFIG) private config: Config) {
     this.providers = this.getProviders();
   }
 
@@ -66,7 +67,7 @@ export class ProviderService {
   }
 
   public getProviders(): Array<Provider> {
-    return this.config.getProviders();
+    return this.config.providers || [];
   }
 
   private getProviderByName(name: string): Provider|undefined {
@@ -91,25 +92,7 @@ export class ProviderService {
 
 }
 
-export interface Provider {
-  name: string,
-  icon: string,
-  key: string
-  url: string,
-  params: Record<string, string>
-}
-
 export interface Verification {
   clientId: string,
   redirectUri: string,
 }
-
-enum ProviderType {
-  github,
-  google,
-  facebook,
-}
-
-export interface ProviderServiceConfig {
-  getProviders(): Array<Provider>;
-}

projects/fusio-sdk/src/lib/service/provider.service.ts

@@ -22,12 +22,11 @@ export * from './lib/component/sidebar/sidebar.component';
 
 export * from './lib/guard/authentication.guard';
 
+export * from './lib/service/backend.service';
+export * from './lib/service/consumer.service';
 export * from './lib/service/fusio.service';
 export * from './lib/service/help.service';
+export * from './lib/service/provider.service';
 export * from './lib/service/user.service';
 
 export * from './lib/fusio-sdk.module';
-
-declare global {
-  var FUSIO_URL: string | undefined;
-}