From edaef508ea6bd4be2637c6d1ae5bbd5707c7e40c Mon Sep 17 00:00:00 2001 From: daikoku-github-actions Date: Tue, 24 Nov 2020 16:45:26 +0000 Subject: [PATCH] Update documentation before release --- daikoku/app/env/env.scala | 3 +- daikoku/app/login/otoroshi.scala | 3 +- .../adminbackoffice/tenants/TenantEdit.js | 12 +- .../components/backoffice/TeamBackOffice.js | 58 +++--- .../backoffice/apikeys/TeamApiKeysForApi.js | 81 ++++---- .../src/components/backoffice/me/MyProfile.js | 32 +-- .../components/frontend/api/ApiCartidge.js | 2 +- .../src/components/frontend/api/ApiPricing.js | 111 +++++----- .../src/components/frontend/team/ApiList.js | 23 ++- .../src/components/utils/Discussion.js | 21 +- .../javascript/src/components/utils/Footer.js | 4 +- .../javascript/src/core/context/actions.js | 4 +- .../javascript/src/core/context/reducer.js | 8 +- daikoku/test/daikoku/ApiControllerSpec.scala | 191 +++++++++--------- .../test/daikoku/MessagesControllerSpec.scala | 13 +- daikoku/test/daikoku/UserControllerSpec.scala | 10 +- docs/manual/content-pretty.json | 8 +- docs/manual/content.json | 2 +- docs/manual/deploy/index.html | 6 +- docs/manual/firstrun/run.html | 6 +- docs/manual/getdaikoku/fromdocker.html | 2 +- docs/manual/index.html | 8 +- manual/src/main/paradox/content-pretty.json | 8 +- manual/src/main/paradox/content.json | 2 +- manual/src/main/paradox/deploy/index.md | 6 +- manual/src/main/paradox/firstrun/run.md | 6 +- .../src/main/paradox/getdaikoku/fromdocker.md | 2 +- manual/src/main/paradox/index.md | 8 +- 28 files changed, 351 insertions(+), 289 deletions(-) diff --git a/daikoku/app/env/env.scala b/daikoku/app/env/env.scala index f5bbb211d..f97dde4b1 100644 --- a/daikoku/app/env/env.scala +++ b/daikoku/app/env/env.scala @@ -150,7 +150,8 @@ class Config(val underlying: Configuration) { lazy val tenantJwtAlgo: Algorithm = Algorithm.HMAC512(signingKey) - lazy val tenantJwtVerifier: JWTVerifier = JWT.require(tenantJwtAlgo).acceptLeeway(10).build() + lazy val tenantJwtVerifier: JWTVerifier = + JWT.require(tenantJwtAlgo).acceptLeeway(10).build() lazy val isProd: Boolean = mode == DaikokuMode.Prod lazy val isDev: Boolean = mode == DaikokuMode.Dev diff --git a/daikoku/app/login/otoroshi.scala b/daikoku/app/login/otoroshi.scala index 8adccfe0f..03a5fb201 100644 --- a/daikoku/app/login/otoroshi.scala +++ b/daikoku/app/login/otoroshi.scala @@ -55,7 +55,8 @@ object OtoroshiIdentityFilter { val claimHeaderName = tenant.authProviderSettings.\("claimHeaderName").as[String] val otoroshiJwtAlgo = Algorithm.HMAC512(claimSecret) - val otoroshiJwtVerifier = JWT.require(otoroshiJwtAlgo).acceptLeeway(10).build() + val otoroshiJwtVerifier = + JWT.require(otoroshiJwtAlgo).acceptLeeway(10).build() request.headers.get(claimHeaderName) match { case None => diff --git a/daikoku/javascript/src/components/adminbackoffice/tenants/TenantEdit.js b/daikoku/javascript/src/components/adminbackoffice/tenants/TenantEdit.js index 54f96c66d..1b8585b7a 100644 --- a/daikoku/javascript/src/components/adminbackoffice/tenants/TenantEdit.js +++ b/daikoku/javascript/src/components/adminbackoffice/tenants/TenantEdit.js @@ -510,9 +510,9 @@ export class TenantEditComponent extends Component { type: 'markdown', props: { label: t('Footer', this.props.currentLanguage) }, }, - 'defaultMessage': { + defaultMessage: { type: 'markdown', - props: { label: t('Default message', this.props.currentLanguage) } + props: { label: t('Default message', this.props.currentLanguage) }, }, isPrivate: { type: 'bool', @@ -775,10 +775,8 @@ export class TenantEditComponent extends Component { }); } else { return Services.saveTenant(this.state.tenant) - .then(this.props.updateTenant) - .then(() => - toastr.success(t('Tenant updated successfully', this.props.currentLanguage)) - ); + .then(this.props.updateTenant) + .then(() => toastr.success(t('Tenant updated successfully', this.props.currentLanguage))); } }; @@ -868,7 +866,7 @@ const mapStateToProps = (state) => ({ const mapDispatchToProps = { openSaveOrCancelModal: (modalProps) => openSaveOrCancelModal(modalProps), - updateTenant: (t) => updateTenant(t) + updateTenant: (t) => updateTenant(t), }; export const TenantEdit = connect(mapStateToProps, mapDispatchToProps)(TenantEditComponent); diff --git a/daikoku/javascript/src/components/backoffice/TeamBackOffice.js b/daikoku/javascript/src/components/backoffice/TeamBackOffice.js index 5c58a0576..b4d5901f4 100644 --- a/daikoku/javascript/src/components/backoffice/TeamBackOffice.js +++ b/daikoku/javascript/src/components/backoffice/TeamBackOffice.js @@ -209,32 +209,38 @@ class TeamBackOfficeComponent extends Component { )}