@@ -375,12 +399,23 @@
{#each OIDCConfigFields.Oidc as field}
{/each}
@@ -557,4 +592,16 @@
.provider-title span {
flex: 1 1 auto;
}
+ .inputContainer {
+ display: flex;
+ flex-direction: row;
+ }
+ .input {
+ flex: 1;
+ }
+ .copy {
+ display: flex;
+ align-items: center;
+ margin-left: 10px;
+ }
diff --git a/packages/types/src/sdk/auth.ts b/packages/types/src/sdk/auth.ts
index d61b679c62..766d18a606 100644
--- a/packages/types/src/sdk/auth.ts
+++ b/packages/types/src/sdk/auth.ts
@@ -31,5 +31,5 @@ export interface ScannedSession {
export interface PlatformLogoutOpts {
ctx: BBContext
userId: string
- keepActiveSession: boolean
+ keepActiveSession?: boolean
}
diff --git a/packages/worker/__mocks__/node-fetch.ts b/packages/worker/__mocks__/node-fetch.ts
deleted file mode 100644
index 4c7127ee48..0000000000
--- a/packages/worker/__mocks__/node-fetch.ts
+++ /dev/null
@@ -1 +0,0 @@
-jest.mock("node-fetch", () => jest.fn())
diff --git a/packages/worker/__mocks__/oauth.ts b/packages/worker/__mocks__/oauth.ts
new file mode 100644
index 0000000000..8e8122a9e0
--- /dev/null
+++ b/packages/worker/__mocks__/oauth.ts
@@ -0,0 +1,57 @@
+import * as jwt from "jsonwebtoken"
+
+const mockOAuth2 = {
+ getOAuthAccessToken: (code: string, p: any, cb: any) => {
+ const err = null
+ const accessToken = "access_token"
+ const refreshToken = "refresh_token"
+
+ const exp = new Date()
+ exp.setDate(exp.getDate() + 1)
+
+ const iat = new Date()
+ iat.setDate(iat.getDate() - 1)
+
+ const claims = {
+ iss: "test",
+ sub: "sub",
+ aud: "clientId",
+ exp: exp.getTime() / 1000,
+ iat: iat.getTime() / 1000,
+ email: "oauth@example.com",
+ }
+
+ const idToken = jwt.sign(claims, "secret")
+
+ const params = {
+ id_token: idToken,
+ }
+ return cb(err, accessToken, refreshToken, params)
+ },
+ _request: (
+ method: string,
+ url: string,
+ headers: any,
+ postBody: any,
+ accessToken: string,
+ cb: any
+ ) => {
+ const err = null
+ const body = {
+ sub: "sub",
+ user_id: "userId",
+ name: "OAuth",
+ family_name: "2",
+ given_name: "OAuth",
+ middle_name: "",
+ }
+ const res = {}
+ return cb(err, JSON.stringify(body), res)
+ },
+}
+
+const oauth = {
+ OAuth2: jest.fn(() => mockOAuth2),
+}
+
+export = oauth
diff --git a/packages/worker/package.json b/packages/worker/package.json
index a9a093e753..c925b9d5d6 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -71,9 +71,11 @@
},
"devDependencies": {
"@types/jest": "26.0.23",
+ "@types/jsonwebtoken": "8.5.1",
"@types/koa": "2.13.4",
"@types/koa__router": "8.0.11",
"@types/node": "14.18.20",
+ "@types/node-fetch": "2.6.1",
"@types/pouchdb": "6.4.0",
"@types/uuid": "8.3.4",
"@typescript-eslint/parser": "5.12.0",
diff --git a/packages/worker/src/api/controllers/global/auth.ts b/packages/worker/src/api/controllers/global/auth.ts
index c27fe17ee7..9065267658 100644
--- a/packages/worker/src/api/controllers/global/auth.ts
+++ b/packages/worker/src/api/controllers/global/auth.ts
@@ -1,4 +1,4 @@
-const core = require("@budibase/backend-core")
+import core from "@budibase/backend-core"
const { Configs, EmailTemplatePurpose } = require("../../../constants")
const { sendEmail, isEmailConfigured } = require("../../../utilities/email")
const { setCookie, getCookie, clearCookie, hash, platformLogout } = core.utils
diff --git a/packages/worker/src/api/routes/global/auth.js b/packages/worker/src/api/routes/global/auth.js
index 674279a6f4..2bf6bb68bf 100644
--- a/packages/worker/src/api/routes/global/auth.js
+++ b/packages/worker/src/api/routes/global/auth.js
@@ -29,11 +29,13 @@ function buildResetUpdateValidation() {
}
router
+ // PASSWORD
.post(
"/api/global/auth/:tenantId/login",
buildAuthValidation(),
authController.authenticate
)
+ .post("/api/global/auth/logout", authController.logout)
.post(
"/api/global/auth/:tenantId/reset",
buildResetValidation(),
@@ -44,36 +46,43 @@ router
buildResetUpdateValidation(),
authController.resetUpdate
)
- .post("/api/global/auth/logout", authController.logout)
+ // INIT
.post("/api/global/auth/init", authController.setInitInfo)
.get("/api/global/auth/init", authController.getInitInfo)
- .get("/api/global/auth/:tenantId/google", authController.googlePreAuth)
+
+ // DATASOURCE - MULTI TENANT
.get(
"/api/global/auth/:tenantId/datasource/:provider",
authController.datasourcePreAuth
)
- // single tenancy endpoint
- .get("/api/global/auth/google/callback", authController.googleAuth)
- .get(
- "/api/global/auth/datasource/:provider/callback",
- authController.datasourceAuth
- )
- // multi-tenancy endpoint
- .get("/api/global/auth/:tenantId/google/callback", authController.googleAuth)
.get(
"/api/global/auth/:tenantId/datasource/:provider/callback",
authController.datasourceAuth
)
+
+ // DATASOURCE - SINGLE TENANT - DEPRECATED
+ .get(
+ "/api/global/auth/datasource/:provider/callback",
+ authController.datasourceAuth
+ )
+
+ // GOOGLE - MULTI TENANT
+ .get("/api/global/auth/:tenantId/google", authController.googlePreAuth)
+ .get("/api/global/auth/:tenantId/google/callback", authController.googleAuth)
+
+ // GOOGLE - SINGLE TENANT - DEPRECATED
+ .get("/api/global/auth/google/callback", authController.googleAuth)
+ .get("/api/admin/auth/google/callback", authController.googleAuth)
+
+ // OIDC - MULTI TENANT
.get(
"/api/global/auth/:tenantId/oidc/configs/:configId",
authController.oidcPreAuth
)
- // single tenancy endpoint
- .get("/api/global/auth/oidc/callback", authController.oidcAuth)
- // multi-tenancy endpoint
.get("/api/global/auth/:tenantId/oidc/callback", authController.oidcAuth)
- // deprecated - used by the default system before tenancy
- .get("/api/admin/auth/google/callback", authController.googleAuth)
+
+ // OIDC - SINGLE TENANT - DEPRECATED
+ .get("/api/global/auth/oidc/callback", authController.oidcAuth)
.get("/api/admin/auth/oidc/callback", authController.oidcAuth)
module.exports = router
diff --git a/packages/worker/src/api/routes/global/tests/auth.spec.ts b/packages/worker/src/api/routes/global/tests/auth.spec.ts
index 45c8a62cc7..0d47857ac1 100644
--- a/packages/worker/src/api/routes/global/tests/auth.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/auth.spec.ts
@@ -3,6 +3,12 @@ import { TestConfiguration, mocks } from "../../../../tests"
const sendMailMock = mocks.email.mock()
import { events } from "@budibase/backend-core"
+const expectSetAuthCookie = (res: any) => {
+ expect(
+ res.get("Set-Cookie").find((c: string) => c.startsWith("budibase:auth"))
+ ).toBeDefined()
+}
+
describe("/api/global/auth", () => {
const config = new TestConfiguration()
@@ -18,92 +24,155 @@ describe("/api/global/auth", () => {
jest.clearAllMocks()
})
- it("should logout", async () => {
- await config.api.auth.logout()
- expect(events.auth.logout).toBeCalledTimes(1)
- })
-
- it("should be able to generate password reset email", async () => {
- const { res, code } = await config.api.auth.requestPasswordReset(
- sendMailMock
- )
- const user = await config.getUser("test@test.com")
-
- expect(res.body).toEqual({
- message: "Please check your email for a reset link.",
+ describe("password", () => {
+ describe("POST /api/global/auth/:tenantId/login", () => {
+ it("should login", () => {})
})
- expect(sendMailMock).toHaveBeenCalled()
- expect(code).toBeDefined()
- expect(events.user.passwordResetRequested).toBeCalledTimes(1)
- expect(events.user.passwordResetRequested).toBeCalledWith(user)
+ describe("POST /api/global/auth/logout", () => {
+ it("should logout", async () => {
+ await config.api.auth.logout()
+ expect(events.auth.logout).toBeCalledTimes(1)
+
+ // TODO: Verify sessions deleted
+ })
+ })
+
+ describe("POST /api/global/auth/:tenantId/reset", () => {
+ it("should generate password reset email", async () => {
+ const { res, code } = await config.api.auth.requestPasswordReset(
+ sendMailMock
+ )
+ const user = await config.getUser("test@test.com")
+
+ expect(res.body).toEqual({
+ message: "Please check your email for a reset link.",
+ })
+ expect(sendMailMock).toHaveBeenCalled()
+
+ expect(code).toBeDefined()
+ expect(events.user.passwordResetRequested).toBeCalledTimes(1)
+ expect(events.user.passwordResetRequested).toBeCalledWith(user)
+ })
+ })
+
+ describe("POST /api/global/auth/:tenantId/reset/update", () => {
+ it("should reset password", async () => {
+ const { code } = await config.api.auth.requestPasswordReset(
+ sendMailMock
+ )
+ const user = await config.getUser("test@test.com")
+ delete user.password
+
+ const res = await config.api.auth.updatePassword(code)
+
+ expect(res.body).toEqual({ message: "password reset successfully." })
+ expect(events.user.passwordReset).toBeCalledTimes(1)
+ expect(events.user.passwordReset).toBeCalledWith(user)
+
+ // TODO: Login using new password
+ })
+ })
})
- it("should allow resetting user password with code", async () => {
- const { code } = await config.api.auth.requestPasswordReset(sendMailMock)
- const user = await config.getUser("test@test.com")
- delete user.password
+ describe("init", () => {
+ describe("POST /api/global/auth/init", () => {})
- const res = await config.api.auth.updatePassword(code)
+ describe("GET /api/global/auth/init", () => {})
+ })
- expect(res.body).toEqual({ message: "password reset successfully." })
- expect(events.user.passwordReset).toBeCalledTimes(1)
- expect(events.user.passwordReset).toBeCalledWith(user)
+ describe("datasource", () => {
+ // MULTI TENANT
+
+ describe("GET /api/global/auth/:tenantId/datasource/:provider", () => {})
+
+ describe("GET /api/global/auth/:tenantId/datasource/:provider/callback", () => {})
+
+ // SINGLE TENANT
+
+ describe("GET /api/global/auth/datasource/:provider/callback", () => {})
+ })
+
+ describe("google", () => {
+ // MULTI TENANT
+
+ describe("GET /api/global/auth/:tenantId/google", () => {})
+
+ describe("GET /api/global/auth/:tenantId/google/callback", () => {})
+
+ // SINGLE TENANT
+
+ describe("GET /api/global/auth/google/callback", () => {})
+
+ describe("GET /api/admin/auth/google/callback", () => {})
})
describe("oidc", () => {
- const auth = require("@budibase/backend-core/auth")
-
- const passportSpy = jest.spyOn(auth.passport, "authenticate")
- let oidcConf
- let chosenConfig: any
- let configId: string
-
- // mock the oidc strategy implementation and return value
- let strategyFactory = jest.fn()
- let mockStrategyReturn = jest.fn()
- let mockStrategyConfig = jest.fn()
- auth.oidc.fetchStrategyConfig = mockStrategyConfig
-
- strategyFactory.mockReturnValue(mockStrategyReturn)
- auth.oidc.strategyFactory = strategyFactory
-
beforeEach(async () => {
- oidcConf = await config.saveOIDCConfig()
- chosenConfig = oidcConf.config.configs[0]
- configId = chosenConfig.uuid
- mockStrategyConfig.mockReturnValue(chosenConfig)
+ jest.clearAllMocks()
+ mockGetWellKnownConfig()
+
+ // see: __mocks__/oauth
+ // for associated mocking inside passport
})
- afterEach(() => {
- expect(strategyFactory).toBeCalledWith(chosenConfig, expect.any(Function))
- })
+ const generateOidcConfig = async () => {
+ const oidcConf = await config.saveOIDCConfig()
+ const chosenConfig = oidcConf.config.configs[0]
+ return chosenConfig.uuid
+ }
- describe("oidc configs", () => {
- it("should load strategy and delegate to passport", async () => {
- await config.api.configs.getOIDCConfig(configId)
+ const mockGetWellKnownConfig = () => {
+ mocks.fetch.mockReturnValue({
+ ok: true,
+ json: () => ({
+ issuer: "test",
+ authorization_endpoint: "http://localhost/auth",
+ token_endpoint: "http://localhost/token",
+ userinfo_endpoint: "http://localhost/userinfo",
+ }),
+ })
+ }
- expect(passportSpy).toBeCalledWith(mockStrategyReturn, {
- scope: ["profile", "email", "offline_access"],
- })
- expect(passportSpy.mock.calls.length).toBe(1)
+ // MULTI TENANT
+ describe("GET /api/global/auth/:tenantId/oidc/configs/:configId", () => {
+ it("redirects to auth provider", async () => {
+ const configId = await generateOidcConfig()
+
+ const res = await config.api.configs.getOIDCConfig(configId)
+
+ expect(res.status).toBe(302)
+ const location: string = res.get("location")
+ expect(
+ location.startsWith(
+ "http://localhost/auth?response_type=code&client_id=clientId&redirect_uri=http%3A%2F%2Flocalhost%3A10000%2Fapi%2Fglobal%2Fauth%2Fdefault%2Foidc%2Fcallback&scope=openid%20profile%20email%20offline_access"
+ )
+ ).toBe(true)
})
})
- describe("oidc callback", () => {
- it("should load strategy and delegate to passport", async () => {
- await config.api.configs.OIDCCallback(configId)
+ describe("GET /api/global/auth/:tenantId/oidc/callback", () => {
+ it("logs in", async () => {
+ const configId = await generateOidcConfig()
+ const preAuthRes = await config.api.configs.getOIDCConfig(configId)
- expect(passportSpy).toBeCalledWith(
- mockStrategyReturn,
- {
- successRedirect: "/",
- failureRedirect: "/error",
- },
- expect.anything()
- )
- expect(passportSpy.mock.calls.length).toBe(1)
+ const res = await config.api.configs.OIDCCallback(configId, preAuthRes)
+
+ expect(events.auth.login).toBeCalledWith("oidc")
+ expect(events.auth.login).toBeCalledTimes(1)
+ expect(res.status).toBe(302)
+ const location: string = res.get("location")
+ expect(location).toBe("/")
+ expectSetAuthCookie(res)
})
})
+
+ // SINGLE TENANT
+
+ describe("GET /api/global/auth/oidc/callback", () => {})
+
+ describe("GET /api/global/auth/oidc/callback", () => {})
+
+ describe("GET /api/admin/auth/oidc/callback", () => {})
})
})
diff --git a/packages/worker/src/api/routes/system/tests/tenants.spec.ts b/packages/worker/src/api/routes/system/tests/tenants.spec.ts
index 8b3bcc99f5..af509b402e 100644
--- a/packages/worker/src/api/routes/system/tests/tenants.spec.ts
+++ b/packages/worker/src/api/routes/system/tests/tenants.spec.ts
@@ -1,7 +1,7 @@
import { TestConfiguration } from "../../../../tests"
import { tenancy } from "@budibase/backend-core"
-describe("/api/global/workspaces", () => {
+describe("/api/global/tenants", () => {
const config = new TestConfiguration()
beforeAll(async () => {
diff --git a/packages/worker/src/tests/TestConfiguration.ts b/packages/worker/src/tests/TestConfiguration.ts
index 2927915284..11da7c2b03 100644
--- a/packages/worker/src/tests/TestConfiguration.ts
+++ b/packages/worker/src/tests/TestConfiguration.ts
@@ -171,8 +171,11 @@ class TestConfiguration {
}
cookieHeader(cookies: any) {
+ if (!Array.isArray(cookies)) {
+ cookies = [cookies]
+ }
return {
- Cookie: [cookies],
+ Cookie: cookies,
}
}
@@ -288,11 +291,6 @@ class TestConfiguration {
// CONFIGS - OIDC
- getOIDConfigCookie(configId: string) {
- const token = auth.jwt.sign(configId, env.JWT_SECRET)
- return this.cookieHeader([[`${Cookies.OIDC_CONFIG}=${token}`]])
- }
-
async saveOIDCConfig() {
await this.deleteConfig(Configs.OIDC)
const config = structures.configs.oidc()
diff --git a/packages/worker/src/tests/api/configs.ts b/packages/worker/src/tests/api/configs.ts
index 6799229f58..10413dfdd6 100644
--- a/packages/worker/src/tests/api/configs.ts
+++ b/packages/worker/src/tests/api/configs.ts
@@ -23,10 +23,20 @@ export class ConfigAPI extends TestAPI {
.expect(200)
}
- OIDCCallback = (configId: string) => {
+ OIDCCallback = (configId: string, preAuthRes: any) => {
+ const cookie = this.config.cookieHeader(preAuthRes.get("set-cookie"))
+ const setKoaSession = cookie.Cookie.find((c: string) =>
+ c.includes("koa:sess")
+ )
+ const koaSession = setKoaSession.split("=")[1] + "=="
+ const sessionContent = JSON.parse(
+ Buffer.from(koaSession, "base64").toString("utf-8")
+ )
+ const handle = sessionContent["openidconnect:localhost"].state.handle
return this.request
.get(`/api/global/auth/${this.config.getTenantId()}/oidc/callback`)
- .set(this.config.getOIDConfigCookie(configId))
+ .query({ code: "test", state: handle })
+ .set(cookie)
}
getOIDCConfig = (configId: string) => {
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index cfdba32e7a..23f54ae770 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -1284,6 +1284,13 @@
resolved "https://registry.yarnpkg.com/@types/json-buffer/-/json-buffer-3.0.0.tgz#85c1ff0f0948fc159810d4b5be35bf8c20875f64"
integrity sha512-3YP80IxxFJB4b5tYC2SUPwkg0XQLiu0nWvhRgEatgjf+29IcWO9X1k8xRv5DGssJ/lCrjYTjQPcobJr2yWIVuQ==
+"@types/jsonwebtoken@8.5.1":
+ version "8.5.1"
+ resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#56958cb2d80f6d74352bd2e501a018e2506a8a84"
+ integrity sha512-rNAPdomlIUX0i0cg2+I+Q1wOUr531zHBQ+cV/28PJ39bSPKjahatZZ2LMuhiguETkCgLVzfruw/ZvNMNkKoSzw==
+ dependencies:
+ "@types/node" "*"
+
"@types/keygrip@*":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@types/keygrip/-/keygrip-1.0.2.tgz#513abfd256d7ad0bf1ee1873606317b33b1b2a72"
@@ -1334,6 +1341,14 @@
resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
+"@types/node-fetch@2.6.1":
+ version "2.6.1"
+ resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.1.tgz#8f127c50481db65886800ef496f20bbf15518975"
+ integrity sha512-oMqjURCaxoSIsHSr1E47QHzbmzNR5rK8McHuNb11BOM9cHcIK3Avy0s/b2JlXHoQGTYS3NsvWzV1M0iK7l0wbA==
+ dependencies:
+ "@types/node" "*"
+ form-data "^3.0.0"
+
"@types/node@*":
version "17.0.41"
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.41.tgz#1607b2fd3da014ae5d4d1b31bc792a39348dfb9b"
@@ -3412,6 +3427,15 @@ forever-agent@~0.6.1:
resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
+form-data@^3.0.0:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
+ integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
+ dependencies:
+ asynckit "^0.4.0"
+ combined-stream "^1.0.8"
+ mime-types "^2.1.12"
+
form-data@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
diff --git a/qa-core/src/config/internal-api/TestConfiguration/applications.ts b/qa-core/src/config/internal-api/TestConfiguration/applications.ts
index cb0558222e..13d0969854 100644
--- a/qa-core/src/config/internal-api/TestConfiguration/applications.ts
+++ b/qa-core/src/config/internal-api/TestConfiguration/applications.ts
@@ -114,8 +114,6 @@ export default class AppApi {
return [response, json]
}
-
-
async delete(appId: string): Promise<[Response, any]> {
const response = await this.api.del(`/applications/${appId}`)
const json = await response.json()
@@ -123,7 +121,11 @@ export default class AppApi {
return [response, json]
}
- async update(appId: string, oldName: string, body: any): Promise<[Response, Application]> {
+ async update(
+ appId: string,
+ oldName: string,
+ body: any
+ ): Promise<[Response, Application]> {
const response = await this.api.put(`/applications/${appId}`, { body })
const json = await response.json()
expect(response).toHaveStatusCode(200)
@@ -142,7 +144,6 @@ export default class AppApi {
const json = await response.json()
expect(response).toHaveStatusCode(200)
if (screenExists) {
-
expect(json.routes["/test"]).toBeTruthy()
} else {
expect(json.routes["/test"]).toBeUndefined()
diff --git a/qa-core/src/config/internal-api/TestConfiguration/tables.ts b/qa-core/src/config/internal-api/TestConfiguration/tables.ts
index ed0ab78cad..5b7e1648a0 100644
--- a/qa-core/src/config/internal-api/TestConfiguration/tables.ts
+++ b/qa-core/src/config/internal-api/TestConfiguration/tables.ts
@@ -46,9 +46,7 @@ export default class TablesApi {
const response = await this.api.del(`/tables/${id}/${revId}`)
const json = await response.json()
expect(response).toHaveStatusCode(200)
- expect(json.message).toEqual(
- `Table ${id} deleted.`
- )
+ expect(json.message).toEqual(`Table ${id} deleted.`)
return [response, json]
}
}
diff --git a/qa-core/src/config/internal-api/fixtures/applications.ts b/qa-core/src/config/internal-api/fixtures/applications.ts
index abdd674577..200aa9abff 100644
--- a/qa-core/src/config/internal-api/fixtures/applications.ts
+++ b/qa-core/src/config/internal-api/fixtures/applications.ts
@@ -1,7 +1,6 @@
import generator from "../../generator"
import { Application } from "@budibase/server/api/controllers/public/mapping/types"
-
const generate = (
overrides: Partial
= {}
): Partial => ({
diff --git a/qa-core/src/tests/internal-api/applications/applications.spec.ts b/qa-core/src/tests/internal-api/applications/applications.spec.ts
index 4b9b66ec65..4b3208ee10 100644
--- a/qa-core/src/tests/internal-api/applications/applications.spec.ts
+++ b/qa-core/src/tests/internal-api/applications/applications.spec.ts
@@ -48,7 +48,8 @@ describe("Internal API - Application creation, update, publish and delete", () =
})
config.applications.api.appId = app.appId
- const [appPackageResponse, appPackageJson] = await config.applications.getAppPackage(app.appId)
+ const [appPackageResponse, appPackageJson] =
+ await config.applications.getAppPackage(app.appId)
expect(appPackageJson.application.name).toEqual(app.name)
expect(appPackageJson.application.version).toEqual(app.version)
expect(appPackageJson.application.url).toEqual(app.url)
@@ -72,7 +73,6 @@ describe("Internal API - Application creation, update, publish and delete", () =
config.applications.api.appId = db.getProdAppID(app.appId)
await config.applications.canRender()
-
// unpublish app
await config.applications.unpublish(app.appId)
})
@@ -109,22 +109,16 @@ describe("Internal API - Application creation, update, publish and delete", () =
config.applications.api.appId = app.appId
- await config.applications.update(
- app.appId,
- app.name,
- {
- name: generator.word(),
- }
- )
+ await config.applications.update(app.appId, app.name, {
+ name: generator.word(),
+ })
})
it("POST - Revert Changes without changes", async () => {
const app = await config.applications.create(generateApp())
config.applications.api.appId = app.appId
- await config.applications.revertUnpublished(
- app.appId
- )
+ await config.applications.revertUnpublished(app.appId)
})
it("POST - Revert Changes", async () => {
@@ -134,20 +128,14 @@ describe("Internal API - Application creation, update, publish and delete", () =
// publish app
await config.applications.publish(app.url)
-
// Change/add component to the app
- await config.screen.create(
- generateScreen("BASIC")
- )
+ await config.screen.create(generateScreen("BASIC"))
// // Revert the app to published state
- await config.applications.revertPublished(
- app.appId
- )
+ await config.applications.revertPublished(app.appId)
// Check screen is removed
await config.applications.getRoutes()
-
})
it("DELETE - Delete an application", async () => {
@@ -155,5 +143,4 @@ describe("Internal API - Application creation, update, publish and delete", () =
await config.applications.delete(app.appId)
})
-
})
diff --git a/qa-core/src/tests/internal-api/screens/screens.spec.ts b/qa-core/src/tests/internal-api/screens/screens.spec.ts
index 2dc7962914..218d71cb0d 100644
--- a/qa-core/src/tests/internal-api/screens/screens.spec.ts
+++ b/qa-core/src/tests/internal-api/screens/screens.spec.ts
@@ -38,9 +38,7 @@ describe("Internal API - /screens endpoints", () => {
// Create Screen
appConfig.applications.api.appId = app.appId
- await config.screen.create(
- generateScreen("BASIC")
- )
+ await config.screen.create(generateScreen("BASIC"))
// Check screen exists
await appConfig.applications.getRoutes(true)
@@ -58,6 +56,5 @@ describe("Internal API - /screens endpoints", () => {
// Delete Screen
await config.screen.delete(screen._id!, screen._rev!)
-
})
})
diff --git a/qa-core/src/tests/internal-api/tables/tables.spec.ts b/qa-core/src/tests/internal-api/tables/tables.spec.ts
index 69ad0fed7b..4f9e4299cf 100644
--- a/qa-core/src/tests/internal-api/tables/tables.spec.ts
+++ b/qa-core/src/tests/internal-api/tables/tables.spec.ts
@@ -3,93 +3,87 @@ import { Application } from "@budibase/server/api/controllers/public/mapping/typ
import InternalAPIClient from "../../../config/internal-api/TestConfiguration/InternalAPIClient"
import generator from "../../../config/generator"
import {
- generateTable,
- generateNewColumnForTable,
+ generateTable,
+ generateNewColumnForTable,
} from "../../../config/internal-api/fixtures/table"
import { generateNewRowForTable } from "../../../config/internal-api/fixtures/rows"
describe("Internal API - Application creation, update, publish and delete", () => {
- const api = new InternalAPIClient()
- const config = new TestConfiguration(api)
+ const api = new InternalAPIClient()
+ const config = new TestConfiguration(api)
- beforeAll(async () => {
- await config.beforeAll()
+ beforeAll(async () => {
+ await config.beforeAll()
+ })
+
+ afterAll(async () => {
+ await config.afterAll()
+ })
+
+ async function createAppFromTemplate() {
+ return config.applications.create({
+ name: generator.word(),
+ url: `/${generator.word()}`,
+ useTemplate: "true",
+ templateName: "Near Miss Register",
+ templateKey: "app/near-miss-register",
+ templateFile: undefined,
})
+ }
- afterAll(async () => {
- await config.afterAll()
- })
+ it("Operations on Tables", async () => {
+ // create the app
+ const appName = generator.word()
+ const app = await createAppFromTemplate()
+ config.applications.api.appId = app.appId
- async function createAppFromTemplate() {
- return config.applications.create({
- name: generator.word(),
- url: `/${generator.word()}`,
- useTemplate: "true",
- templateName: "Near Miss Register",
- templateKey: "app/near-miss-register",
- templateFile: undefined,
- })
+ // Get current tables: expect 2 in this template
+ await config.tables.getAll(2)
+
+ // Add new table
+ const [createdTableResponse, createdTableData] = await config.tables.save(
+ generateTable()
+ )
+
+ //Table was added
+ await config.tables.getAll(3)
+
+ //Get information about the table
+ await config.tables.getTableById(createdTableData._id)
+
+ //Add Column to table
+ const newColumn = generateNewColumnForTable(createdTableData)
+ const [addColumnResponse, addColumnData] = await config.tables.save(
+ newColumn,
+ true
+ )
+
+ //Add Row to table
+ const newRow = generateNewRowForTable(addColumnData._id)
+ await config.rows.add(addColumnData._id, newRow)
+
+ //Get Row from table
+ const [getRowResponse, getRowData] = await config.rows.getAll(
+ addColumnData._id
+ )
+
+ //Delete Row from table
+ const rowToDelete = {
+ rows: [getRowData[0]],
}
+ const [deleteRowResponse, deleteRowData] = await config.rows.delete(
+ addColumnData._id,
+ rowToDelete
+ )
+ expect(deleteRowData[0]._id).toEqual(getRowData[0]._id)
- it("Operations on Tables", async () => {
- // create the app
- const appName = generator.word()
- const app = await createAppFromTemplate()
- config.applications.api.appId = app.appId
+ //Delete the table
+ const [deleteTableResponse, deleteTable] = await config.tables.delete(
+ addColumnData._id,
+ addColumnData._rev
+ )
- // Get current tables: expect 2 in this template
- await config.tables.getAll(2)
-
- // Add new table
- const [createdTableResponse, createdTableData] = await config.tables.save(
- generateTable()
- )
-
- //Table was added
- await config.tables.getAll(3)
-
- //Get information about the table
- await config.tables.getTableById(
- createdTableData._id
- )
-
- //Add Column to table
- const newColumn = generateNewColumnForTable(createdTableData)
- const [addColumnResponse, addColumnData] = await config.tables.save(
- newColumn,
- true
- )
-
- //Add Row to table
- const newRow = generateNewRowForTable(addColumnData._id)
- await config.rows.add(
- addColumnData._id,
- newRow
- )
-
- //Get Row from table
- const [getRowResponse, getRowData] = await config.rows.getAll(
- addColumnData._id
- )
-
- //Delete Row from table
- const rowToDelete = {
- rows: [getRowData[0]],
- }
- const [deleteRowResponse, deleteRowData] = await config.rows.delete(
- addColumnData._id,
- rowToDelete
- )
- expect(deleteRowData[0]._id).toEqual(getRowData[0]._id)
-
- //Delete the table
- const [deleteTableResponse, deleteTable] = await config.tables.delete(
- addColumnData._id,
- addColumnData._rev
- )
-
-
- //Table was deleted
- await config.tables.getAll(2)
- })
+ //Table was deleted
+ await config.tables.getAll(2)
+ })
})