@serverless/platform-client - npm Package Compare versions

Comparing version 0.13.0 to 0.14.0

lib/Connection.js

@@ -125,30 +125,24 @@ /**
     }
-    event.orgUid = event.orgUid || this.sdk.context.orgUid
-    event.orgName = event.orgName || this.sdk.context.orgName
-    if (!event.orgName && !event.orgUid) {
-      throw new Error(`event must have an "orgName" or "orgUid"`)
+    if (!event.event || typeof event.event !== 'string') {
+      throw new Error(`The "event" property containing the event type is required and must be a string`)
     }
 
     // Convert to a safe Serverless Platform Event
-    // TODO: More validation is needed
     const safeEvent = {}
     safeEvent.accessKey = this.sdk.accessKey
     safeEvent.event = event.event.trim()
-    if (event.orgName) safeEvent.orgName = event.orgName.trim()
-    if (event.orgUid) safeEvent.orgUid = event.orgUid.trim()
-    if (event.stageName) safeEvent.stageName = event.stageName.trim()
-    if (event.appName) safeEvent.appName = event.appName.trim()
-    if (event.instanceName) safeEvent.instanceName = event.instanceName.trim()
+    safeEvent.orgUid = event.orgUid || this.sdk.context.orgUid
+    safeEvent.orgName = event.orgName || this.sdk.context.orgName
+    safeEvent.stageName = this.sdk.context.stageName
+    safeEvent.appName = this.sdk.context.appName
+    safeEvent.instanceName = this.sdk.context.instanceName
+    safeEvent.componentName = this.sdk.context.componentName
+    safeEvent.componentVersion = this.sdk.context.componentVersion
+    safeEvent.data = event.data || {}
 
-    // Auto add to event body if set in context, but don't override above values
-    if (this.sdk.context.orgUid) safeEvent.orgUid = event.orgUid || this.sdk.context.orgUid
-    if (this.sdk.context.orgName) safeEvent.orgName = event.orgName || this.sdk.context.orgName
-    if (this.sdk.context.stageName) safeEvent.stageName = this.sdk.context.stageName
-    if (this.sdk.context.appName) safeEvent.appName = this.sdk.context.appName
-    if (this.sdk.context.instanceName) safeEvent.instanceName = this.sdk.context.instanceName
-    if (this.sdk.context.componentName) safeEvent.componentName = this.sdk.context.componentName
-    if (this.sdk.context.componentVersion) safeEvent.componentVersion = this.sdk.context.componentVersion
+    // Validate
+    if (!safeEvent.orgName && !safeEvent.orgUid) {
+      throw new Error(`event must have an "orgName" or "orgUid"`)
+    }
 
-    safeEvent.data = event.data || {}
-
     this.connection.send(JSON.stringify(safeEvent))
@@ -174,7 +168,2 @@ }
     }
-    event.orgUid = event.orgUid || sdk.context.orgUid
-    event.orgName = event.orgName || sdk.context.orgName
-    if (!event.orgName && !event.orgUid) {
-      throw new Error(`event must have an "orgName" or "orgUid"`)
-    }
 
@@ -185,16 +174,15 @@ // Convert to a safe Serverless Platform Event
     safeEvent.event = event.event.trim()
-    if (event.orgName) safeEvent.orgName = event.orgName.trim()
-    if (event.orgUid) safeEvent.orgUid = event.orgUid.trim()
-    if (event.stageName) safeEvent.stageName = event.stageName.trim()
-    if (event.appName) safeEvent.appName = event.appName.trim()
-    if (event.instanceName) safeEvent.instanceName = event.instanceName.trim()
+    safeEvent.orgUid = event.orgUid || sdk.context.orgUid
+    safeEvent.orgName = event.orgName || sdk.context.orgName
+    safeEvent.stageName = sdk.context.stageName
+    safeEvent.appName = sdk.context.appName
+    safeEvent.instanceName = sdk.context.instanceName
+    safeEvent.componentName = sdk.context.componentName
+    safeEvent.componentVersion = sdk.context.componentVersion
+    safeEvent.data = event.data || {}
 
-    // Auto add to event body if set in context, but don't override above values
-    if (sdk.context.orgUid) safeEvent.orgUid = event.orgUid || sdk.context.orgUid
-    if (sdk.context.orgName) safeEvent.orgName = event.orgName || sdk.context.orgName
-    if (sdk.context.stageName) safeEvent.stageName = sdk.context.stageName
-    if (sdk.context.appName) safeEvent.appName = sdk.context.appName
-    if (sdk.context.instanceName) safeEvent.instanceName = sdk.context.instanceName
-    if (sdk.context.componentName) safeEvent.componentName = sdk.context.componentName
-    if (sdk.context.componentVersion) safeEvent.componentVersion = sdk.context.componentVersion
+    // Validate
+    if (!safeEvent.orgName && !safeEvent.orgUid) {
+      throw new Error(`event must have an "orgName" or "orgUid"`)
+    }
   
@@ -201,0 +189,0 @@ // Send request

package.json

 {
   "name": "@serverless/platform-client",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "",
@@ -5,0 +5,0 @@ "main": "./lib/index.js",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

57262

decreased by-2.19%

Lines of code

1174

decreased by-0.93%

No dependency changes