mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-11-02 16:43:00 +00:00
Code Issues Releases Wiki Activity

Fix issue with default user role on create, profile navigation issue (#8761)

Browse Source
This commit is contained in:
webplusai
2024-11-19 12:43:07 +01:00
committed by GitHub
parent d9256707f4
commit 4dc2486d4b
4 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-index.js
View File

@@ -45,6 +45,7 @@ exports.handler = function(request,response,state) {
"user-is-admin": state.authenticatedUser && state.authenticatedUser.isAdmin ? "yes" : "no",
"first-guest-user": state.firstGuestUser ? "yes" : "no",
"show-annon-config": state.showAnonConfig ? "yes" : "no",
"user": JSON.stringify(state.authenticatedUser),
}});
response.write(html);
response.end();

1
plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/manage-user.js
View File

@@ -86,6 +86,7 @@ exports.handler = function(request,response,state) {
"user-initials": user.username.split(" ").map(name => name[0]).join(""),
"user-role": JSON.stringify(userRole),
"all-roles": JSON.stringify(allRoles),
"first-guest-user": state.firstGuestUser ? "yes" : "no",
"is-current-user-profile": state.authenticatedUser && state.authenticatedUser.user_id === $tw.utils.parseInt(user_id, 10) ? "yes" : "no",
"username": state.authenticatedUser ? state.authenticatedUser.username : state.firstGuestUser ? "Annonymous User" : "Guest",
"user-is-admin": state.authenticatedUser && state.authenticatedUser.isAdmin ? "yes" : "no",

6
plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-user.js
View File

@@ -78,6 +78,12 @@ exports.handler = function(request, response, state) {
response.end();
return;
} else {
// assign role to user
const roles = sqlTiddlerDatabase.listRoles();
const roleId = roles.find(role => role.role_name.toUpperCase() !== "ADMIN")?.role_id;
if (roleId) {
sqlTiddlerDatabase.addRoleToUser(userId, roleId);
}
response.writeHead(302, {"Location": "/admin/users/"+userId});
response.end();
}