From b77f7f25147e65e767d18181c8cf12f14cce287f Mon Sep 17 00:00:00 2001 From: David Leimroth <> Date: Thu, 10 Feb 2022 14:56:27 +0100 Subject: [PATCH] cleanup --- server/ApiController.js | 2 -- server/objects/SSOSettings.js | 20 -------------------- 2 files changed, 22 deletions(-) diff --git a/server/ApiController.js b/server/ApiController.js index 3dba0408c..a7d7ceb05 100644 --- a/server/ApiController.js +++ b/server/ApiController.js @@ -297,14 +297,12 @@ class ApiController { return res.sendStatus(403) } let SSOUpdate = req.body - Logger.debug("SSOUpdate=", SSOUpdate) if (!SSOUpdate || !isObject(SSOUpdate)) { return res.status(500).send('Invalid settings update object') } var madeUpdates = this.db.SSOSettings.update(SSOUpdate) - console.log("SSOUpdate", JSON.stringify(this.db.SSOSettings)) if (madeUpdates) { await this.db.updateEntity('settings', this.db.SSOSettings) } diff --git a/server/objects/SSOSettings.js b/server/objects/SSOSettings.js index 1f65b3e53..48626fbd4 100644 --- a/server/objects/SSOSettings.js +++ b/server/objects/SSOSettings.js @@ -28,7 +28,6 @@ class SSOSettings { this.id = 'sso-settings' this.user = { ...settings.user } this.initOIDCSettings(settings); - Logger.debug("[SSOSettings.constructor]", this.toJSON) } initOIDCSettings(settings) { @@ -75,31 +74,12 @@ class SSOSettings { const oldTmp = JSON.stringify(this.toJSON()) const newTmp = JSON.stringify(payload) // deep copy "for free" const hasUpdates = difference(oldTmp, newTmp) !== ""; // Not very efficient, but ok for small objects - Logger.debug(`SSOSettings hasUpdates=${hasUpdates}`) if (!hasUpdates) return hasUpdates payload = JSON.parse(newTmp) this.oidc = payload.oidc this.user = payload.user return hasUpdates - Logger.debug("SSOSettings.update", payload, this) - for (const key in payload) { - Logger.debug(`key: ${key}: ${JSON.stringify(payload[key])}`) - if (isObject(payload[key])) { - for (const setting in payload[key]) { - if (!this[key] || this[key][setting] === payload[key][setting]) { - continue - } - this[key][setting] = payload[key][setting] - hasUpdates = true - } - } else if (this[key] !== undefined && this[key] !== payload[key]) { - this[key] = payload[key] - hasUpdates = true - } - } - Logger.debug("SSOSettings.update", hasUpdates, this) - return hasUpdates } getNewUserPermissions() {