@pxp-nd/core 1.2.1 → 1.2.2

package/dist/lib/pxp/Controller.js

@@ -125,6 +125,7 @@ class Controller {
         const dbsettings = Reflect.getMetadata('dbsettings', this.constructor) || {};
         // get logConfig
         const logConfig = Reflect.getMetadata('logConfig', this.constructor) || {};
+        const defaultConfig = Reflect.getMetadata('optionsRoute', this.constructor) || {};
         // define basic routes
         if (this.modelString !== '') {
             routes = lodash_1.default.union(this.basicRoutes, routes);
@@ -132,15 +133,18 @@ class Controller {
         }
         routes.forEach((route) => {
             const methodDbSettings = dbsettings[route.methodName] || this.config.defaultDbSettings;
-            if (!(route.methodName in readonly)) {
+            // readOnly
+            const readOnlyMethod = readonly[route.methodName] !== undefined ? readonly[route.methodName] : defaultConfig[route.methodName].readOnly;
+            if (readOnlyMethod === null || readOnlyMethod === undefined) {
                 throw new index_1.PxpError(500, 'ReadOnly decorator was not defined for ' +
                     route.methodName +
                     ' in ' +
                     this.constructor.name +
                     ' controller.');
             }
-            if (route.methodName in authentication &&
-                authentication[route.methodName] === false) {
+            // auth
+            const auth = authentication[route.methodName] !== undefined ? authentication[route.methodName] : (defaultConfig[route.methodName] ? defaultConfig[route.methodName].authentication : true);
+            if (!auth) {
                 this.router[route.requestMethod](this.config.apiPrefix + '/' + this.module + this.path + route.path, 
                 // MIDDLEWARES AREA
                 [
@@ -156,7 +160,7 @@ class Controller {
                         .toLowerCase();
                     this.validated = false;
                     try {
-                        await index_1.__(this.genericMethodWrapper(params, req, next, res, route.methodName, methodDbSettings, readonly[route.methodName], false, log[route.methodName], logConfig[route.methodName]));
+                        await index_1.__(this.genericMethodWrapper(params, req, next, res, route.methodName, methodDbSettings, readOnlyMethod, false, log[route.methodName], logConfig[route.methodName]));
                     }
                     catch (ex) {
                         const now = new Date();
@@ -189,7 +193,7 @@ class Controller {
                         .toLowerCase();
                     this.validated = false;
                     try {
-                        await index_1.__(this.genericMethodWrapper(params, req, next, res, route.methodName, methodDbSettings, readonly[route.methodName], permission[route.methodName], log[route.methodName], logConfig[route.methodName]));
+                        await index_1.__(this.genericMethodWrapper(params, req, next, res, route.methodName, methodDbSettings, readOnlyMethod, permission[route.methodName], log[route.methodName], logConfig[route.methodName]));
                     }
                     catch (ex) {
                         const now = new Date();

package/dist/lib/pxp/Decorators.js

@@ -21,10 +21,10 @@ const setProperty = (target, propertyKey) => (value, name, overwrite = true) =>
         Reflect.defineMetadata(name, {}, target.constructor);
     }
     const valueName = Reflect.getMetadata(name, target.constructor);
-    if (overwrite && valueName[propertyKey]) {
+    if (!overwrite && !valueName[propertyKey]) {
         valueName[propertyKey] = value;
     }
-    else if (!valueName[propertyKey]) {
+    else if (overwrite) {
         valueName[propertyKey] = value;
     }
     Reflect.defineMetadata(name, valueName, target.constructor);
@@ -34,13 +34,24 @@ const createOptions = (options = {
     dbSettings: 'Orm',
     authentication: true,
 }) => (target, propertyKey) => {
-    const newProperty = setProperty(target, propertyKey);
-    // ReadOnly
-    newProperty(options.readOnly, 'readonly', false);
-    // DbSettings
-    newProperty(options.dbSettings, 'dbsettings', false);
-    // Authentication
-    newProperty(options.authentication, 'authentication', false);
+    options = Object.assign({
+        readOnly: true,
+        dbSettings: 'Orm',
+        authentication: true,
+    }, options);
+    // const newProperty = setProperty(target, propertyKey);
+    // // ReadOnly
+    // newProperty(options.readOnly, 'readonly', false);
+    // // DbSettings
+    // newProperty(options.dbSettings, 'dbsettings', false);
+    // // Authentication
+    // newProperty(options.authentication, 'authentication', false);
+    if (!Reflect.hasMetadata('optionsRoute', target.constructor)) {
+        Reflect.defineMetadata('optionsRoute', {}, target.constructor);
+    }
+    const optionsRoute = Reflect.getMetadata('optionsRoute', target.constructor);
+    optionsRoute[propertyKey] = options;
+    Reflect.defineMetadata('optionsRoute', optionsRoute, target.constructor);
 };
 const setRoute = (path = '', method, options) => (target, propertyKey) => {
     if (!Reflect.hasMetadata('routes', target.constructor)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pxp-nd/core",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Contains main files for pxp-nd",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",