@kravc/dos 1.8.10 → 1.9.1

package/package.json

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

package/src/Document.js

@@ -81,10 +81,10 @@ class Document extends Component {
     const { validator } = context
     mutation = validator.normalize(mutation, this.id)
 
-    const accountId = get(context, 'identity.accountId')
+    const identitySubjectId = get(context, 'identity.sub')
 
-    if (accountId) {
-      mutation.createdBy = accountId
+    if (identitySubjectId) {
+      mutation.createdBy = identitySubjectId
     }
 
     const timestamp = new Date().toJSON()
@@ -159,10 +159,10 @@ class Document extends Component {
   static async update(context, query, mutation, originalDocument = null) {
     mutation = omit(mutation, [ this.idKey, 'createdAt', 'createdBy' ])
 
-    const accountId = get(context, 'identity.accountId')
+    const identitySubjectId = get(context, 'identity.sub')
 
-    if (accountId) {
-      mutation.updatedBy = accountId
+    if (identitySubjectId) {
+      mutation.updatedBy = identitySubjectId
     }
 
     const timestamp = new Date().toJSON()

package/src/Document.spec.js

@@ -22,7 +22,7 @@ Profile.schema = loadSync('examples/Profile.yaml')
 
 describe('Document', () => {
   const validator = new Validator([ Profile.schema ])
-  const identity  = { accountId: 'ACCOUNT_ID' }
+  const identity  = { sub: 'USER_ID' }
   const getContext = () => ({ validator, identity })
 
   let id

package/src/Operation.spec.js

@@ -19,7 +19,7 @@ class Profile extends Document {}
 Profile.schema = loadSync('examples/Profile.yaml')
 
 const validator = new Validator([ Profile.schema ])
-const identity  = { accountId: 'ACCOUNT_ID' }
+const identity  = { sub: 'USER_ID' }
 const DEFAULT_CONTEXT = { validator, identity }
 
 describe('Operation', () => {

package/src/Service.js

@@ -92,8 +92,8 @@ class Service {
     return get(this._spec.paths, `${httpPath}.${httpMethod}.operationId`, 'NONE')
   }
 
-  handler(request) {
-    return handler(this)(request)
+  handler(request, logger) {
+    return handler(this)(request, logger)
   }
 
   async process(context) {

package/src/helpers/createContext.js

@@ -4,7 +4,7 @@ const { get, isString } = require('lodash')
 const { parse }    = require('url')
 const { v4: uuid } = require('uuid')
 
-const createContext = (service, request) => {
+const createContext = (service, request, logger = console) => {
   let httpPath
   let httpMethod
 
@@ -33,6 +33,7 @@ const createContext = (service, request) => {
     baseUrl:   service.baseUrl,
     validator: service.validator,
     requestReceivedAt: new Date().toISOString(),
+    logger,
     httpPath,
     requestId,
     httpMethod,

package/src/helpers/getOrFail.js

@@ -0,0 +1,24 @@
+'use strict'
+
+const lodash = require('lodash')
+
+/**
+ * Returns value by path from the object, throws exception if value not defined.
+ * @param {object} object - The object to pull value by path
+ * @param {string} path - The path of the value within object
+ * @returns {any} A value
+ */
+const getOrFail = (object, path) => {
+  const value = lodash.get(object, path)
+  const isUndefined = value === undefined
+
+  /* istanbul ignore else: we should not get here in tests */
+  if (!isUndefined) {
+    return value
+  }
+
+  /* istanbul ignore next: should never be reached at runtime */
+  throw Error(`Value is undefined for "${path}"`)
+}
+
+module.exports = getOrFail

package/src/helpers/getOrFail.spec.js

@@ -0,0 +1,17 @@
+'use strict'
+
+const getOrFail = require('./getOrFail')
+const { expect } = require('chai')
+
+describe('getOrFail(object, path)', () => {
+  it('returns requested value', () => {
+    const value = getOrFail({ target: 1 }, 'target')
+    expect(value).to.exist
+  })
+
+  it('throw error if value is undefined', () => {
+    expect(
+      () => getOrFail({}, 'target')
+    ).to.throw('Value is undefined for "target"')
+  })
+})

package/src/helpers/handler.js

@@ -5,8 +5,8 @@ const createContext  = require('./createContext')
 const specMiddleware = require('./specMiddleware')
 
 const handler = (service, _createContext = createContext, _middleware = specMiddleware) => {
-  return request => {
-    const context = _createContext(service, request)
+  return (request, logger) => {
+    const context = _createContext(service, request, logger)
 
     const result = _middleware(service, context)
 

package/src/helpers/logRequest.js

@@ -10,6 +10,7 @@ const logRequest = context => {
   const {
     operationId,
     query,
+    logger,
     mutation,
     requestId,
     headers,
@@ -29,7 +30,7 @@ const logRequest = context => {
     metadata.mutation = mutation
   }
 
-  console.log(operationId, metadata)
+  logger.info(operationId, metadata)
 }
 
 module.exports = logRequest

package/src/index.js

@@ -14,6 +14,7 @@ module.exports = {
   test:                require('./test'),
   handler:             require('./helpers/handler'),
   security:            require('./security'),
+  getOrFail:           require('./helpers/getOrFail'),
   JwtAuthorization:    require('./security/JwtAuthorization'),
   SystemAuthorization: require('./security/SystemAuthorization')
 }

package/src/security/SystemAuthorization.js

@@ -44,7 +44,7 @@ class SystemAuthorization {
       return { isAuthorized: false, error }
     }
 
-    return { isAuthorized: true, accountId: 'SYSTEM' }
+    return { isAuthorized: true, isSystem: true }
   }
 }
 

package/src/test/createAccessToken.js

@@ -5,14 +5,13 @@ const { privateKey: PRIVATE_KEY } = require('./keys')
 
 const createAccessToken = (options, attributes) => {
   const {
-    algorithm  = 'RS256',
+    algorithm = 'RS256',
     privateKey = PRIVATE_KEY,
     ...jwtOptions
   } = options
 
   const payload = {
-    sub:       'SESSION_ID',
-    accountId: 'ACCOUNT_ID',
+    sub: 'USER_ID',
     ...attributes
   }