MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Lint

This commit is contained in:
Rory Powell 2023-07-25 11:28:14 +01:00
parent ccf98580d6
commit f656e97d2d
6 changed files with 63 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/pro

@ -1 +1 @@
Subproject commit 347ee5326812c01ef07f0e744f691ab4823e185a
Subproject commit b5124e76b9fa8020641e8d019ac1713c6245d6e6

2
qa-core/src/account-api/api/AccountInternalAPIClient.ts
View File

@ -49,7 +49,7 @@ export default class AccountInternalAPIClient {
requestOptions.headers = {
...requestOptions.headers,
...{ [Header.API_KEY]: env.ACCOUNT_PORTAL_API_KEY },
cookie: ""
cookie: "",
}
}

15
qa-core/src/account-api/api/apis/LicenseAPI.ts
View File

@ -1,5 +1,10 @@
import AccountInternalAPIClient from "../AccountInternalAPIClient"
import { Account, CreateOfflineLicenseRequest, GetOfflineLicenseResponse, UpdateLicenseRequest } from "@budibase/types"
import {
Account,
CreateOfflineLicenseRequest,
GetOfflineLicenseResponse,
UpdateLicenseRequest,
} from "@budibase/types"
import { Response } from "node-fetch"
import BaseAPI from "./BaseAPI"
import { APIRequestOpts } from "../../../types"
@ -39,8 +44,8 @@ export default class LicenseAPI extends BaseAPI {
body,
internal: true,
headers: {
"x-budibase-tenant-id": tenantId
}
"x-budibase-tenant-id": tenantId,
},
}
)
expect(response.status).toBe(opts.status ? opts.status : 201)
@ -57,8 +62,8 @@ export default class LicenseAPI extends BaseAPI {
{
internal: true,
headers: {
"x-budibase-tenant-id": tenantId
}
"x-budibase-tenant-id": tenantId,
},
}
)
expect(response.status).toBe(opts.status ? opts.status : 200)

28
qa-core/src/account-api/fixtures/accounts.ts
View File

@ -2,21 +2,23 @@ import { generator } from "../../shared"
import { Hosting, CreateAccountRequest } from "@budibase/types"
// TODO: Refactor me to central location
export const generateAccount = (partial: Partial<CreateAccountRequest>): CreateAccountRequest => {
const uuid = generator.guid()
export const generateAccount = (
partial: Partial<CreateAccountRequest>
): CreateAccountRequest => {
const uuid = generator.guid()
const email = `${uuid}@budibase.com`
const tenant = `tenant${uuid.replace(/-/g, "")}`
return {
email,
hosting: Hosting.CLOUD,
name: email,
password: uuid,
profession: "software_engineer",
size: "10+",
tenantId: tenant,
tenantName: tenant,
...partial,
}
return {
email,
hosting: Hosting.CLOUD,
name: email,
password: uuid,
profession: "software_engineer",
size: "10+",
tenantId: tenant,
tenantName: tenant,
...partial,
}
}

32
qa-core/src/account-api/tests/licensing/offline.spec.ts
View File

@ -20,22 +20,28 @@ describe("offline", () => {
await config.internalApi.license.deleteOfflineLicenseToken()
// installation: Assert token not found
let [getTokenRes] = await config.internalApi.license.getOfflineLicenseToken({ status: 404 })
let [getTokenRes] = await config.internalApi.license.getOfflineLicenseToken(
{ status: 404 }
)
// installation: Retrieve Identifier
const [getIdentifierRes, identifier] = await config.internalApi.license.getOfflineIdentifier()
const [getIdentifierRes, identifier] =
await config.internalApi.license.getOfflineIdentifier()
// account-portal: Create self-host account
const createAccountRequest = fixures.accounts.generateAccount({ hosting: Hosting.SELF })
const [createAccountRes, account] = await config.accountsApi.accounts.create(createAccountRequest)
const createAccountRequest = fixures.accounts.generateAccount({
hosting: Hosting.SELF,
})
const [createAccountRes, account] =
await config.accountsApi.accounts.create(createAccountRequest)
const accountId = account.accountId!
const tenantId = account.tenantId!
// account-portal: Enable feature on license
await config.accountsApi.licenses.updateLicense(accountId, {
overrides: {
features: [Feature.OFFLINE]
}
features: [Feature.OFFLINE],
},
})
// account-portal: Create offline token
@ -45,16 +51,18 @@ describe("offline", () => {
accountId,
tenantId,
{
expireAt: expireAt.toISOString(),
installationIdentifierBase64: identifier.identifierBase64
})
expireAt: expireAt.toISOString(),
installationIdentifierBase64: identifier.identifierBase64,
}
)
// account-portal: Retrieve offline token
const [getLicenseRes, offlineLicense] = await config.accountsApi.licenses.getOfflineLicense(accountId, tenantId)
const [getLicenseRes, offlineLicense] =
await config.accountsApi.licenses.getOfflineLicense(accountId, tenantId)
// installation: Activate offline token
await config.internalApi.license.activateOfflineLicenseToken({
offlineLicenseToken: offlineLicense.offlineLicenseToken
offlineLicenseToken: offlineLicense.offlineLicenseToken,
})
// installation: Assert token found
@ -68,4 +76,4 @@ describe("offline", () => {
// installation: Assert token not found
await config.internalApi.license.getOfflineLicenseToken({ status: 404 })
})
})
})

21
qa-core/src/internal-api/api/apis/LicenseAPI.ts
View File

@ -12,8 +12,13 @@ export default class LicenseAPI extends BaseAPI {
super(client)
}
async getOfflineLicenseToken(opts: { status?: number } = {}): Promise<[Response, GetOfflineLicenseTokenResponse]> {
const [response, body] = await this.get(`/global/license/offline`, opts.status)
async getOfflineLicenseToken(
opts: { status?: number } = {}
): Promise<[Response, GetOfflineLicenseTokenResponse]> {
const [response, body] = await this.get(
`/global/license/offline`,
opts.status
)
return [response, body]
}
@ -22,13 +27,19 @@ export default class LicenseAPI extends BaseAPI {
return [response]
}
async activateOfflineLicenseToken(body: ActivateOfflineLicenseTokenRequest): Promise<[Response]> {
async activateOfflineLicenseToken(
body: ActivateOfflineLicenseTokenRequest
): Promise<[Response]> {
const [response] = await this.post(`/global/license/offline`, body)
return [response]
}
async getOfflineIdentifier(): Promise<[Response, GetOfflineIdentifierResponse]> {
const [response, body] = await this.get(`/global/license/offline/identifier`)
async getOfflineIdentifier(): Promise<
[Response, GetOfflineIdentifierResponse]
> {
const [response, body] = await this.get(
`/global/license/offline/identifier`
)
return [response, body]
}
}