not-node 5.1.7 → 5.1.10

package/index.js

@@ -29,6 +29,7 @@ module.exports.Routine = require("./src/model/routine");
 module.exports.Common = require("./src/common");
 /** Fields library manager */
 module.exports.Fields = require("./src/fields");
+module.exports.Forms = require("./src/form");
 /** Form validation template **/
 module.exports.Form = require("./src/form").Form;
 /** Form validation template fabric **/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "not-node",
-  "version": "5.1.7",
+  "version": "5.1.10",
   "description": "node complimentary part for client side notFramework.",
   "main": "index.js",
   "scripts": {

package/src/exceptions/db.js

@@ -2,7 +2,7 @@ const { notRequestError } = require("not-error");
 
 //delete wasnt successful, or error, or count of deleted documents dont match requested
 class DBExceptionDeleteWasNotSuccessful extends notRequestError {
-    constructor({ params = {}, cause = null }) {
+    constructor({ params = {}, cause = null } = {}) {
         super("DB Delete Was Not Successful", { code: 505, ...params }, cause);
     }
 }
@@ -11,7 +11,7 @@ module.exports.DBExceptionDeleteWasNotSuccessful =
 
 //delete wasnt successful, bc document is owned by another user
 class DBExceptionDocumentIsNotOwnerByActiveUser extends notRequestError {
-    constructor({ params = {}, cause = null }) {
+    constructor({ params = {}, cause = null } = {}) {
         super(
             "DB Only Owners Could Delete their documents",
             { code: 403, ...params },

package/src/exceptions/http.js

@@ -4,7 +4,7 @@ const { notRequestError } = require("not-error");
 
 //form of request is not valid
 class HttpExceptionBadRequest extends notRequestError {
-    constructor({ params = {}, cause = null }) {
+    constructor({ params = {}, cause = null } = {}) {
         super("Bad Request", { code: 400, ...params }, cause);
     }
 }
@@ -12,7 +12,7 @@ module.exports.HttpExceptionBadRequest = HttpExceptionBadRequest;
 
 //user is not authenticated
 class HttpExceptionUnauthorized extends notRequestError {
-    constructor({ params = {}, cause = null }) {
+    constructor({ params = {}, cause = null } = {}) {
         super("Unauthorized", { code: 401, ...params }, cause);
     }
 }
@@ -20,7 +20,7 @@ module.exports.HttpExceptionUnauthorized = HttpExceptionUnauthorized;
 
 //user is too poor to go there
 class HttpExceptionPaymentRequired extends notRequestError {
-    constructor({ params = {}, cause = null }) {
+    constructor({ params = {}, cause = null } = {}) {
         super("Payment Required", { code: 402, ...params }, cause);
     }
 }
@@ -28,7 +28,7 @@ module.exports.HttpExceptionPaymentRequired = HttpExceptionPaymentRequired;
 
 //user identity is known, but he has no right to go there
 class HttpExceptionForbidden extends notRequestError {
-    constructor({ params = {}, cause = null }) {
+    constructor({ params = {}, cause = null } = {}) {
         super("Forbidden", { code: 403, ...params }, cause);
     }
 }
@@ -36,7 +36,7 @@ module.exports.HttpExceptionForbidden = HttpExceptionForbidden;
 
 //requested address is not exists
 class HttpExceptionNotFound extends notRequestError {
-    constructor({ params = {}, cause = null }) {
+    constructor({ params = {}, cause = null } = {}) {
         super("Not Found", { code: 404, ...params }, cause);
     }
 }

package/src/generic/form.getById.js

@@ -0,0 +1,30 @@
+//DB related validation tools
+const Form = require("../form/form");
+const { firstLetterToUpper } = require("../common");
+//not-node
+const { getIP } = require("../auth");
+//form
+const FIELDS = [
+    ["targetId", { required: true }, "not-node//objectId"],
+    ["activeUserId", { required: true }, "not-node//objectId"],
+    ["activeUser", "not-node//requiredObject"],
+    ["ip", "not-node//ip"],
+];
+
+module.exports = ({ MODULE_NAME, actionName }) => {
+    const FORM_NAME = `${MODULE_NAME}:${firstLetterToUpper(actionName)}Form`;
+    return class extends Form {
+        constructor({ app }) {
+            super({ FIELDS, FORM_NAME, app });
+        }
+
+        extract(req) {
+            return {
+                targetId: req.params._id,
+                activeUser: req.user,
+                activeUserId: req.user._id,
+                ip: getIP(req),
+            };
+        }
+    };
+};

package/src/generic/index.js

@@ -1,2 +1,3 @@
 module.exports.GenericLogic = require("./logic.js");
 module.exports.GenericRoute = require("./route.js");
+module.exports.GenericGetByIdForm = require("./form.getById.js");

package/src/generic/logic.js

@@ -7,7 +7,7 @@ const {
 } = require("../exceptions/http");
 const isOwnerImported = require("../auth/fields.js").isOwner;
 const { DOCUMENT_OWNER_FIELD_NAME } = require("../auth/const.js");
-const notFilter = require("not-filter").filter;
+const notFilter = require("not-filter");
 
 module.exports = ({
     MODEL_NAME,
@@ -52,6 +52,8 @@ module.exports = ({
         static getModelSchema = getModelSchema;
         static getLogic = getLogic;
         static getModelUser = getModelUser;
+        static isOwner = isOwner;
+        static ownerFieldName = ownerFieldName;
 
         static async _create({
             action,
@@ -547,7 +549,7 @@ module.exports = ({
                 ip,
             });
             if (shouldOwn) {
-                notFilter.fitler.modifyRules(filter, {
+                notFilter.filter.modifyRules(filter, {
                     [ownerFieldName]: activeUser._id,
                 });
             }