From 0973394208193468b3288e2d0efbc8436433746a Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Tue, 13 Jul 2021 17:30:17 +0100 Subject: [PATCH] Update config checklist to handle multiple sso sources --- .../builder/src/components/common/ConfigChecklist.svelte | 2 +- packages/worker/src/api/controllers/admin/configs.js | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/builder/src/components/common/ConfigChecklist.svelte b/packages/builder/src/components/common/ConfigChecklist.svelte index 5e8e64fbb0..aa43f3b7b8 100644 --- a/packages/builder/src/components/common/ConfigChecklist.svelte +++ b/packages/builder/src/components/common/ConfigChecklist.svelte @@ -12,7 +12,7 @@ apps: "Create your first app", smtp: "Set up email", adminUser: "Create your first user", - oauth: "Set up OAuth", + sso: "Set up Single Sign-On", } diff --git a/packages/worker/src/api/controllers/admin/configs.js b/packages/worker/src/api/controllers/admin/configs.js index 0dbfb50159..27b6c7f238 100644 --- a/packages/worker/src/api/controllers/admin/configs.js +++ b/packages/worker/src/api/controllers/admin/configs.js @@ -206,7 +206,7 @@ exports.configChecklist = async function (ctx) { }) // They have set up Google Auth - const oauthConfig = await getScopedFullConfig(db, { + const googleConfig = await getScopedFullConfig(db, { type: Configs.GOOGLE, }) @@ -226,8 +226,7 @@ exports.configChecklist = async function (ctx) { apps: appDbNames.length, smtp: !!smtpConfig, adminUser, - oauth: !!oauthConfig, - oidc: !!oidcConfig, + sso: !!googleConfig || !!oidcConfig } } catch (err) { ctx.throw(err.status, err)