update deps and use correct models

Author: chriskapp

package-lock.json

@@ -19,7 +19,7 @@
     "@angular/platform-browser-dynamic": "~13.3.0",
     "@angular/router": "~13.3.0",
     "@ng-bootstrap/ng-bootstrap": "^12.1.2",
-    "fusio-sdk": "^3.0.0",
+    "fusio-sdk": "^3.0.1",
     "ngx-captcha": "^11.0.0",
     "ngx-gravatar": "^13.0.0",
     "ng-packagr": "~13.3.0",

package.json

@@ -1,11 +1,11 @@
 import {Component, OnInit} from '@angular/core';
-import {Collection_Category_Query} from "fusio-sdk/dist/src/generated/backend/Collection_Category_Query";
+import {CollectionCategoryQuery} from "fusio-sdk/dist/src/generated/backend/CollectionCategoryQuery";
 import {ActivatedRoute, Router} from "@angular/router";
 import {NgbModal} from "@ng-bootstrap/ng-bootstrap";
 import axios, {AxiosResponse} from "axios";
 import {Collection} from "fusio-sdk/dist/src/generated/backend/Collection";
 import {Message} from "fusio-sdk/dist/src/generated/backend/Message";
-import {Collection_Query} from "fusio-sdk/dist/src/generated/backend/Collection_Query";
+import {CollectionQuery} from "fusio-sdk/dist/src/generated/backend/CollectionQuery";
 import {FusioService} from "../service/fusio.service";
 import {ClientAbstract} from "sdkgen-client";
 import {ErrorConverter} from "../util/error-converter";
@@ -76,8 +76,8 @@ export abstract class List<C extends ClientAbstract, T extends ModelId> implemen
     this.finishLoading();
   }
 
-  protected getCollectionQuery(): Collection_Query {
-    let query: Collection_Query = {};
+  protected getCollectionQuery(): CollectionQuery {
+    let query: CollectionQuery = {};
     query.startIndex = (this.page - 1) * this.pageSize;
     query.count = this.pageSize;
     if (this.search) {
@@ -189,7 +189,7 @@ export abstract class List<C extends ClientAbstract, T extends ModelId> implemen
     }, 100);
   }
 
-  protected abstract getAll(query: Collection_Category_Query): Promise<AxiosResponse<Collection<T>>>;
+  protected abstract getAll(query: CollectionCategoryQuery): Promise<AxiosResponse<Collection<T>>>;
   protected abstract get(id: string): Promise<AxiosResponse<T>>;
   protected abstract getDetailComponent(): any;
   protected abstract getRoute(): string;

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

