Skip to content

Commit 737058c

Browse files
committed
fix(auth): preserve no-access scan area settings
1 parent 8496744 commit 737058c

1 file changed

Lines changed: 14 additions & 5 deletions

File tree

server/src/utils/getServerSettings.js

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,26 @@ function getServerSettings(req) {
2121
loggedIn: !!req.user,
2222
cooldown: req.session?.cooldown || 0,
2323
})
24+
const normalizedPerms = user.perms
25+
? {
26+
...user.perms,
27+
areaRestrictions: normalizeAreaRestrictions(
28+
user.perms.areaRestrictions || [],
29+
req,
30+
),
31+
}
32+
: user.perms
2433

2534
const safeUser = {
2635
...user,
27-
perms: user.perms
36+
perms: normalizedPerms
2837
? {
29-
...user.perms,
38+
...normalizedPerms,
3039
areaRestrictions: getPublicAreaRestrictions(
31-
normalizeAreaRestrictions(user.perms.areaRestrictions || [], req),
40+
normalizedPerms.areaRestrictions,
3241
),
3342
}
34-
: user.perms,
43+
: normalizedPerms,
3544
}
3645

3746
const { clientValues, clientMenus } = clientOptions(safeUser.perms)
@@ -79,7 +88,7 @@ function getServerSettings(req) {
7988
tileServers: config.getSafe('tileServers'),
8089
navigation: config.getSafe('navigation'),
8190
menus: advMenus(safeUser.perms),
82-
scanAreasMenu: getAccessibleScanAreasMenu(req, safeUser.perms),
91+
scanAreasMenu: getAccessibleScanAreasMenu(req, normalizedPerms),
8392
userSettings: clientValues,
8493
clientMenus,
8594
ui: drawer(req, safeUser.perms),

0 commit comments

Comments
 (0)