@kravc/dos 1.11.11 → 1.11.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kravc/dos",
-  "version": "1.11.11",
+  "version": "1.11.13",
   "description": "Convention-based, easy-to-use library for building API-driven serverless services.",
   "keywords": [
     "Service",

package/src/Service.spec.js

@@ -12,10 +12,11 @@ const IndexProfiles = require('examples/IndexProfiles')
 
 const test = require('src/test')
 const {
-  errors,
   Create,
   Service,
   Component,
+  InvalidParametersError,
+  UnprocessibleConditionError,
 } = require('src')
 
 const testSchema = new Schema({
@@ -145,7 +146,7 @@ describe('Service', () => {
     it('returns "InvalidParametersError / 400" if invalid parameters', async () => {
       class InvalidIndexProfiles extends IndexProfiles {
         action() {
-          throw new errors.InvalidParametersError()
+          throw new InvalidParametersError()
         }
       }
 
@@ -166,7 +167,7 @@ describe('Service', () => {
     it('returns "UnprocessibleConditionError / 422" if unprocessible condition', async () => {
       class InvalidIndexProfiles extends IndexProfiles {
         action() {
-          throw new errors.UnprocessibleConditionError()
+          throw new UnprocessibleConditionError()
         }
       }
 

package/src/index.d.ts

@@ -166,13 +166,14 @@ export declare class JwtAuthorization {
     cookieName?: string;
     normalizePayload?: Function;
     tokenVerificationMethod?: Function;
-    accessVerificationMethod?: Function;
+    accessVerificationMethod?: (context: Context, payload: Record<string, unknown>) => [boolean, string?];
   }): Record<string, any>
 };
 
 export declare class SystemAuthorization {
   static createRequirement(options?: {
     name?: string;
+    accessVerificationMethod?: (context: Context) => [boolean, string?];
   }): Record<string, any>
 };
 
@@ -282,3 +283,33 @@ export declare function execute(service: Service, extraContext?: Record<string,
       errorName: string
     ) => Promise<OperationError>;
   }
+
+export declare class CommonError extends Error {
+  constructor(code: string, message: string);
+  get code(): string;
+  get isCommonError(): boolean;
+};
+
+export declare class UnauthorizedError extends CommonError {
+  constructor(message: string);
+};
+
+export declare class AccessDeniedError extends CommonError {
+  constructor(message: string);
+};
+
+export declare class InvalidParametersError extends CommonError {
+  constructor(message: string)
+};
+
+export declare class UnprocessibleConditionError extends CommonError {
+  constructor(message: string)
+};
+
+export declare class DocumentExistsError extends CommonError {
+  constructor(Document: { name: string }, parameters: Record<string, unknown>);
+};
+
+export declare class DocumentNotFoundError extends CommonError {
+  constructor(Document: { name: string }, parameters: Record<string, unknown>);
+};

package/src/index.js

@@ -3,22 +3,28 @@
 const { wait, execute, createAccessToken } = require('./test')
 
 module.exports = {
-  Document:            require('./Document'),
-  Operation:           require('./Operation'),
-  Service:             require('./Service'),
-  Read:                require('./operations/Read'),
-  Index:               require('./operations/Index'),
-  Create:              require('./operations/Create'),
-  Update:              require('./operations/Update'),
-  Delete:              require('./operations/Delete'),
-  Component:           require('./Component'),
-  errors:              require('./errors'),
-  handler:             require('./helpers/handler'),
-  security:            require('./security'),
-  getOrFail:           require('./helpers/getOrFail'),
-  verifyToken:         require('./security/verifyToken'),
-  JwtAuthorization:    require('./security/JwtAuthorization'),
-  SystemAuthorization: require('./security/SystemAuthorization'),
+  Document:                    require('./Document'),
+  Operation:                   require('./Operation'),
+  Service:                     require('./Service'),
+  Read:                        require('./operations/Read'),
+  Index:                       require('./operations/Index'),
+  Create:                      require('./operations/Create'),
+  Update:                      require('./operations/Update'),
+  Delete:                      require('./operations/Delete'),
+  Component:                   require('./Component'),
+  handler:                     require('./helpers/handler'),
+  getOrFail:                   require('./helpers/getOrFail'),
+  security:                    require('./security'),
+  verifyToken:                 require('./security/verifyToken'),
+  JwtAuthorization:            require('./security/JwtAuthorization'),
+  SystemAuthorization:         require('./security/SystemAuthorization'),
+  CommonError:                 require('./errors/CommonError'),
+  UnauthorizedError:           require('./errors/UnauthorizedError'),
+  AccessDeniedError:           require('./errors/AccessDeniedError'),
+  DocumentExistsError:         require('./errors/DocumentExistsError'),
+  DocumentNotFoundError:       require('./errors/DocumentNotFoundError'),
+  InvalidParametersError:      require('./errors/InvalidParametersError'),
+  UnprocessibleConditionError: require('./errors/UnprocessibleConditionError'),
   wait,
   execute,
   createAccessToken,

package/src/security/SystemAuthorization.js

@@ -3,10 +3,24 @@
 const { get } = require('lodash')
 const AccessDeniedError = require('../errors/AccessDeniedError')
 
+const SYSTEM_NAME = 'System'
+
+const verifySystemAccess = (context) => {
+  const { headers } = context
+  const isExternalRequest = Object.keys(headers).length > 0
+
+  if (!isExternalRequest) {
+    return [ true ]
+  }
+
+  return [ false ]
+}
+
 class SystemAuthorization {
   static createRequirement(options = {}) {
     const name = get(options, 'name', 'authorization')
-    const requirementName = 'System'
+
+    const requirementName = SYSTEM_NAME
 
     return {
       [requirementName]: {
@@ -20,7 +34,8 @@ class SystemAuthorization {
           type: 'apiKey',
           name
         },
-        klass: this
+        klass: this,
+        ...options
       }
     }
   }
@@ -35,12 +50,17 @@ class SystemAuthorization {
     }
   }
 
+  constructor({
+    accessVerificationMethod = verifySystemAccess,
+  }) {
+    this._verifyAccess = accessVerificationMethod
+  }
+
   async verify(context) {
-    const { headers } = context
-    const isExternalRequest = Object.keys(headers).length > 0
+    const [ isAccessOk, accessErrorMessage ] = await this._verifyAccess(context)
 
-    if (isExternalRequest) {
-      const error = new AccessDeniedError()
+    if (!isAccessOk) {
+      const error = new AccessDeniedError(accessErrorMessage)
       return { isAuthorized: false, error }
     }