v2 API

phoenixbf · Jun 26, 2024 · dc525c1 · dc525c1
1 parent 5f8b540
commit dc525c1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/services/API/v2.js b/services/API/v2.js
@@ -27,13 +27,6 @@ API.DOCS = "/apiv2-docs";
 
 Core.API = API;
 
-API.isUserAuth = (req)=>{
-    if (req.user === undefined) return false;
-    if (req.user.username === undefined) return false;
-
-    return true;
-};
-
 // Main setup
 API.init = (app)=>{
 
@@ -61,7 +54,7 @@ API.init = (app)=>{
 
         // Only own scenes
         let uname = req.params.user;
-        if (req.user.username !== uname){
+        if (Core.Auth.getUID(req) !== uname){
             res.status(401).send([]);
             return;
         }
@@ -107,7 +100,7 @@ API.init = (app)=>{
 
         // Only own scenes
         let uname = req.params.user;
-        if (req.user.username !== uname){
+        if (Core.Auth.getUID(req) !== uname){
             res.status(401).send(false);
             return;
         }
@@ -144,7 +137,7 @@ API.init = (app)=>{
 
         // Only own scenes
         let uname = req.params.user;
-        if (req.user.username !== uname){
+        if (Core.Auth.getUID(req) !== uname){
             res.status(401).send(false);
             return;
         }
@@ -171,7 +164,7 @@ API.init = (app)=>{
             return;
         }
 
-        let uname = req.user.username;
+        let uname = Core.Auth.getUID(req);
 
         let O = req.body;
         let data = O.data;
@@ -227,7 +220,7 @@ API.init = (app)=>{
             return;
         }
 
-        let uname = req.user.username;
+        let uname = Core.Auth.getUID(req);
         if (uname !== req.params.user){
             res.status(401).send([]);
             return;
@@ -243,7 +236,7 @@ API.init = (app)=>{
             return;
         }
 
-        let uname = req.user.username;
+        let uname = Core.Auth.getUID(req);
         if (uname !== req.params.user){
             res.status(401).send(false);
             return;
@@ -265,7 +258,7 @@ API.init = (app)=>{
             return;
         }
 
-        let uname = req.user.username;
+        let uname = Core.Auth.getUID(req);
 
         res.send( Core.Maat.getUserPanoramas(uname) );
     });
@@ -277,7 +270,7 @@ API.init = (app)=>{
             return;
         }
 
-        let uname = req.user.username;
+        let uname = Core.Auth.getUID(req);
 
         res.send( Core.Maat.getUserMedia(uname) );
     });
@@ -320,7 +313,7 @@ API.init = (app)=>{
 
         let uname = req.params.user;
 
-        let U = Auth.findUser(uname);
+        let U = Core.Auth.findUser(uname);
         if (U) res.send({
             username: U.username,
             admin: U.admin
@@ -338,7 +331,7 @@ API.init = (app)=>{
         let uname = req.params.user;
         let O = req.body;
 
-        let U = Auth.findUser(uname);
+        let U = Core.Auth.findUser(uname);
 
         //TODO: modify user entry
     });

diff --git a/services/Auth.js b/services/Auth.js
@@ -118,6 +118,12 @@ Auth.findUser = (username)=>{
 	return undefined;
 };
 
+// Unique user ID
+Auth.getUID = (req)=>{
+	if (!req.user) return undefined;
+	return req.user.username;
+};
+
 Auth.isUserAuth = (req, username)=>{
     if (req.user === undefined) return false;
     if (req.user.username === undefined) return false;
@@ -129,9 +135,10 @@ Auth.isUserAuth = (req, username)=>{
 
 Auth.isUserAdmin = (req)=>{
     if ( !Auth.isUserAuth(req) ) return false;
-    if ( !req.user.admin ) return false;
+	let u = req.user;
 
-    return true;
+	if (u.admin /*|| (u.roles && u.roles.admin)*/) return true;
+    else return false;
 };
 
 module.exports = Auth;
diff --git a/services/Core.js b/services/Core.js
@@ -203,8 +203,8 @@ Core.CONF_MAIN = {
 Core.CONF_USERS = [
 	{ 
         username: "ra",
-        admin: true,
-        password: "ra2020"
+        password: "ra2020",
+        admin: true
 	},
 	{ 
         username: "bastet",