Merge branch 'develop' of github.com:Budibase/budibase into labday/backups
This commit is contained in:
commit
d43de2b6c7
27 changed files with 104 additions and 78 deletions
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"version": "1.0.218",
|
||||
"version": "1.0.219-alpha.10",
|
||||
"npmClient": "yarn",
|
||||
"packages": [
|
||||
"packages/*"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/backend-core",
|
||||
"version": "1.0.218",
|
||||
"version": "1.0.219-alpha.10",
|
||||
"description": "Budibase backend core libraries used in server and worker",
|
||||
"main": "dist/src/index.js",
|
||||
"types": "dist/src/index.d.ts",
|
||||
|
@ -20,7 +20,7 @@
|
|||
"test:watch": "jest --watchAll"
|
||||
},
|
||||
"dependencies": {
|
||||
"@budibase/types": "^1.0.218",
|
||||
"@budibase/types": "^1.0.219-alpha.10",
|
||||
"@techpass/passport-openidconnect": "0.3.2",
|
||||
"aws-sdk": "2.1030.0",
|
||||
"bcrypt": "5.0.1",
|
||||
|
|
|
@ -20,6 +20,8 @@ const {
|
|||
internalApi,
|
||||
} = require("./middleware")
|
||||
|
||||
const { invalidateUser } = require("./cache/user")
|
||||
|
||||
// Strategies
|
||||
passport.use(new LocalStrategy(local.options, local.authenticate))
|
||||
passport.use(new JwtStrategy(jwt.options, jwt.authenticate))
|
||||
|
@ -149,6 +151,8 @@ async function updateUserOAuth(userId, oAuthConfig) {
|
|||
}
|
||||
|
||||
await db.put(dbUser)
|
||||
|
||||
await invalidateUser(userId)
|
||||
} catch (e) {
|
||||
console.error("Could not update OAuth details for current user", e)
|
||||
}
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
const NonErrors = ["AccountError"]
|
||||
|
||||
function isSuppressed(e) {
|
||||
function isSuppressed(e?: any) {
|
||||
return e && e["suppressAlert"]
|
||||
}
|
||||
|
||||
module.exports.logAlert = (message, e) => {
|
||||
export function logAlert(message: string, e?: any) {
|
||||
if (e && NonErrors.includes(e.name) && isSuppressed(e)) {
|
||||
return
|
||||
}
|
||||
|
@ -14,3 +14,7 @@ module.exports.logAlert = (message, e) => {
|
|||
}
|
||||
console.error(`bb-alert: ${message} ${errorJson}`)
|
||||
}
|
||||
|
||||
export default {
|
||||
logAlert,
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "@budibase/bbui",
|
||||
"description": "A UI solution used in the different Budibase projects.",
|
||||
"version": "1.0.218",
|
||||
"version": "1.0.219-alpha.10",
|
||||
"license": "MPL-2.0",
|
||||
"svelte": "src/index.js",
|
||||
"module": "dist/bbui.es.js",
|
||||
|
@ -38,7 +38,7 @@
|
|||
],
|
||||
"dependencies": {
|
||||
"@adobe/spectrum-css-workflow-icons": "^1.2.1",
|
||||
"@budibase/string-templates": "^1.0.218",
|
||||
"@budibase/string-templates": "^1.0.219-alpha.10",
|
||||
"@spectrum-css/actionbutton": "^1.0.1",
|
||||
"@spectrum-css/actiongroup": "^1.0.1",
|
||||
"@spectrum-css/avatar": "^3.0.2",
|
||||
|
|
|
@ -16,4 +16,4 @@
|
|||
"runMode": 1,
|
||||
"openMode": 0
|
||||
}
|
||||
}
|
||||
}
|
|
@ -36,5 +36,9 @@ filterTests(['all'], () => {
|
|||
})
|
||||
cy.addCustomSourceOptions(totalRadioButtons)
|
||||
}
|
||||
|
||||
after(() => {
|
||||
cy.deleteAllApps()
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
|
@ -9,10 +9,11 @@ filterTests(["smoke", "all"], () => {
|
|||
before(() => {
|
||||
cy.login()
|
||||
cy.deleteApp("Cypress Tests")
|
||||
cy.createApp("Cypress Tests")
|
||||
cy.createApp("Cypress Tests", false)
|
||||
|
||||
// Create new user
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 1000})
|
||||
cy.wait(500)
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000})
|
||||
cy.createUser(bbUserEmail)
|
||||
cy.contains("bbuser").click()
|
||||
cy.wait(500)
|
||||
|
|
|
@ -6,11 +6,11 @@ filterTests(["smoke", "all"], () => {
|
|||
before(() => {
|
||||
cy.login()
|
||||
cy.deleteApp("Cypress Tests")
|
||||
cy.createApp("Cypress Tests")
|
||||
cy.createApp("Cypress Tests", false)
|
||||
})
|
||||
|
||||
it("should create a user via basic onboarding", () => {
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 1000})
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000})
|
||||
cy.createUser("bbuser@test.com")
|
||||
cy.get(interact.SPECTRUM_TABLE).should("contain", "bbuser")
|
||||
})
|
||||
|
@ -45,15 +45,16 @@ filterTests(["smoke", "all"], () => {
|
|||
if(i < 1){
|
||||
cy.createApp(name)
|
||||
} else {
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`)
|
||||
cy.get(interact.CREATE_APP_BUTTON, { timeout: 1000 }).click({ force: true })
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000})
|
||||
cy.wait(1000)
|
||||
cy.get(interact.CREATE_APP_BUTTON, { timeout: 2000 }).click({ force: true })
|
||||
cy.createAppFromScratch(name)
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
// Navigate back to the user
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 500})
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000})
|
||||
cy.get(interact.SPECTRUM_SIDENAV).contains("Users").click()
|
||||
cy.get(interact.SPECTRUM_TABLE, { timeout: 500 }).contains("bbuser").click()
|
||||
for (let i = 0; i < 3; i++) {
|
||||
|
@ -173,14 +174,16 @@ filterTests(["smoke", "all"], () => {
|
|||
|
||||
it("Should edit user details within user details page", () => {
|
||||
// Add First name
|
||||
cy.get(interact.FIELD, { timeout: 500 }).eq(2).within(() => {
|
||||
cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 500 }).type("bb")
|
||||
cy.get(interact.FIELD, { timeout: 1000 }).eq(2).within(() => {
|
||||
cy.wait(500)
|
||||
cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).wait(500).clear().click().type("bb")
|
||||
})
|
||||
// Add Last name
|
||||
cy.get(interact.FIELD).eq(3).within(() => {
|
||||
cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).type("test")
|
||||
cy.get(interact.FIELD, { timeout: 1000 }).eq(3).within(() => {
|
||||
cy.wait(500)
|
||||
cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).click().wait(500).clear().type("test")
|
||||
})
|
||||
cy.get(interact.FIELD).eq(0).click()
|
||||
cy.get(interact.FIELD, { timeout: 1000 }).eq(0).click()
|
||||
// Reload page
|
||||
cy.reload()
|
||||
|
||||
|
@ -188,8 +191,8 @@ filterTests(["smoke", "all"], () => {
|
|||
cy.get(interact.FIELD, { timeout: 1000 }).eq(2).within(() => {
|
||||
cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).should('have.value', "bb")
|
||||
})
|
||||
cy.get(interact.FIELD).eq(3).within(() => {
|
||||
cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 500 }).should('have.value', "test")
|
||||
cy.get(interact.FIELD, { timeout: 1000 }).eq(3).within(() => {
|
||||
cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).should('have.value', "test")
|
||||
})
|
||||
})
|
||||
|
||||
|
|
|
@ -103,6 +103,8 @@ filterTests(["smoke", "all"], () => {
|
|||
}
|
||||
cy.get("button").contains("Update password").click({ force: true })
|
||||
})
|
||||
// Remove users name
|
||||
cy.updateUserInformation()
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
|
@ -5,6 +5,7 @@ filterTests(["all"], () => {
|
|||
context("Application Overview screen", () => {
|
||||
before(() => {
|
||||
cy.login()
|
||||
cy.deleteAllApps()
|
||||
cy.createTestApp()
|
||||
})
|
||||
|
||||
|
@ -300,7 +301,7 @@ filterTests(["all"], () => {
|
|||
})
|
||||
|
||||
it("Should allow editing of the app details.", () => {
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`)
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
|
||||
cy.get(".appTable .app-row-actions button")
|
||||
.contains("Manage")
|
||||
.eq(0)
|
||||
|
@ -315,7 +316,8 @@ filterTests(["all"], () => {
|
|||
cy.updateAppName("sample name")
|
||||
|
||||
//publish and check its disabled
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`)
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
|
||||
cy.wait(500)
|
||||
cy.get(".appTable .app-row-actions button")
|
||||
.contains("Edit")
|
||||
.eq(0)
|
||||
|
@ -331,8 +333,8 @@ filterTests(["all"], () => {
|
|||
cy.wait(1000)
|
||||
})
|
||||
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`)
|
||||
cy.get(".appTable .app-row-actions button", { timeout: 1000 })
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 10000 })
|
||||
cy.get(".appTable .app-row-actions button", { timeout: 5000 })
|
||||
.contains("Manage")
|
||||
.eq(0)
|
||||
.click({ force: true })
|
||||
|
|
|
@ -6,11 +6,12 @@ filterTests(['all'], () => {
|
|||
context("Publish Application Workflow", () => {
|
||||
before(() => {
|
||||
cy.login()
|
||||
cy.createTestApp()
|
||||
cy.deleteAllApps()
|
||||
cy.createApp("Cypress Tests", false)
|
||||
})
|
||||
|
||||
it("Should reflect the unpublished status correctly", () => {
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`)
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
|
||||
|
||||
cy.get(interact.APP_TABLE_STATUS, { timeout: 3000 }).eq(0)
|
||||
.within(() => {
|
||||
|
@ -29,6 +30,7 @@ filterTests(['all'], () => {
|
|||
|
||||
it("Should publish an application and correctly reflect that", () => {
|
||||
//Assuming the previous test was run and the unpublished app is open in edit mode.
|
||||
cy.closeModal()
|
||||
cy.get(interact.TOPRIGHTNAV_BUTTON_SPECTRUM).contains("Publish").click({ force : true })
|
||||
|
||||
cy.get(interact.DEPLOY_APP_MODAL).should("be.visible")
|
||||
|
@ -72,7 +74,7 @@ filterTests(['all'], () => {
|
|||
it("Should unpublish an application using the link and reflect the status change", () => {
|
||||
//Assuming the previous test app exists and is published
|
||||
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`)
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
|
||||
|
||||
cy.get(interact.APP_TABLE_STATUS).eq(0)
|
||||
.within(() => {
|
||||
|
@ -85,6 +87,7 @@ filterTests(['all'], () => {
|
|||
cy.get(interact.APP_TABLE_APP_NAME).click({ force: true })
|
||||
})
|
||||
|
||||
cy.closeModal()
|
||||
cy.get(interact.DEPLOYMENT_TOP_GLOBE).should("exist").click({ force: true })
|
||||
|
||||
cy.get("[data-cy='publish-popover-menu']")
|
||||
|
@ -97,7 +100,8 @@ filterTests(['all'], () => {
|
|||
cy.get(interact.CONFIRM_WRAP_BUTTON).click({ force: true }
|
||||
)})
|
||||
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`)
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 6000 })
|
||||
cy.wait(500)
|
||||
cy.get(interact.APP_TABLE_STATUS, { timeout: 1000 }).eq(0).contains("Unpublished")
|
||||
|
||||
})
|
||||
|
|
|
@ -51,7 +51,8 @@ filterTests(['smoke', 'all'], () => {
|
|||
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 10000 })
|
||||
|
||||
// Start create app process. If apps already exist, click second button
|
||||
cy.get(interact.CREATE_APP_BUTTON, { timeout: 1000 }).click({ force: true })
|
||||
cy.wait(1000)
|
||||
cy.get(interact.CREATE_APP_BUTTON, { timeout: 3000 }).click({ force: true })
|
||||
|
||||
const appName = "Cypress Tests"
|
||||
cy.get(interact.SPECTRUM_MODAL).within(() => {
|
||||
|
@ -86,7 +87,7 @@ filterTests(['smoke', 'all'], () => {
|
|||
const appName = "Cypress Tests"
|
||||
cy.createApp(appName, false)
|
||||
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`)
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
|
||||
|
||||
cy.applicationInAppTable(appName)
|
||||
cy.deleteApp(appName)
|
||||
|
|
|
@ -111,6 +111,7 @@ filterTests(["all"], () => {
|
|||
// Save relationship & reload page
|
||||
cy.get(".spectrum-Button").contains("Save").click({ force: true })
|
||||
cy.reload()
|
||||
cy.wait(1000)
|
||||
})
|
||||
// Confirm table length & relationship name
|
||||
cy.get(".spectrum-Table", { timeout: 1000 })
|
||||
|
|
|
@ -151,7 +151,7 @@ filterTests(["all"], () => {
|
|||
cy.get("@query").its("response.body").should("not.be.empty")
|
||||
// Save query
|
||||
cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
|
||||
cy.get(".hierarchy-items-container").should("contain", queryName)
|
||||
cy.get(".spectrum-Tabs-content", { timeout: 2000 }).should("contain", queryName)
|
||||
})
|
||||
|
||||
it("should switch to schema with no tables", () => {
|
||||
|
|
|
@ -12,7 +12,7 @@ filterTests(["all"], () => {
|
|||
const appName = "Cypress Tests"
|
||||
const appRename = "Cypress Renamed"
|
||||
// Rename app, Search for app, Confirm name was changed
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`)
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
|
||||
renameApp(appName, appRename)
|
||||
cy.reload()
|
||||
cy.searchForApplication(appRename)
|
||||
|
@ -39,7 +39,7 @@ filterTests(["all"], () => {
|
|||
.click({ force: true })
|
||||
})
|
||||
// Rename app, Search for app, Confirm name was changed
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`)
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
|
||||
renameApp(appName, appRename, true)
|
||||
cy.get(interact.APP_TABLE).find(interact.WRAPPER).should("have.length", 1)
|
||||
cy.applicationInAppTable(appRename)
|
||||
|
@ -47,7 +47,7 @@ filterTests(["all"], () => {
|
|||
|
||||
it("Should try to rename an application to have no name", () => {
|
||||
const appName = "Cypress Tests"
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`)
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
|
||||
renameApp(appName, " ", false, true)
|
||||
// Close modal and confirm name has not been changed
|
||||
cy.get(interact.SPECTRUM_DIALOG_GRID, { timeout: 1000 }).contains("Cancel").click()
|
||||
|
@ -57,7 +57,7 @@ filterTests(["all"], () => {
|
|||
xit("Should create two applications with the same name", () => {
|
||||
// It is not possible to have applications with the same name
|
||||
const appName = "Cypress Tests"
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`)
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
|
||||
cy.get(interact.SPECTRUM_BUTTON), { timeout: 500 }
|
||||
.contains("Create app")
|
||||
.click({ force: true })
|
||||
|
@ -80,18 +80,15 @@ filterTests(["all"], () => {
|
|||
const appName = "Cypress Tests"
|
||||
const numberName = 12345
|
||||
const specialCharName = "£$%^"
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`)
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
|
||||
renameApp(appName, numberName)
|
||||
cy.reload()
|
||||
cy.applicationInAppTable(numberName)
|
||||
cy.reload()
|
||||
renameApp(numberName, specialCharName)
|
||||
cy.get(interact.ERROR).should(
|
||||
"have.text",
|
||||
"App name must be letters, numbers and spaces only"
|
||||
)
|
||||
// Set app name back to Cypress Tests
|
||||
cy.reload()
|
||||
renameApp(numberName, appName)
|
||||
})
|
||||
|
||||
|
|
|
@ -135,6 +135,7 @@ Cypress.Commands.add("createApp", (name, addDefaultTable) => {
|
|||
typeof addDefaultTable != "boolean" ? true : addDefaultTable
|
||||
|
||||
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
|
||||
cy.wait(1000)
|
||||
cy.get(`[data-cy="create-app-btn"]`, { timeout: 2000 }).click({ force: true })
|
||||
|
||||
// If apps already exist
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/builder",
|
||||
"version": "1.0.218",
|
||||
"version": "1.0.219-alpha.10",
|
||||
"license": "GPL-3.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
|
@ -69,10 +69,10 @@
|
|||
}
|
||||
},
|
||||
"dependencies": {
|
||||
"@budibase/bbui": "^1.0.218",
|
||||
"@budibase/client": "^1.0.218",
|
||||
"@budibase/frontend-core": "^1.0.218",
|
||||
"@budibase/string-templates": "^1.0.218",
|
||||
"@budibase/bbui": "^1.0.219-alpha.10",
|
||||
"@budibase/client": "^1.0.219-alpha.10",
|
||||
"@budibase/frontend-core": "^1.0.219-alpha.10",
|
||||
"@budibase/string-templates": "^1.0.219-alpha.10",
|
||||
"@sentry/browser": "5.19.1",
|
||||
"@spectrum-css/page": "^3.0.1",
|
||||
"@spectrum-css/vars": "^3.0.1",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/cli",
|
||||
"version": "1.0.218",
|
||||
"version": "1.0.219-alpha.10",
|
||||
"description": "Budibase CLI, for developers, self hosting and migrations.",
|
||||
"main": "src/index.js",
|
||||
"bin": {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/client",
|
||||
"version": "1.0.218",
|
||||
"version": "1.0.219-alpha.10",
|
||||
"license": "MPL-2.0",
|
||||
"module": "dist/budibase-client.js",
|
||||
"main": "dist/budibase-client.js",
|
||||
|
@ -19,9 +19,9 @@
|
|||
"dev:builder": "rollup -cw"
|
||||
},
|
||||
"dependencies": {
|
||||
"@budibase/bbui": "^1.0.218",
|
||||
"@budibase/frontend-core": "^1.0.218",
|
||||
"@budibase/string-templates": "^1.0.218",
|
||||
"@budibase/bbui": "^1.0.219-alpha.10",
|
||||
"@budibase/frontend-core": "^1.0.219-alpha.10",
|
||||
"@budibase/string-templates": "^1.0.219-alpha.10",
|
||||
"@spectrum-css/button": "^3.0.3",
|
||||
"@spectrum-css/card": "^3.0.3",
|
||||
"@spectrum-css/divider": "^1.0.3",
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"name": "@budibase/frontend-core",
|
||||
"version": "1.0.218",
|
||||
"version": "1.0.219-alpha.10",
|
||||
"description": "Budibase frontend core libraries used in builder and client",
|
||||
"author": "Budibase",
|
||||
"license": "MPL-2.0",
|
||||
"svelte": "src/index.js",
|
||||
"dependencies": {
|
||||
"@budibase/bbui": "^1.0.218",
|
||||
"@budibase/bbui": "^1.0.219-alpha.10",
|
||||
"lodash": "^4.17.21",
|
||||
"svelte": "^3.46.2"
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "@budibase/server",
|
||||
"email": "hi@budibase.com",
|
||||
"version": "1.0.218",
|
||||
"version": "1.0.219-alpha.10",
|
||||
"description": "Budibase Web Server",
|
||||
"main": "src/index.ts",
|
||||
"repository": {
|
||||
|
@ -77,11 +77,11 @@
|
|||
"license": "GPL-3.0",
|
||||
"dependencies": {
|
||||
"@apidevtools/swagger-parser": "10.0.3",
|
||||
"@budibase/backend-core": "^1.0.218",
|
||||
"@budibase/client": "^1.0.218",
|
||||
"@budibase/pro": "1.0.218",
|
||||
"@budibase/string-templates": "^1.0.218",
|
||||
"@budibase/types": "^1.0.218",
|
||||
"@budibase/backend-core": "^1.0.219-alpha.10",
|
||||
"@budibase/client": "^1.0.219-alpha.10",
|
||||
"@budibase/pro": "1.0.219-alpha.10",
|
||||
"@budibase/string-templates": "^1.0.219-alpha.10",
|
||||
"@budibase/types": "^1.0.219-alpha.10",
|
||||
"@bull-board/api": "3.7.0",
|
||||
"@bull-board/koa": "3.9.4",
|
||||
"@elastic/elasticsearch": "7.10.0",
|
||||
|
|
|
@ -8,6 +8,7 @@ const {
|
|||
refreshOAuthToken,
|
||||
updateUserOAuth,
|
||||
} = require("@budibase/backend-core/auth")
|
||||
const { user: userCache } = require("@budibase/backend-core/cache")
|
||||
const { getGlobalIDFromUserMetadataID } = require("../db/utils")
|
||||
|
||||
const { isSQL } = require("../integrations/utils")
|
||||
|
@ -112,15 +113,9 @@ class QueryRunner {
|
|||
info.code === 401 &&
|
||||
!this.hasRefreshedOAuth
|
||||
) {
|
||||
await this.refreshOAuth2(this.ctx)
|
||||
// Attempt to refresh the access token from the provider
|
||||
this.hasRefreshedOAuth = true
|
||||
const authResponse = await this.refreshOAuth2(this.ctx)
|
||||
|
||||
if (!authResponse || authResponse.err) {
|
||||
// In this event the user may have oAuth issues that
|
||||
// could require re-authenticating with their provider.
|
||||
throw new Error("OAuth2 access token could not be refreshed")
|
||||
}
|
||||
}
|
||||
|
||||
this.hasRerun = true
|
||||
|
@ -174,8 +169,7 @@ class QueryRunner {
|
|||
const { configId } = ctx.auth
|
||||
|
||||
if (!providerType || !oauth2?.refreshToken) {
|
||||
console.error("No refresh token found for authenticated user")
|
||||
return
|
||||
throw new Error("No refresh token found for authenticated user")
|
||||
}
|
||||
|
||||
const resp = await refreshOAuthToken(
|
||||
|
@ -186,9 +180,16 @@ class QueryRunner {
|
|||
|
||||
// Refresh session flow. Should be in same location as refreshOAuthToken
|
||||
// There are several other properties available in 'resp'
|
||||
if (!resp.error) {
|
||||
if (!resp.err) {
|
||||
const globalUserId = getGlobalIDFromUserMetadataID(_id)
|
||||
await updateUserOAuth(globalUserId, resp)
|
||||
this.ctx.user = await userCache.getUser(globalUserId)
|
||||
} else {
|
||||
// In this event the user may have oAuth issues that
|
||||
// could require re-authenticating with their provider.
|
||||
throw new Error(
|
||||
"OAuth2 access token could not be refreshed: " + resp.err.toString()
|
||||
)
|
||||
}
|
||||
|
||||
return resp
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/string-templates",
|
||||
"version": "1.0.218",
|
||||
"version": "1.0.219-alpha.10",
|
||||
"description": "Handlebars wrapper for Budibase templating.",
|
||||
"main": "src/index.cjs",
|
||||
"module": "dist/bundle.mjs",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/types",
|
||||
"version": "1.0.218",
|
||||
"version": "1.0.219-alpha.10",
|
||||
"description": "Budibase types",
|
||||
"main": "dist/index.js",
|
||||
"types": "dist/index.d.ts",
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "@budibase/worker",
|
||||
"email": "hi@budibase.com",
|
||||
"version": "1.0.218",
|
||||
"version": "1.0.219-alpha.10",
|
||||
"description": "Budibase background service",
|
||||
"main": "src/index.ts",
|
||||
"repository": {
|
||||
|
@ -34,10 +34,10 @@
|
|||
"author": "Budibase",
|
||||
"license": "GPL-3.0",
|
||||
"dependencies": {
|
||||
"@budibase/backend-core": "^1.0.218",
|
||||
"@budibase/pro": "1.0.218",
|
||||
"@budibase/string-templates": "^1.0.218",
|
||||
"@budibase/types": "^1.0.218",
|
||||
"@budibase/backend-core": "^1.0.219-alpha.10",
|
||||
"@budibase/pro": "1.0.219-alpha.10",
|
||||
"@budibase/string-templates": "^1.0.219-alpha.10",
|
||||
"@budibase/types": "^1.0.219-alpha.10",
|
||||
"@koa/router": "8.0.8",
|
||||
"@sentry/node": "6.17.7",
|
||||
"@techpass/passport-openidconnect": "0.3.2",
|
||||
|
|
|
@ -36,10 +36,11 @@ cd ../budibase-pro
|
|||
# Install NPM credentials
|
||||
echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc
|
||||
|
||||
# Sync backend-core version in packages/pro/package.json
|
||||
# Sync budibase dependency versions in packages/pro/package.json
|
||||
# Ensures pro does not use out of date dependency
|
||||
cd packages/pro
|
||||
jq '.dependencies."@budibase/backend-core"="'$VERSION'"' package.json > package.json.tmp && mv package.json.tmp package.json
|
||||
jq '.dependencies."@budibase/types"="'$VERSION'"' package.json > package.json.tmp && mv package.json.tmp package.json
|
||||
|
||||
# Go back to pro repo root
|
||||
cd -
|
||||
|
@ -91,4 +92,4 @@ cd -
|
|||
git add packages/server/package.json
|
||||
git add packages/worker/package.json
|
||||
git commit -m "Update pro version to $VERSION"
|
||||
git push
|
||||
git push
|
||||
|
|
Loading…
Reference in a new issue