@@ -2,7 +2,7 @@ import {Component, OnInit} from '@angular/core';
 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 {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";
@@ -25,7 +25,7 @@ export class LoginComponent implements OnInit {
 
   providers: Array<Provider> = [];
 
-  constructor(private consumer: ConsumerService, private router: Router, private user: UserService<User_Account>, private provider: ProviderService) {
+  constructor(private consumer: ConsumerService, private router: Router, private user: UserService<UserAccount>, private provider: ProviderService) {
   }
 
   ngOnInit(): void {
@@ -37,8 +37,8 @@ export class LoginComponent implements OnInit {
 
     try {
       const client = this.consumer.getClientWithCredentials(this.credentials.username, this.credentials.password);
-      const account = await client.consumerUser();
-      const response = await account.getConsumerAccount().consumerActionUserGet();
+      const resource = await client.getConsumerAccount();
+      const response = await resource.consumerActionUserGet();
 
       this.user.login(response.data);
 

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

@@ -4,7 +4,7 @@ import {Message} from "fusio-sdk/dist/src/generated/consumer/Message";
 import {SessionTokenStore} from "sdkgen-client";
 import {AccessToken} from "sdkgen-client/dist/src/AccessToken";
 import {ActivatedRoute, Router} from "@angular/router";
-import {User_Account} from "fusio-sdk/dist/src/generated/consumer/User_Account";
+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";
@@ -19,7 +19,7 @@ export class ProviderComponent implements OnInit {
 
   response?: Message;
 
-  constructor(private consumer: ConsumerService, private router: Router, private user: UserService<User_Account>, protected route: ActivatedRoute, private provider: ProviderService) { }
+  constructor(private consumer: ConsumerService, private router: Router, private user: UserService<UserAccount>, protected route: ActivatedRoute, private provider: ProviderService) { }
 
   async ngOnInit(): Promise<void> {
     const provider = this.route.snapshot.paramMap.get('provider');
@@ -40,8 +40,8 @@ export class ProviderComponent implements OnInit {
     try {
       const verification = this.provider.verifyRequest(providerName, state);
 
-      const group = await this.consumer.getClientAnonymous().consumerUser();
-      const response = await group.getConsumerProviderByProvider(providerName).consumerActionUserProvider({
+      const resource = await this.consumer.getClientAnonymous().getConsumerProviderByProvider(providerName);
+      const response = await resource.consumerActionUserProvider({
         code: code,
         clientId: verification.clientId,
         redirectUri: verification.redirectUri,
@@ -69,8 +69,8 @@ export class ProviderComponent implements OnInit {
   }
 
   private async obtainUserInfo() {
-    const account = await this.consumer.getClient().consumerUser();
-    const response = await account.getConsumerAccount().consumerActionUserGet();
+    const resource = await this.consumer.getClient().getConsumerAccount();
+    const response = await resource.consumerActionUserGet();
 
     this.user.login(response.data);
 

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

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import {Router} from "@angular/router";
-import {User_Account} from "fusio-sdk/dist/src/generated/consumer/User_Account";
+import {UserAccount} from "fusio-sdk/dist/src/generated/consumer/UserAccount";
 import {UserService} from "../../service/user.service";
 
 @Component({
@@ -10,7 +10,7 @@ import {UserService} from "../../service/user.service";
 })
 export class LogoutComponent implements OnInit {
 
-  constructor(private user: UserService<User_Account>, private router: Router) {
+  constructor(private user: UserService<UserAccount>, private router: Router) {
   }
 
   ngOnInit(): void {

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

@@ -2,7 +2,7 @@ import {Component, 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_PasswordReset} from "fusio-sdk/dist/src/generated/consumer/User_PasswordReset";
+import {UserPasswordReset} from "fusio-sdk/dist/src/generated/consumer/UserPasswordReset";
 import {ConsumerService} from "../../../service/consumer.service";
 import {ErrorConverter} from "../../../util/error-converter";
 
@@ -13,7 +13,7 @@ import {ErrorConverter} from "../../../util/error-converter";
 })
 export class ConfirmComponent implements OnInit {
 
-  reset: User_PasswordReset = {
+  reset: UserPasswordReset = {
     token: '',
     newPassword: '',
   }
@@ -44,8 +44,8 @@ export class ConfirmComponent implements OnInit {
       }
 
       const client = this.consumer.getClientAnonymous();
-      const account = await client.consumerUser();
-      const response = await account.getConsumerPasswordReset().consumerActionUserResetPasswordExecute(this.reset);
+      const resource = await client.getConsumerPasswordReset();
+      const response = await resource.consumerActionUserResetPasswordExecute(this.reset);
 
       this.response = response.data;
       this.loading = false;

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

@@ -2,7 +2,7 @@ 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 {UserEmail} from "fusio-sdk/dist/src/generated/consumer/UserEmail";
 import {ConsumerService} from "../../../service/consumer.service";
 import {Config, FUSIO_CONFIG} from "../../../config/config";
 import {ErrorConverter} from "../../../util/error-converter";
@@ -14,7 +14,7 @@ import {ErrorConverter} from "../../../util/error-converter";
 })
 export class ResetComponent implements OnInit {
 
-  data: User_Email = {
+  data: UserEmail = {
     email: '',
   }
 
@@ -42,8 +42,8 @@ export class ResetComponent implements OnInit {
       }
 
       const client = this.consumer.getClientAnonymous();
-      const account = await client.consumerUser();
-      const response = await account.getConsumerPasswordReset().consumerActionUserResetPasswordRequest(this.data);
+      const resource = await client.getConsumerPasswordReset();
+      const response = await resource.consumerActionUserResetPasswordRequest(this.data);
 
       this.response = response.data;
       this.loading = false;

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

@@ -2,7 +2,7 @@ import {Component, 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_Activate} from "fusio-sdk/dist/src/generated/consumer/User_Activate";
+import {UserActivate} from "fusio-sdk/dist/src/generated/consumer/UserActivate";
 import {ConsumerService} from "../../../service/consumer.service";
 import {ErrorConverter} from "../../../util/error-converter";
 
@@ -28,14 +28,14 @@ export class ActivateComponent implements OnInit {
   }
 
   private async activate(token: string) {
-    let activate: User_Activate = {
+    let activate: UserActivate = {
       token: token
     };
 
     try {
       const client = this.consumer.getClientAnonymous();
-      const account = await client.consumerUser();
-      const response = await account.getConsumerActivate().consumerActionUserActivate(activate);
+      const resource = await client.getConsumerActivate();
+      const response = await resource.consumerActionUserActivate(activate);
 
       this.response = response.data;
     } catch (error) {

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

@@ -1,7 +1,7 @@
 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 {UserRegister} from "fusio-sdk/dist/src/generated/consumer/UserRegister";
 import {ConsumerService} from "../../service/consumer.service";
 import {Config, FUSIO_CONFIG} from "../../config/config";
 import {ErrorConverter} from "../../util/error-converter";
@@ -13,7 +13,7 @@ import {ErrorConverter} from "../../util/error-converter";
 })
 export class RegisterComponent implements OnInit {
 
-  credentials: User_Register = {
+  credentials: UserRegister = {
     name: '',
     email: '',
     password: '',
@@ -48,8 +48,8 @@ export class RegisterComponent implements OnInit {
       }
 
       const client = this.consumer.getClientAnonymous();
-      const account = await client.consumerUser();
-      const response = await account.getConsumerRegister().consumerActionUserRegister(this.credentials);
+      const resource = await client.getConsumerRegister();
+      const response = await resource.consumerActionUserRegister(this.credentials);
 
       this.response = response.data;
       this.loading = false;