diff --git a/mong_usr.js b/mong_usr.js index bc6369d..5f4b8c8 100644 --- a/mong_usr.js +++ b/mong_usr.js @@ -1,6 +1,6 @@ db.users.insert([ // User: author, Pwd: author - {"_id":"author","name":"Author","type":"PF@EFI;","roles":'{"user":true,"author":true}',"hash":"sha256","salt":"SIzKNsNKsCRVr8a9U90q6A==","pwd":"HZly68TSAKHioz6Kz0QCbXVTHpT6hMmabUbFYVlCMeE=","abos":[],"bookmarks":[],}, + {"_id":"author","name":"Author","type":"PF@EFI;","roles":{"user":true,"author":true},"hash":"sha256","salt":"SIzKNsNKsCRVr8a9U90q6A==","pwd":"HZly68TSAKHioz6Kz0QCbXVTHpT6hMmabUbFYVlCMeE=","abos":[],"bookmarks":[],}, // User: admin, Pwd: SwenMho // {"_id":"admin","name":"Test Admin","type":"MA@AMP;","roles":'{"user":true,"author":true,"admin":true}',"hash":"sha256","salt":"z3PNXGmQaWvaT7m2ZlT+0w==","pwd":"nfUfNv032J745xj3Hzya3Mkk43Dz/H0BmNTZhtx8UM0=","abos":["veniam","ipsum"],"bookmarks":[],}, ]) diff --git a/server.js b/server.js index c5e5f5e..7754ab1 100644 --- a/server.js +++ b/server.js @@ -60,11 +60,11 @@ app.use(session({ secure: true, // true for https only (since our app works only with https) }, name: 'om.sid', -// store: new MongoStore({ -// mongooseConnection: mong.connection, -// ttl: 30 * 24 * 3600, -// }), // mongoose + connect-mongo - //store: new MemoryStore ({checkPeriod: 24*3600*1000}), // memorystore + store: new MongoStore({ + mongooseConnection: mong.connection, + ttl: 30 * 24 * 3600, + }), // mongoose + connect-mongo + store: new MemoryStore ({checkPeriod: 24*3600*1000}), // memorystore })); // Favicon for Desktop diff --git a/server/authorization.js b/server/authorization.js index 9b88055..4124aef 100644 --- a/server/authorization.js +++ b/server/authorization.js @@ -14,13 +14,13 @@ const clientVisibleSession = { user: true, name: true, type: true, mail: true, r // Return user role, query from found.mail function getUserRole(found) { - var roles = "user"; + var roles = {user:true}; var mail = found.mail; if (!/\d/.test(mail)) { // Mail contains no number - roles += ',"author"'; + roles.author = true; } - return JSON.stringify('{'+roles+'}'); + return roles; } // Fill in session object