update fusio sdk

Author: chriskapp

README.md

@@ -15,14 +15,14 @@ extends from the `FusioService` in this SDK s.
 
 ```typescript
 import {Injectable} from '@angular/core';
-import {FusioService as Sdk} from "ngx-fusio-sdk";
+import {ApiService} from "ngx-fusio-sdk";
 import {CredentialsInterface, TokenStoreInterface} from "sdkgen-client";
 import Client from "fusio-sdk/dist/src/generated/backend/Client";
 
 @Injectable({
   providedIn: 'root'
 })
-export class FusioService extends Sdk<Client> {
+export class FusioService extends ApiService<Client> {
 
   protected newClient(baseUrl: string, credentials: CredentialsInterface | null | undefined, tokenStore: TokenStoreInterface | undefined): Client {
     return new Client(baseUrl, credentials, tokenStore);

package-lock.json

@@ -21,8 +21,7 @@
     "tslib": "^2.3.0",
     "zone.js": "~0.13.0",
     "@ng-bootstrap/ng-bootstrap": "^15.0.0",
-    "fusio-sdk": "^3.1.2",
-    "ngx-fusio-sdk": "^2.0.7",
+    "fusio-sdk": "^4.0.0",
     "ngx-captcha": "^13.0.0",
     "ngx-gravatar": "^13.0.0",
     "ng-packagr": "^16.1.0"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-fusio-sdk",
-  "version": "2.2.1",
+  "version": "3.0.0",
   "description": "SDK to integrate Fusio into an Angular app",
   "keywords": [
     "Fusio",

projects/fusio-sdk/package.json

@@ -2,7 +2,7 @@ import {Component} from '@angular/core';
 import {ActivatedRoute, Router} from "@angular/router";
 import {NgbModal} from "@ng-bootstrap/ng-bootstrap";
 import {ClientAbstract} from "sdkgen-client";
-import {FusioService} from "../service/fusio.service";
+import {ApiService} from "../service/api.service";
 import {ErrorService} from "../service/error.service";
 import {EventService} from "../service/event.service";
 import {Result} from "./modal";
@@ -19,7 +19,7 @@ export abstract class List<C extends ClientAbstract, T extends ModelId> extends
 
   protected modalService: NgbModal;
 
-  constructor(fusio: FusioService<C>, route: ActivatedRoute, router: Router, event: EventService, error: ErrorService, modalService: NgbModal) {
+  constructor(fusio: ApiService<C>, route: ActivatedRoute, router: Router, event: EventService, error: ErrorService, modalService: NgbModal) {
     super(fusio, route, router, event, error);
     this.modalService = modalService;
   }

projects/fusio-sdk/src/lib/abstract/list.ts

@@ -1,8 +1,8 @@
 import {Component, Input, OnInit} from "@angular/core";
-import {Message} from "fusio-sdk/dist/src/generated/backend/Message";
+import {CommonMessage} from "fusio-sdk/dist/src/CommonMessage";
 import {Mode} from "./list";
 import {ClientAbstract} from "sdkgen-client";
-import {FusioService} from "../service/fusio.service";
+import {ApiService} from "../service/api.service";
 import {ErrorService} from "../service/error.service";
 import {ModelId} from "./query";
 
@@ -16,16 +16,16 @@ import {ModelId} from "./query";
 })
 export abstract class Manipulation<C extends ClientAbstract, T extends ModelId> implements OnInit {
 
-  response?: Message;
+  response?: CommonMessage;
   loading: boolean = false;
 
   @Input() mode: Mode = Mode.Create;
   @Input() entity: T = this.newEntity();
 
-  protected fusio: FusioService<C>;
+  protected fusio: ApiService<C>;
   protected error: ErrorService;
 
-  constructor(fusio: FusioService<C>, error: ErrorService) {
+  constructor(fusio: ApiService<C>, error: ErrorService) {
     this.fusio = fusio;
     this.error = error;
   }
@@ -63,12 +63,12 @@ export abstract class Manipulation<C extends ClientAbstract, T extends ModelId>
     }
   }
 
-  protected onResponse(response: Message, entity: T): void {
+  protected onResponse(response: CommonMessage, entity: T): void {
   }
 
-  protected abstract create(entity: T): Promise<Message|void>;
-  protected abstract update(entity: T): Promise<Message|void>;
-  protected abstract delete(entity: T): Promise<Message|void>;
+  protected abstract create(entity: T): Promise<CommonMessage|void>;
+  protected abstract update(entity: T): Promise<CommonMessage|void>;
+  protected abstract delete(entity: T): Promise<CommonMessage|void>;
   protected abstract newEntity(): T;
 
 }

projects/fusio-sdk/src/lib/abstract/manipulation.ts

@@ -1,8 +1,8 @@
 import {Component} from "@angular/core";
-import {Message} from "fusio-sdk/dist/src/generated/backend/Message";
+import {CommonMessage} from "fusio-sdk/dist/src/CommonMessage";
 import {NgbActiveModal, NgbModal} from "@ng-bootstrap/ng-bootstrap";
 import {ClientAbstract} from "sdkgen-client";
-import {FusioService} from "../service/fusio.service";
+import {ApiService} from "../service/api.service";
 import {ErrorService} from "../service/error.service";
 import {Manipulation} from "./manipulation";
 import {ModelId} from "./query";
@@ -19,13 +19,13 @@ export abstract class Modal<C extends ClientAbstract, T extends ModelId> extends
   protected modalService: NgbModal;
   public modal: NgbActiveModal;
 
-  constructor(fusio: FusioService<C>, error: ErrorService, modalService: NgbModal, modal: NgbActiveModal) {
+  constructor(fusio: ApiService<C>, error: ErrorService, modalService: NgbModal, modal: NgbActiveModal) {
     super(fusio, error);
     this.modalService = modalService;
     this.modal = modal;
   }
 
-  protected override onResponse(response: Message, entity: T) {
+  protected override onResponse(response: CommonMessage, entity: T) {
     this.modal.close({
       entity: entity,
       response: response,
@@ -36,5 +36,5 @@ export abstract class Modal<C extends ClientAbstract, T extends ModelId> extends
 
 export interface Result<T> {
   entity: T,
-  response: Message,
+  response: CommonMessage,
 }

projects/fusio-sdk/src/lib/abstract/modal.ts

@@ -1,9 +1,9 @@
 import {Component, OnInit} from '@angular/core';
 import {ActivatedRoute, Router} from "@angular/router";
 import {ClientAbstract} from "sdkgen-client";
-import {Collection} from "fusio-sdk/dist/src/generated/backend/Collection";
-import {Message} from "fusio-sdk/dist/src/generated/backend/Message";
-import {FusioService} from "../service/fusio.service";
+import {CommonCollection} from "fusio-sdk/dist/src/CommonCollection";
+import {CommonMessage} from "fusio-sdk/dist/src/CommonMessage";
+import {ApiService} from "../service/api.service";
 import {ErrorService} from "../service/error.service";
 import {EventService} from "../service/event.service";
 
@@ -24,16 +24,16 @@ export abstract class Query<C extends ClientAbstract, T extends ModelId> impleme
   public selected?: T;
   public page: number = 1;
   public pageSize: number = 16;
-  public response?: Message;
+  public response?: CommonMessage;
   public loading: boolean = true;
 
-  protected fusio: FusioService<C>;
+  protected fusio: ApiService<C>;
   protected route: ActivatedRoute;
   protected router: Router;
   protected event: EventService;
   protected error: ErrorService;
 
-  constructor(fusio: FusioService<C>, route: ActivatedRoute, router: Router, event: EventService, error: ErrorService) {
+  constructor(fusio: ApiService<C>, route: ActivatedRoute, router: Router, event: EventService, error: ErrorService) {
     this.fusio = fusio;
     this.route = route;
     this.router = router;
@@ -164,7 +164,7 @@ export abstract class Query<C extends ClientAbstract, T extends ModelId> impleme
     }, 100);
   }
 
-  protected abstract getAll(parameters: Array<any>): Promise<Collection<T>>;
+  protected abstract getAll(parameters: Array<any>): Promise<CommonCollection<T>>;
   protected abstract get(id: string): Promise<T>;
   protected abstract getRoute(): string;
 

projects/fusio-sdk/src/lib/abstract/query.ts

@@ -1,8 +1,8 @@
 import {Component, OnInit} from '@angular/core';
-import {ConsumerService} from "../../service/consumer.service";
-import {Message} from "fusio-sdk/dist/src/generated/consumer/Message";
-import {UserAccount} from "fusio-sdk/dist/src/generated/consumer/UserAccount";
+import {CommonMessage} from "fusio-sdk/dist/src/CommonMessage";
+import {ConsumerUserAccount} from "fusio-sdk/dist/src/ConsumerUserAccount";
 import {ErrorService} from "../../service/error.service";
+import {FusioService} from "../../service/fusio.service";
 
 @Component({
   selector: 'fusio-account',
@@ -11,16 +11,16 @@ import {ErrorService} from "../../service/error.service";
 })
 export class AccountComponent implements OnInit {
 
-  user?: UserAccount;
-  response?: Message;
+  user?: ConsumerUserAccount;
+  response?: CommonMessage;
   email: string = '';
 
-  constructor(private consumer: ConsumerService, private error: ErrorService) { }
+  constructor(private fusio: FusioService, private error: ErrorService) { }
 
   async ngOnInit(): Promise<void> {
     try {
-      this.user = await this.consumer.getClient().account().get();
-      this.email = this.user.email || '';
+      this.user = await this.fusio.getClient().consumer().account().get();
+      this.email = this.user?.email || '';
       this.response = undefined;
     } catch (error) {
       this.response = this.error.convert(error);
@@ -33,7 +33,7 @@ export class AccountComponent implements OnInit {
         return;
       }
 
-      this.response = await this.consumer.getClient().account().update(this.user);
+      this.response = await this.fusio.getClient().consumer().account().update(this.user);
     } catch (error) {
       this.response = this.error.convert(error);
     }

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

@@ -1,13 +1,13 @@
 import {Component} from '@angular/core';
 import {Detail} from "../../../abstract/detail";
-import {App} from "fusio-sdk/dist/src/generated/consumer/App";
+import {ConsumerApp} from "fusio-sdk/dist/src/ConsumerApp";
 
 @Component({
   selector: 'fusio-app-detail',
   templateUrl: './app-detail.component.html',
   styleUrls: ['./app-detail.component.css']
 })
-export class AppDetailComponent extends Detail<App> {
+export class AppDetailComponent extends Detail<ConsumerApp> {
 
   hideSecret = true;
 

projects/fusio-sdk/src/lib/component/app/detail/app-detail.component.ts

@@ -1,12 +1,12 @@
 import {Component} from '@angular/core';
-import {App} from "fusio-sdk/dist/src/generated/consumer/App";
-import {Client} from "fusio-sdk/dist/src/generated/consumer/Client";
-import {Collection} from "fusio-sdk/dist/src/generated/consumer/Collection";
+import {ConsumerApp} from "fusio-sdk/dist/src/ConsumerApp";
+import {Client} from "fusio-sdk/dist/src/Client";
+import {CommonCollection} from "fusio-sdk/dist/src/CommonCollection";
 import {List} from "../../../abstract/list";
 import {AppModalComponent} from "../modal/app-modal.component";
 import {ActivatedRoute, Router} from "@angular/router";
 import {NgbModal} from "@ng-bootstrap/ng-bootstrap";
-import {ConsumerService} from "../../../service/consumer.service";
+import {FusioService} from "../../../service/fusio.service";
 import {EventService} from "../../../service/event.service";
 import {ErrorService} from "../../../service/error.service";
 
@@ -15,18 +15,18 @@ import {ErrorService} from "../../../service/error.service";
   templateUrl: './app-list.component.html',
   styleUrls: ['./app-list.component.css']
 })
-export class AppListComponent extends List<Client, App> {
+export class AppListComponent extends List<Client, ConsumerApp> {
 
-  constructor(fusio: ConsumerService, route: ActivatedRoute, router: Router, event: EventService, error: ErrorService, modalService: NgbModal) {
+  constructor(fusio: FusioService, route: ActivatedRoute, router: Router, event: EventService, error: ErrorService, modalService: NgbModal) {
     super(fusio, route, router, event, error, modalService);
   }
 
-  protected async getAll(parameters: Array<any>): Promise<Collection<App>> {
-    return this.fusio.getClient().app().getAll(...parameters);
+  protected async getAll(parameters: Array<any>): Promise<CommonCollection<ConsumerApp>> {
+    return this.fusio.getClient().consumer().app().getAll(...parameters);
   }
 
-  protected async get(id: string): Promise<App> {
-    return this.fusio.getClient().app().get(id);
+  protected async get(id: string): Promise<ConsumerApp> {
+    return this.fusio.getClient().consumer().app().get(id);
   }
 
   protected getDetailComponent(): any {

projects/fusio-sdk/src/lib/component/app/list/app-list.component.ts

@@ -1,46 +1,46 @@
 import {Component} from '@angular/core';
 import {Modal} from "../../../abstract/modal";
-import {Client} from "fusio-sdk/dist/src/generated/consumer/Client";
-import {App} from "fusio-sdk/dist/src/generated/consumer/App";
-import {Message} from "fusio-sdk/dist/src/generated/consumer/Message";
-import {AppCreate} from "fusio-sdk/dist/src/generated/consumer/AppCreate";
-import {AppUpdate} from "fusio-sdk/dist/src/generated/consumer/AppUpdate";
-import {Scope} from "fusio-sdk/dist/src/generated/consumer/Scope";
+import {Client} from "fusio-sdk/dist/src/Client";
+import {ConsumerApp} from "fusio-sdk/dist/src/ConsumerApp";
+import {CommonMessage} from "fusio-sdk/dist/src/CommonMessage";
+import {ConsumerAppCreate} from "fusio-sdk/dist/src/ConsumerAppCreate";
+import {ConsumerAppUpdate} from "fusio-sdk/dist/src/ConsumerAppUpdate";
+import {ConsumerScope} from "fusio-sdk/dist/src/ConsumerScope";
 import {NgbActiveModal, NgbModal} from "@ng-bootstrap/ng-bootstrap";
-import {ConsumerService} from "../../../service/consumer.service";
+import {FusioService} from "../../../service/fusio.service";
 import {ErrorService} from "../../../service/error.service";
 
 @Component({
   selector: 'fusio-app-modal',
   templateUrl: './app-modal.component.html',
   styleUrls: ['./app-modal.component.css']
 })
-export class AppModalComponent extends Modal<Client, App> {
+export class AppModalComponent extends Modal<Client, ConsumerApp> {
 
-  scopes?: Array<Scope>;
+  scopes?: Array<ConsumerScope>;
 
-  constructor(fusio: ConsumerService, error: ErrorService, modalService: NgbModal, modal: NgbActiveModal) {
+  constructor(fusio: FusioService, error: ErrorService, modalService: NgbModal, modal: NgbActiveModal) {
     super(fusio, error, modalService, modal);
   }
 
   override async ngOnInit(): Promise<void> {
-    const response = await this.fusio.getClient().scope().getAll(0, 1024);
+    const response = await this.fusio.getClient().consumer().scope().getAll(0, 1024);
     this.scopes = response.entry;
   }
 
-  protected async create(entity: App): Promise<Message> {
-    return this.fusio.getClient().app().create(<AppCreate> entity);
+  protected async create(entity: ConsumerApp): Promise<CommonMessage> {
+    return this.fusio.getClient().consumer().app().create(<ConsumerAppCreate> entity);
   }
 
-  protected async update(entity: App): Promise<Message> {
-    return this.fusio.getClient().app().update('' + entity.id, <AppUpdate> entity);
+  protected async update(entity: ConsumerApp): Promise<CommonMessage> {
+    return this.fusio.getClient().consumer().app().update('' + entity.id, <ConsumerAppUpdate> entity);
   }
 
-  protected async delete(entity: App): Promise<Message> {
-    return this.fusio.getClient().app().delete('' + entity.id);
+  protected async delete(entity: ConsumerApp): Promise<CommonMessage> {
+    return this.fusio.getClient().consumer().app().delete('' + entity.id);
   }
 
-  protected newEntity(): App {
+  protected newEntity(): ConsumerApp {
     return {
       name: '',
       url: '',