Use dynamic factory and fix deferred turn off

matthewturner · Dec 13, 2019 · a55f281 · a55f281
1 parent 57b966c
commit a55f281
Show file tree

Hide file tree

Showing 7 changed files with 715 additions and 627 deletions.
diff --git a/aws/AlexaResponseBuilder.js b/aws/AlexaResponseBuilder.js
@@ -29,7 +29,7 @@ class AlexaResponseBuilder {
             correlationToken: correlationToken
         };
 
-        if (event.directive.endpoint) {
+        if (event.directive.endpoint && event.directive.endpoint.scope) {
             this._options.endpointId = event.directive.endpoint.endpointId;
             this._options.token = event.directive.endpoint.scope.token;
         }
@@ -81,7 +81,7 @@ class AlexaResponseBuilder {
             return this.errorResponseFrom(this._error);
         }
 
-        let response = new AlexaResponse(this._options);
+        const response = new AlexaResponse(this._options);
 
         this.addThermostatDetailsIfRequired(response,
             this._thermostatDetails);
@@ -96,6 +96,10 @@ class AlexaResponseBuilder {
 
         this.addModePropertyIfRequired(response, this._mode);
 
+        if (this._event.directive.endpoint && this._event.directive.endpoint.userId) {
+            response.event.endpoint = { userId: this._event.directive.endpoint.userId };
+        }
+
         this._logger.debug('Response details:');
         this._logger.debug(JSON.stringify(response));
 

diff --git a/aws/handlers/Handler.js b/aws/handlers/Handler.js
@@ -9,7 +9,7 @@ const {
     MockProfileGateway
 } = require('smartheat-aws/aws/ProfileGateway');
 const helpers = require('smartheat-aws/aws/helpers');
-const Factory = require('smartheat-clients/clients/Factory');
+const Factory = require('smartheat-core/core/Factory');
 const AlexaResponseBuilder = require('../AlexaResponseBuilder');
 
 class Handler {