Skip to content

Commit 6f85560

Browse files
committed
update deps and use correct models
1 parent 148344e commit 6f85560

File tree

10 files changed

+41
-41
lines changed

10 files changed

+41
-41
lines changed

package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@angular/platform-browser-dynamic": "~13.3.0",
2020
"@angular/router": "~13.3.0",
2121
"@ng-bootstrap/ng-bootstrap": "^12.1.2",
22-
"fusio-sdk": "^3.0.0",
22+
"fusio-sdk": "^3.0.1",
2323
"ngx-captcha": "^11.0.0",
2424
"ngx-gravatar": "^13.0.0",
2525
"ng-packagr": "~13.3.0",

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import {Component, OnInit} from '@angular/core';
2-
import {Collection_Category_Query} from "fusio-sdk/dist/src/generated/backend/Collection_Category_Query";
2+
import {CollectionCategoryQuery} from "fusio-sdk/dist/src/generated/backend/CollectionCategoryQuery";
33
import {ActivatedRoute, Router} from "@angular/router";
44
import {NgbModal} from "@ng-bootstrap/ng-bootstrap";
55
import axios, {AxiosResponse} from "axios";
66
import {Collection} from "fusio-sdk/dist/src/generated/backend/Collection";
77
import {Message} from "fusio-sdk/dist/src/generated/backend/Message";
8-
import {Collection_Query} from "fusio-sdk/dist/src/generated/backend/Collection_Query";
8+
import {CollectionQuery} from "fusio-sdk/dist/src/generated/backend/CollectionQuery";
99
import {FusioService} from "../service/fusio.service";
1010
import {ClientAbstract} from "sdkgen-client";
1111
import {ErrorConverter} from "../util/error-converter";
@@ -76,8 +76,8 @@ export abstract class List<C extends ClientAbstract, T extends ModelId> implemen
7676
this.finishLoading();
7777
}
7878

79-
protected getCollectionQuery(): Collection_Query {
80-
let query: Collection_Query = {};
79+
protected getCollectionQuery(): CollectionQuery {
80+
let query: CollectionQuery = {};
8181
query.startIndex = (this.page - 1) * this.pageSize;
8282
query.count = this.pageSize;
8383
if (this.search) {
@@ -189,7 +189,7 @@ export abstract class List<C extends ClientAbstract, T extends ModelId> implemen
189189
}, 100);
190190
}
191191

