From f2d531886311e0a20f5517ddc115c055fe604c58 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sun, 12 May 2019 12:20:52 +0200 Subject: [PATCH] Client docs improved. --- .../Implementations/ConfigAppLimitsPlan.cs | 2 -- .../pages/clients/client.component.html | 8 +++++++- .../settings/pages/clients/client.component.ts | 18 ++++++++++++------ 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Services/Implementations/ConfigAppLimitsPlan.cs b/src/Squidex.Domain.Apps.Entities/Apps/Services/Implementations/ConfigAppLimitsPlan.cs index 0766a5a45..3d568c928 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Services/Implementations/ConfigAppLimitsPlan.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Services/Implementations/ConfigAppLimitsPlan.cs @@ -19,8 +19,6 @@ namespace Squidex.Domain.Apps.Entities.Apps.Services.Implementations public string YearlyId { get; set; } - public bool ShouldReset { get; set; } - public long MaxApiCalls { get; set; } public long MaxAssetSize { get; set; } diff --git a/src/Squidex/app/features/settings/pages/clients/client.component.html b/src/Squidex/app/features/settings/pages/clients/client.component.html index 70ae8e22a..7fc58d7ad 100644 --- a/src/Squidex/app/features/settings/pages/clients/client.component.html +++ b/src/Squidex/app/features/settings/pages/clients/client.component.html @@ -116,7 +116,13 @@

- Connect with windows: + Connect with .NET SDK: + + {{connectCLINetText}} +

+ +

+ Connect with Windows: {{connectCLIWinText}}

diff --git a/src/Squidex/app/features/settings/pages/clients/client.component.ts b/src/Squidex/app/features/settings/pages/clients/client.component.ts index e9d3d67d4..423e3b5b3 100644 --- a/src/Squidex/app/features/settings/pages/clients/client.component.ts +++ b/src/Squidex/app/features/settings/pages/clients/client.component.ts @@ -45,6 +45,7 @@ export class ClientComponent implements OnChanges { public connectHttpText: string; public connectCLINixText: string; public connectCLIWinText: string; + public connectCLINetText: string; public connectLibraryText: string; constructor( @@ -63,8 +64,9 @@ export class ClientComponent implements OnChanges { const app = this.appsState.appName; this.connectHttpText = connectHttpText(this.apiUrl, app, this.client); - this.connectCLINixText = connectCLINixText(app, this.client); - this.connectCLIWinText = connectCLIWinText(app, this.client); + this.connectCLINetText = connectCLINetText(app, this.client, this.apiUrl); + this.connectCLINixText = connectCLINixText(app, this.client, this.apiUrl); + this.connectCLIWinText = connectCLIWinText(app, this.client, this.apiUrl); this.connectLibraryText = connectLibrary(this.apiUrl, app, this.client); } @@ -129,12 +131,16 @@ function connectHttpText(apiUrl: ApiUrlConfig, app: string, client: { id: string scope=squidex-api`; } -function connectCLIWinText(app: string, client: { id: string, secret: string }) { - return `.\\sq.exe config add ${app} ${app}:${client.id} ${client.secret};.\\sq.exe config use ${app}`; +function connectCLIWinText(app: string, client: { id: string, secret: string }, url: ApiUrlConfig) { + return `.\\sq.exe config add ${app} ${app}:${client.id} ${client.secret} -u ${url.value};.\\sq.exe config use ${app}`; } -function connectCLINixText(app: string, client: { id: string, secret: string }) { - return `sq config add ${app} ${app}:${client.id} ${client.secret} && sq config use ${app}`; +function connectCLINixText(app: string, client: { id: string, secret: string }, url: ApiUrlConfig) { + return `sq config add ${app} ${app}:${client.id} ${client.secret} -u ${url.value} && sq config use ${app}`; +} + +function connectCLINetText(app: string, client: { id: string, secret: string }, url: ApiUrlConfig) { + return `dotnet sq.dll config add ${app} ${app}:${client.id} ${client.secret} -u ${url.value}`; } function connectLibrary(apiUrl: ApiUrlConfig, app: string, client: { id: string, secret: string }) {