@modular-rest/server 1.13.0 → 1.13.2

package/dist/class/collection_definition.d.ts

@@ -23,7 +23,7 @@ interface CollectionDefinitionOptions {
      * @type {Schema}
      * @see https://mongoosejs.com/docs/5.x/docs/guide.html
      */
-    schema: Schema;
+    schema: Schema<any>;
 }
 /**
  * To have define any collection in your database you haveto use below method in your `db.[js|ts]` file and export an array of CollectionDefinition instances.
@@ -94,7 +94,7 @@ export declare class CollectionDefinition {
     /** @readonly The name of the collection */
     collection: string;
     /** @readonly Mongoose schema definition */
-    schema: Schema;
+    schema: Schema<any>;
     /** @readonly List of permissions for the collection */
     permissions: Permission[];
     /** @readonly Optional database triggers */

package/dist/services/data_provider/service.js

@@ -178,11 +178,11 @@ function _getPermissionList(db, collection, operationType) {
 function checkAccess(db, collection, operationType, queryOrDoc, user) {
     const permissionList = _getPermissionList(db, collection, operationType);
     return permissionList.some(permission => {
-        if (permission.type === 'god_access')
+        if (permission.accessType === 'god_access')
             return true;
-        if (permission.type === 'anonymous_access' && user.type === 'anonymous')
+        if (permission.accessType === 'anonymous_access' && user.type === 'anonymous')
             return true;
-        if (permission.type === 'user_access' && user.type === 'user')
+        if (permission.accessType === 'user_access' && user.type === 'user')
             return true;
         return false;
     });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@modular-rest/server",
-	"version": "1.13.0",
+	"version": "1.13.2",
 	"description": "TypeScript version of a nodejs module based on KOAJS for developing Rest-APIs in a modular solution.",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",

package/src/class/collection_definition.ts

@@ -25,7 +25,7 @@ interface CollectionDefinitionOptions {
    * @type {Schema}
    * @see https://mongoosejs.com/docs/5.x/docs/guide.html
    */
-  schema: Schema;
+  schema: Schema<any>;
 }
 
 /**
@@ -102,7 +102,7 @@ export class CollectionDefinition {
   collection: string;
 
   /** @readonly Mongoose schema definition */
-  schema: Schema;
+  schema: Schema<any>;
 
   /** @readonly List of permissions for the collection */
   permissions: Permission[];

package/src/services/data_provider/service.ts

@@ -1,5 +1,5 @@
 import mongoose, { Connection, Model, PopulateOptions, Query } from 'mongoose';
-import { AccessTypes, AccessDefinition } from '../../class/security';
+import { AccessTypes, AccessDefinition, Permission } from '../../class/security';
 import triggerOperator from '../../class/trigger_operator';
 import TypeCasters from './typeCasters';
 import { config } from '../../config';
@@ -191,7 +191,7 @@ export function getCollection<T>(db: string, collection: string): Model<T> {
  * @returns {any[]} List of permissions
  * @private
  */
-function _getPermissionList(db: string, collection: string, operationType: string): any[] {
+function _getPermissionList(db: string, collection: string, operationType: string): Permission[] {
   if (!permissionDefinitions[db] || !permissionDefinitions[db][collection]) {
     return [];
   }
@@ -224,9 +224,9 @@ export function checkAccess(
 ): boolean {
   const permissionList = _getPermissionList(db, collection, operationType);
   return permissionList.some(permission => {
-    if (permission.type === 'god_access') return true;
-    if (permission.type === 'anonymous_access' && user.type === 'anonymous') return true;
-    if (permission.type === 'user_access' && user.type === 'user') return true;
+    if (permission.accessType === 'god_access') return true;
+    if (permission.accessType === 'anonymous_access' && user.type === 'anonymous') return true;
+    if (permission.accessType === 'user_access' && user.type === 'user') return true;
     return false;
   });
 }