Merge branch 'develop' into fix/nodemailer_relay
This commit is contained in:
14 files changed
+99
-45
No files matched your search
@@ -13,6 +13,7 @@ class SettingsController {
|
||||
getAppSettings = async (req, res, next) => {
|
||||
const dbSettings = await this.settingsService.getDBSettings();
|
||||
const sanitizedSettings = { ...dbSettings };
|
||||
delete sanitizedSettings.version;
|
||||
|
||||
const returnSettings = {
|
||||
pagespeedKeySet: false,
|
||||
@@ -27,7 +28,6 @@ class SettingsController {
|
||||
returnSettings.emailPasswordSet = true;
|
||||
delete sanitizedSettings.systemEmailPassword;
|
||||
}
|
||||
|
||||
returnSettings.settings = sanitizedSettings;
|
||||
return res.success({
|
||||
msg: this.stringService.getAppSettings,
|
||||
|
||||
@@ -34,6 +34,10 @@ const AppSettingsSchema = mongoose.Schema(
|
||||
unique: true,
|
||||
default: true,
|
||||
},
|
||||
version: {
|
||||
type: Number,
|
||||
default: 1,
|
||||
},
|
||||
},
|
||||
{
|
||||
timestamps: true,
|
||||
|
||||
@@ -60,6 +60,9 @@ class SettingsService {
|
||||
}
|
||||
|
||||
async getDBSettings() {
|
||||
// Remove any old settings
|
||||
await this.appSettings.deleteMany({ version: { $exists: false } });
|
||||
|
||||
let settings = await this.appSettings
|
||||
.findOne({ singleton: true })
|
||||
.select("-__v -_id -createdAt -updatedAt -singleton")
|
||||
|
||||
Reference in new issue
Block a user