mirror/Checkmate
1
0
Fork 0
mirror of https://github.com/bluewave-labs/Checkmate.git synced 2026-01-06 09:49:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/be/in-app-settings' into feat/fe/in-app-settings

Browse Source
This commit is contained in:
Alex Holliday
2024-09-30 10:08:45 +08:00
parent 806f530016 73ac91c201
commit 6418efde2a
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Server/controllers/authController.js
View File

@@ -18,6 +18,7 @@ const { errorMessages, successMessages } = require("../utils/messages");
var jwt = require("jsonwebtoken");
const SERVICE_NAME = "AuthController";
const { getTokenFromHeaders } = require("../utils/utils");
const crypto = require("crypto");
/**
* Creates and returns JWT token with an arbitrary payload
@@ -61,7 +62,12 @@ const registerController = async (req, res, next) => {
const superAdminExists = await req.db.checkSuperadmin(req, res);
if (superAdminExists) {
await req.db.getInviteTokenAndDelete(inviteToken);
} else {
// This is the first account, create JWT secret to use if one is not supplied by env
const jwtSecret = crypto.randomBytes(64).toString("hex");
await req.db.updateAppSettings({ jwtSecret });
}
const newUser = await req.db.insertUser({ ...req.body }, req.file);
logger.info(successMessages.AUTH_CREATE_USER, {
service: SERVICE_NAME,

4
Server/controllers/settingsController.js
View File

@@ -4,7 +4,7 @@ const { updateAppSettingsBodyValidation } = require("../validation/joi");
const getAppSettings = async (req, res, next) => {
try {
const settings = await req.db.getAppSettings();
const settings = await req.settingsService.getSettings();
return res.status(200).json({
success: true,
msg: successMessages.GET_APP_SETTINGS,
@@ -30,7 +30,7 @@ const updateAppSettings = async (req, res, next) => {
}
try {
const settings = await req.db.updateAppSettings(req.body);
await req.db.updateAppSettings(req.body);
const updatedSettings = await req.settingsService.reloadSettings();
return res.status(200).json({
success: true,