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

Merge pull request #2072 from Budibase/fix/google-button 

Mark google activated by default for old configs
This commit is contained in:
PClmnt 2021-07-23 11:58:41 +01:00 committed by GitHub
parent c71d8a4f42 af28a7ed6b
commit c62805f4c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/server/src/api/routes/tests/misc.spec.js
View File

@ -31,7 +31,13 @@ describe("run misc tests", () => {
describe("/version", () => { describe("/version", () => {
it("should confirm version", async () => { it("should confirm version", async () => {
const res = await request.get("/version").expect(200) const res = await request.get("/version").expect(200)
expect(res.text.split(".").length).toEqual(3) const text = res.text
if (text.includes("alpha")) {
expect(text.split(".").length).toEqual(4)
} else {
expect(text.split(".").length).toEqual(3)
}
}) })
}) })

20
packages/worker/src/api/controllers/admin/configs.js
View File

@ -149,16 +149,16 @@ exports.publicSettings = async function (ctx) {
config = publicConfig config = publicConfig
} }
config.config.google = !googleConfig // google button flag
? !!googleConfig const googleActivated =
: !googleConfig.config.activated googleConfig.config.activated == undefined || // activated by default for configs pre-activated flag
? false googleConfig.config.activated
: true config.config.google = !googleConfig ? false : googleActivated
config.config.oidc = !oidcConfig
? !!oidcConfig // oidc button flag
: !oidcConfig.config.configs[0].activated const oidcActivated = !oidcConfig.config.configs[0].activated
? false config.config.oidc = !oidcConfig ? false : oidcActivated
: true
ctx.body = config ctx.body = config
} catch (err) { } catch (err) {
ctx.throw(err.status, err) ctx.throw(err.status, err)