hola-server 0.6.6 → 0.6.8

package/http/session.js

@@ -33,6 +33,11 @@ const get_session_user_role = (req) => {
 const mode_all = "bcdeiorsu";
 
 const get_user_role_mode = (req, roles) => {
+    const server = get_settings().server;
+    if (server.check_user == false) {
+        return mode_all;
+    }
+
     const user_role = get_session_user_role(req);
     if (!user_role) {
         return "";
@@ -47,7 +52,11 @@ const get_user_role_mode = (req, roles) => {
             const role_name = role_settings[0];
             const role_mode = role_settings[1];
             if (user_role == role_name) {
-                return role_mode;
+                if (role_mode == "*") {
+                    return mode_all;
+                } else {
+                    return role_mode;
+                }
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hola-server",
-  "version": "0.6.6",
+  "version": "0.6.8",
   "description": "a meta programming framework used to build nodejs restful api",
   "main": "index.js",
   "scripts": {

package/router/read.js

@@ -22,7 +22,6 @@ const init_read_router = function (router, meta) {
             }
         }
 
-        const mode = meta.roles ? get_user_role_mode(req, meta.roles) : "";
         const entity_meta = {
             creatable: meta.creatable,
             readable: meta.readable,
@@ -33,12 +32,23 @@ const init_read_router = function (router, meta) {
             exportable: meta.exportable,
             editable: meta.editable,
             user_field: meta.user_field,
-            fields: meta.fields,
-            mode: mode.length > 0 ? mode : null
+            fields: meta.fields
         }
         res.json({ code: SUCCESS, data: entity_meta });
     }));
 
+    router.get('/mode', wrap_http(async function (req, res) {
+        if (meta.roles) {
+            const has_right = check_user_role(req, meta.roles, "r");
+            if (!has_right) {
+                res.json({ code: NO_RIGHTS, err: "no rights error" });
+                return;
+            }
+        }
+
+        res.json({ code: SUCCESS, data: get_user_role_mode(req, meta.roles) });
+    }));
+
     router.get('/ref', wrap_http(async function (req, res) {
         if (meta.roles) {
             const has_right = check_user_role(req, meta.roles, "r");

package/setting.js

@@ -44,14 +44,20 @@ const get_settings = () => {
 }
 
 const is_valid_role = (role_name) => {
+    //no role defined, then no role check
     if (!settings.roles) {
-        return false;
+        return true;
     }
     const roles = settings.roles.filter(role => role.name == role_name);
     return roles.length == 1;
 }
 
 const is_root_role = (role_name) => {
+    //no role defined, then every one is root
+    if (!settings.roles) {
+        return true;
+    }
+
     if (!is_valid_role(role_name)) {
         return false;
     }