Navy.gif/webserver-framework
Template
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

authenticator logic
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Erik 2023-03-22 19:25:23 +02:00
parent bf4663d307
commit 636f39db5f
Signed by: Navy.gif
GPG Key ID: 2532FBBB61C65A68
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/components/UserDatabase.js
View File

@ -145,16 +145,14 @@ class UserDatabase extends UserDatabaseInterface {
if (app) if (app)
return Promise.resolve(app); return Promise.resolve(app);
const data = await this.db.findOne(this._appCollection, { 'token.encrypted': token }); const data = await this.db.findOne(this._appCollection, { token });
if (!data) if (!data)
return null; return null;
const user = await this.fetchUser(data.user); app = this._createApp(data);
app = this._createApp(user, data);
if (!this.disableCache) if (!this.disableCache)
this.cache.set(app.id, app); this.cache.set(app.id, app);
user.attachApplication(app);
return app; return app;

7
src/server/middleware/Authenticator.js
View File

@ -155,9 +155,9 @@ class Authenticator {
const key = segments[segments.length - 1]; const key = segments[segments.length - 1];
const application = await this.userdb.matchToken(key); const application = await this.userdb.matchToken(key);
if (application) if (application) {
req.user = application; req.user = application;
else { } else {
res.status(401).send('Unknown identity'); res.status(401).send('Unknown identity');
return false; return false;
} }
@ -179,10 +179,11 @@ class Authenticator {
PermissionManager.ensurePermission(permission); PermissionManager.ensurePermission(permission);
const func = async (req, res, next) => { const func = async (req, res, next) => {
const { user } = req;
// Request does not have a user bound to it, response already sent from #_authenticate // Request does not have a user bound to it, response already sent from #_authenticate
if (!await this.#_authenticate(req, res)) if (!await this.#_authenticate(req, res))
return; return;
// If the authentication is done through a token, the user will be attached in the authentication step
const { user } = req;
// Has permission // Has permission
if (user.hasPermission(permission, level)) if (user.hasPermission(permission, level))
return next(); return next();