192-
protected abstract getAll(query: Collection_Category_Query): Promise<AxiosResponse<Collection<T>>>;
192+
protected abstract getAll(query: CollectionCategoryQuery): Promise<AxiosResponse<Collection<T>>>;
193193
protected abstract get(id: string): Promise<AxiosResponse<T>>;
194194
protected abstract getDetailComponent(): any;
195195
protected abstract getRoute(): string;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {Component, OnInit} from '@angular/core';
22
import {Message} from "fusio-sdk/dist/src/generated/consumer/Message";
33
import axios from "axios";
44
import {Router} from "@angular/router";
5-
import {User_Account} from "fusio-sdk/dist/src/generated/consumer/User_Account";
5+
import {UserAccount} from "fusio-sdk/dist/src/generated/consumer/UserAccount";
66
import {ProviderService} from "../../service/provider.service";
77
import {UserService} from "../../service/user.service";
88
import {ConsumerService} from "../../service/consumer.service";
@@ -25,7 +25,7 @@ export class LoginComponent implements OnInit {
2525

2626
providers: Array<Provider> = [];
2727

28-
constructor(private consumer: ConsumerService, private router: Router, private user: UserService<User_Account>, private provider: ProviderService) {
28+
constructor(private consumer: ConsumerService, private router: Router, private user: UserService<UserAccount>, private provider: ProviderService) {
2929
}
3030

3131
ngOnInit(): void {
@@ -37,8 +37,8 @@ export class LoginComponent implements OnInit {
3737

3838
try {
3939
const client = this.consumer.getClientWithCredentials(this.credentials.username, this.credentials.password);
40-
const account = await client.consumerUser();
41-
const response = await account.getConsumerAccount().consumerActionUserGet();
40+
const resource = await client.getConsumerAccount();
41+
const response = await resource.consumerActionUserGet();
4242

4343
this.user.login(response.data);
4444

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {Message} from "fusio-sdk/dist/src/generated/consumer/Message";
44
import {SessionTokenStore} from "sdkgen-client";
55
import {AccessToken} from "sdkgen-client/dist/src/AccessToken";
66
import {ActivatedRoute, Router} from "@angular/router";
7-
import {User_Account} from "fusio-sdk/dist/src/generated/consumer/User_Account";
7+
import {UserAccount} from "fusio-sdk/dist/src/generated/consumer/UserAccount";
88
import {ProviderService} from "../../../service/provider.service";
99
import {UserService} from "../../../service/user.service";
1010
import {ConsumerService} from "../../../service/consumer.service";
@@ -19,7 +19,7 @@ export class ProviderComponent implements OnInit {
1919

2020
response?: Message;
2121

22-
constructor(private consumer: ConsumerService, private router: Router, private user: UserService<User_Account>, protected route: ActivatedRoute, private provider: ProviderService) { }
22+
constructor(private consumer: ConsumerService, private router: Router, private user: UserService<UserAccount>, protected route: ActivatedRoute, private provider: ProviderService) { }
2323

2424
async ngOnInit(): Promise<void> {
2525
const provider = this.route.snapshot.paramMap.get('provider');
@@ -40,8 +40,8 @@ export class ProviderComponent implements OnInit {
4040
try {
4141
const verification = this.provider.verifyRequest(providerName, state);
4242

43-
const group = await this.consumer.getClientAnonymous().consumerUser();
44-
const response = await group.getConsumerProviderByProvider(providerName).consumerActionUserProvider({
43+
const resource = await this.consumer.getClientAnonymous().getConsumerProviderByProvider(providerName);
44+
const response = await resource.consumerActionUserProvider({
4545
code: code,
4646
clientId: verification.clientId,
4747
redirectUri: verification.redirectUri,
@@ -69,8 +69,8 @@ export class ProviderComponent implements OnInit {
6969
}
7070

7171
private async obtainUserInfo() {
72-
const account = await this.consumer.getClient().consumerUser();
73-
const response = await account.getConsumerAccount().consumerActionUserGet();
72+
const resource = await this.consumer.getClient().getConsumerAccount();
73+
const response = await resource.consumerActionUserGet();
7474

7575
this.user.login(response.data);
7676

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, OnInit } from '@angular/core';
22
import {Router} from "@angular/router";
3-
import {User_Account} from "fusio-sdk/dist/src/generated/consumer/User_Account";
3+
import {UserAccount} from "fusio-sdk/dist/src/generated/consumer/UserAccount";
44
import {UserService} from "../../service/user.service";
55

66
@Component({
@@ -10,7 +10,7 @@ import {UserService} from "../../service/user.service";
1010
})
1111
export class LogoutComponent implements OnInit {
1212

13-
constructor(private user: UserService<User_Account>, private router: Router) {
13+
constructor(private user: UserService<UserAccount>, private router: Router) {
1414
}
1515

1616
ngOnInit(): void {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {Component, OnInit} from '@angular/core';
22
import {Message} from "fusio-sdk/dist/src/generated/consumer/Message";
33
import {ActivatedRoute} from "@angular/router";
44
import axios from "axios";
5-
import {User_PasswordReset} from "fusio-sdk/dist/src/generated/consumer/User_PasswordReset";
5+
import {UserPasswordReset} from "fusio-sdk/dist/src/generated/consumer/UserPasswordReset";
66
import {ConsumerService} from "../../../service/consumer.service";
77
import {ErrorConverter} from "../../../util/error-converter";
88

@@ -13,7 +13,7 @@ import {ErrorConverter} from "../../../util/error-converter";
1313
})
1414
export class ConfirmComponent implements OnInit {
1515

16-
reset: User_PasswordReset = {
16+
reset: UserPasswordReset = {
1717
token: '',
1818
newPassword: '',
1919
}
@@ -44,8 +44,8 @@ export class ConfirmComponent implements OnInit {
4444
}
4545

4646
const client = this.consumer.getClientAnonymous();
47-
const account = await client.consumerUser();
48-
const response = await account.getConsumerPasswordReset().consumerActionUserResetPasswordExecute(this.reset);
47+
const resource = await client.getConsumerPasswordReset();
48+
const response = await resource.consumerActionUserResetPasswordExecute(this.reset);
4949

5050
this.response = response.data;
5151
this.loading = false;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {Component, Inject, OnInit} from '@angular/core';
22
import {Message} from "fusio-sdk/dist/src/generated/consumer/Message";
33
import {ActivatedRoute} from "@angular/router";
44
import axios from "axios";
5-
import {User_Email} from "fusio-sdk/dist/src/generated/consumer/User_Email";
5+
import {UserEmail} from "fusio-sdk/dist/src/generated/consumer/UserEmail";
66
import {ConsumerService} from "../../../service/consumer.service";
77
import {Config, FUSIO_CONFIG} from "../../../config/config";
88
import {ErrorConverter} from "../../../util/error-converter";
@@ -14,7 +14,7 @@ import {ErrorConverter} from "../../../util/error-converter";
1414
})
1515
export class ResetComponent implements OnInit {
1616

17-
data: User_Email = {
17+
data: UserEmail = {
1818
email: '',
1919
}
2020

@@ -42,8 +42,8 @@ export class ResetComponent implements OnInit {
4242
}
4343

4444
const client = this.consumer.getClientAnonymous();
45-
const account = await client.consumerUser();
46-
const response = await account.getConsumerPasswordReset().consumerActionUserResetPasswordRequest(this.data);
45+
const resource = await client.getConsumerPasswordReset();
46+
const response = await resource.consumerActionUserResetPasswordRequest(this.data);
4747

4848
this.response = response.data;
4949
this.loading = false;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {Component, OnInit} from '@angular/core';
22
import {Message} from "fusio-sdk/dist/src/generated/consumer/Message";
33
import {ActivatedRoute} from "@angular/router";
44
import axios from "axios";
5-
import {User_Activate} from "fusio-sdk/dist/src/generated/consumer/User_Activate";
5+
import {UserActivate} from "fusio-sdk/dist/src/generated/consumer/UserActivate";
66
import {ConsumerService} from "../../../service/consumer.service";
77
import {ErrorConverter} from "../../../util/error-converter";
88

@@ -28,14 +28,14 @@ export class ActivateComponent implements OnInit {
2828
}
2929

3030
private async activate(token: string) {
31-
let activate: User_Activate = {
31+
let activate: UserActivate = {
3232
token: token
3333
};
3434

3535
try {
3636
const client = this.consumer.getClientAnonymous();
37-
const account = await client.consumerUser();
38-
const response = await account.getConsumerActivate().consumerActionUserActivate(activate);
37+
const resource = await client.getConsumerActivate();
38+
const response = await resource.consumerActionUserActivate(activate);
3939

4040
this.response = response.data;
4141
} catch (error) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {Component, Inject, OnInit} from '@angular/core';
22
import {Message} from "fusio-sdk/dist/src/generated/consumer/Message";
33
import axios from "axios";
4-
import {User_Register} from "fusio-sdk/dist/src/generated/consumer/User_Register";
4+
import {UserRegister} from "fusio-sdk/dist/src/generated/consumer/UserRegister";
55
import {ConsumerService} from "../../service/consumer.service";
66
import {Config, FUSIO_CONFIG} from "../../config/config";
77
import {ErrorConverter} from "../../util/error-converter";
@@ -13,7 +13,7 @@ import {ErrorConverter} from "../../util/error-converter";
1313
})
1414
export class RegisterComponent implements OnInit {
1515

16-
credentials: User_Register = {
16+
credentials: UserRegister = {
1717
name: '',
1818
email: '',
1919
password: '',
@@ -48,8 +48,8 @@ export class RegisterComponent implements OnInit {
4848
}
4949

5050
const client = this.consumer.getClientAnonymous();
51-
const account = await client.consumerUser();
52-
const response = await account.getConsumerRegister().consumerActionUserRegister(this.credentials);
51+
const resource = await client.getConsumerRegister();
52+
const response = await resource.consumerActionUserRegister(this.credentials);
5353

5454
this.response = response.data;
5555
this.loading = false;

0 commit comments

Comments
 (0)