Merge pull request #1307 from jovotech/v4/dev

🔖 Prepare latest release
jovotech · Apr 27, 2022 · 3d2565e · 3d2565e
2 parents 77d4d0a + b7bc2c5
commit 3d2565e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
@@ -1,7 +1,7 @@
 
 name: jovo-framework workflow
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   build:

diff --git a/framework/src/plugins/DbPlugin.ts b/framework/src/plugins/DbPlugin.ts
@@ -90,7 +90,7 @@ export abstract class DbPlugin<
       }
       return this.loadData(jovo.$user.id, jovo);
     });
-    parent.middlewareCollection.use('response.start', (jovo) => {
+    parent.middlewareCollection.use('response.end', (jovo) => {
       if (!jovo.$user.id) {
         return;
       }

diff --git a/framework/src/testsuite/TestSuite.ts b/framework/src/testsuite/TestSuite.ts
@@ -1,10 +1,5 @@
 import { Constructor, Input, InputType, JovoError, OmitWhere } from '@jovotech/common';
-import {
-  JovoResponse,
-  OutputTemplate,
-  OutputTemplateConverterStrategyConfig,
-  SingleResponseOutputTemplateConverterStrategy,
-} from '@jovotech/output';
+import { OutputTemplate } from '@jovotech/output';
 import { existsSync } from 'fs';
 import _cloneDeep from 'lodash.clonedeep';
 import _merge from 'lodash.merge';

diff --git a/platforms/platform-alexa/src/cli/hooks/BuildHook.ts b/platforms/platform-alexa/src/cli/hooks/BuildHook.ts
@@ -395,6 +395,16 @@ export class BuildHook extends AlexaHook<BuildPlatformEvents> {
       });
     }
 
+    // replace ${JOVO_WEBHOOK_URL} in event uri with the Jovo Webhook url
+    const eventEndpointUriPath = 'skill-package/["skill.json"].manifest.events.endpoint.uri';
+    if (_has(projectFiles, eventEndpointUriPath)) {
+      _set(
+        projectFiles,
+        eventEndpointUriPath,
+        this.$cli.resolveEndpoint(_get(projectFiles, eventEndpointUriPath).toString()),
+      );
+    }
+
     // Create entries for Alexa Conversations
     const conversationsPath = 'skill-package/["skill.json"].manifest.apis.custom.dialogManagement';
     if (this.$context.alexa.isACSkill && !_has(projectFiles, conversationsPath)) {

diff --git a/platforms/platform-core/src/CoreRequest.ts b/platforms/platform-core/src/CoreRequest.ts
@@ -1,11 +1,4 @@
-import {
-  Input,
-  InputTypeLike,
-  JovoInput,
-  JovoInputBuilder,
-  JovoRequest,
-  UnknownObject,
-} from '@jovotech/framework';
+import { Input, InputTypeLike, JovoInput, JovoRequest, UnknownObject } from '@jovotech/framework';
 
 import { CoreCapabilityType } from './CoreDevice';
 import { CoreRequestContext } from './interfaces';