Mark google activated by default for old configs

This commit is contained in:
Rory Powell 2021-07-23 11:38:17 +01:00
parent f3f60aee78
commit 249df46770
2 changed files with 17 additions and 11 deletions

View File

@ -31,7 +31,13 @@ describe("run misc tests", () => {
describe("/version", () => {
it("should confirm version", async () => {
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)
}
})
})

View File

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