Replaced old setup with email

Tutorialwork · Tutorialwork · commit 0715a0096e81 · 2022-11-03T21:54:38.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -18,6 +18,7 @@
     "cors": "^2.8.5",
     "express": "^4.18.1",
     "mysql2": "^2.3.3",
+    "node-mailjet": "^5.1.1",
     "typeorm": "^0.3.10"
   },
   "devDependencies": {
diff --git a/src/helper/SetupHelper.ts b/src/helper/SetupHelper.ts
@@ -1,12 +1,25 @@
 import { Response } from 'ask-sdk-model';
 import { getLocale, HandlerInput } from 'ask-sdk-core';
 
-export function getSetupMessage(input: HandlerInput, code: number | null | undefined): Response {
+export function getSetupMessage(input: HandlerInput): Response {
     const messages: any = require(`../languages/${getLocale(input.requestEnvelope)}.json`);
 
     return input
         .responseBuilder
-        .speak(messages['setup']['setup_speak'])
-        .withSimpleCard(messages['setup']['card']['title'], messages['setup']['card']['message'].replace('%code%', code))
+        .speak(messages['setup']['email_setup_speak'])
+        .addDirective({
+            'type': 'Connections.StartConnection',
+            'uri': 'connection://AMAZON.AskForPermissionsConsent/2',
+            'input': {
+                '@type': 'AskForPermissionsConsentRequest',
+                '@version': '2',
+                'permissionScopes': [
+                    {
+                        'permissionScope': 'alexa::profile:email:read',
+                        'consentLevel': 'ACCOUNT'
+                    }
+                ]
+            }
+        })
         .getResponse();
 }
diff --git a/src/intents/ChannelStatsIntentHandler.ts b/src/intents/ChannelStatsIntentHandler.ts
@@ -18,7 +18,7 @@ export const ChannelStatsIntentHandler: RequestHandler = {
             }
         });
         if (!user?.channelId) {
-            return getSetupMessage(input, user?.code);
+            return getSetupMessage(input);
         }
 
         try {
diff --git a/src/intents/LastCommentIntentHandler.ts b/src/intents/LastCommentIntentHandler.ts
@@ -19,7 +19,7 @@ export const LastCommentIntentHandler: RequestHandler = {
         const messages: any = require(`../languages/${getLocale(input.requestEnvelope)}.json`);
 
         if (!user?.channelId) {
-            return getSetupMessage(input, user?.code);
+            return getSetupMessage(input);
         }
 
         try {
diff --git a/src/intents/LastVideoIntentHandler.ts b/src/intents/LastVideoIntentHandler.ts
@@ -21,7 +21,7 @@ export const LastVideoIntentHandler: RequestHandler = {
         const messages: any = require(`../languages/${getLocale(input.requestEnvelope)}.json`);
 
         if (!user?.channelId) {
-            return getSetupMessage(input, user?.code);
+            return getSetupMessage(input);
         }
 
         try {
diff --git a/src/intents/LaunchRequestHandler.ts b/src/intents/LaunchRequestHandler.ts
@@ -18,7 +18,7 @@ export const LaunchRequestHandler: RequestHandler = {
             }
         });
         if (!user?.channelId) {
-            return getSetupMessage(input, user?.code);
+            return getSetupMessage(input);
         }
 
         try {
diff --git a/src/intents/SessionResumedRequestHandler.ts b/src/intents/SessionResumedRequestHandler.ts
@@ -0,0 +1,66 @@
+import { getApiAccessToken, getLocale, getRequestType, getUserId, HandlerInput, RequestHandler } from 'ask-sdk-core';
+import { Response, SessionResumedRequest } from 'ask-sdk-model';
+import { User } from '../entities/User';
+import { appDataSource } from '../helper/DatabaseHelper';
+import axios, { AxiosResponse } from 'axios';
+const Mailjet = require('node-mailjet');
+
+export const SessionResumedRequestHandler: RequestHandler = {
+    canHandle(input: HandlerInput): Promise<boolean> | boolean {
+        return getRequestType(input.requestEnvelope) === 'SessionResumedRequest';
+    },
+    async handle(input: HandlerInput): Promise<Response> {
+        const event: SessionResumedRequest = input.requestEnvelope.request as SessionResumedRequest;
+        const permissionState: string = event.cause?.result.status;
+        const messages: any = require(`../languages/${getLocale(input.requestEnvelope)}.json`);
+        const user: User | null = await appDataSource.getRepository(User).findOne({
+            where: {
+                id: getUserId(input.requestEnvelope)
+            }
+        });
+
+        if (permissionState === 'DENIED') {
+            input
+                .responseBuilder
+                .withSimpleCard(messages['setup']['card']['title'], messages['setup']['card']['message'].replace('%code%', user?.code));
+        }
+
+        if (permissionState === 'ACCEPTED') {
+            const mailjet = new Mailjet({
+                apiKey: process.env.MJ_APIKEY_PUBLIC,
+                apiSecret: process.env.MJ_APIKEY_PRIVATE
+            });
+
+            try {
+                const emailResponse: AxiosResponse = await axios.get(
+                    `${input.requestEnvelope.context.System.apiEndpoint}/v2/accounts/~current/settings/Profile.email`,
+                    {
+                        headers: {
+                            Authorization: `Bearer ${getApiAccessToken(input.requestEnvelope)}`
+                        }
+                    }
+                );
+
+                await mailjet
+                    .post('send')
+                    .request({
+                        FromEmail: 'no-reply@pricenotify.app',
+                        FromName: 'PriceNotify',
+                        Subject: 'My channel',
+                        'Text-Part': `https://skills.manuelschuler.dev/select-channel/${user?.code}`,
+                        'HTML-Part': `https://skills.manuelschuler.dev/select-channel/${user?.code}`,
+                        Recipients: [
+                            {
+                                Email: emailResponse.data
+                            },
+                        ],
+                    });
+            } catch (error: any) {}
+        }
+
+        return input
+            .responseBuilder
+            .speak(messages['setup']['email_permissions_status'][permissionState])
+            .getResponse();
+    }
+}
diff --git a/src/intents/SubscriberIntentHandler.ts b/src/intents/SubscriberIntentHandler.ts
@@ -19,7 +19,7 @@ export const SubscriberIntentHandler: RequestHandler = {
         const messages: any = require(`../languages/${getLocale(input.requestEnvelope)}.json`);
 
         if (!user?.channelId) {
-            return getSetupMessage(input, user?.code);
+            return getSetupMessage(input);
         }
 
         try {
diff --git a/src/languages/de-DE.json b/src/languages/de-DE.json
@@ -4,6 +4,12 @@
     "card": {
       "title": "Skilleinrichtung benötigt",
       "message": "Öffne https://skills.manuelschuler.dev und gebe deinen Code %code% ein"
+    },
+    "email_setup_speak": "Um den Skill einzurichten sende ich dir eine Email mit dem Link.",
+    "email_permissions_status": {
+      "ACCEPTED": "Ich habe dir eine Email gesendet. Folge dem Link um den Skill einzurichten.",
+      "DENIED": "Der Skill muss noch über eine Webseite eingerichtet werden, öffne dazu die Alexa App und dann unter dem Reiter Mehr die Aktivitäten und folge den Anweisungen.",
+      "REDIRECT_TO_APP": "Bitte gehe in die Alexa App um die Berechtigung zu erteilen."
     }
   },
   "last_video": {
diff --git a/src/languages/en-US.json b/src/languages/en-US.json
@@ -4,6 +4,12 @@
     "card": {
       "title": "Skill setup needed",
       "message": "Open https://skills.manuelschuler.dev and enter the following Code: %code%"
+    },
+    "email_setup_speak": "To setup the skill I will send you an email.",
+    "email_permissions_status": {
+      "ACCEPTED": "I've send you an email. Click on the link to setup the skill.",
+      "DENIED": "The skill still needs to be set up via a web page, to do this open the Alexa app and then under the More tab open the activities and follow the instructions.",
+      "REDIRECT_TO_APP": "Please open your Alexa app to grant the permissions to your email address."
     }
   },
   "last_video": {
diff --git a/src/skill.ts b/src/skill.ts
@@ -16,6 +16,7 @@ import { LastCommentIntentHandler } from './intents/LastCommentIntentHandler';
 import { SessionEndedRequestHandler } from './intents/SessionEndedRequestHandler';
 import { StopIntentHandler } from './intents/StopIntentHandler';
 import { HelpIntentHandler } from './intents/HelpIntentHandler';
+import { SessionResumedRequestHandler } from './intents/SessionResumedRequestHandler';
 
 const skill: CustomSkill = SkillBuilders
     .custom()
@@ -32,7 +33,8 @@ const skill: CustomSkill = SkillBuilders
         UserCreation
     )
     .addErrorHandlers(
-        SessionEndedRequestHandler
+        SessionEndedRequestHandler,
+        SessionResumedRequestHandler
     )
     .create();
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ export const ChannelStatsIntentHandler: RequestHandler = {`
`18`	`18`	`}`
`19`	`19`	`});`
`20`	`20`	`if (!user?.channelId) {`
`21`		`- return getSetupMessage(input, user?.code);`
	`21`	`+ return getSetupMessage(input);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ export const LastCommentIntentHandler: RequestHandler = {`
`19`	`19`	const messages: any = require(`../languages/${getLocale(input.requestEnvelope)}.json`);
`20`	`20`
`21`	`21`	`if (!user?.channelId) {`
`22`		`- return getSetupMessage(input, user?.code);`
	`22`	`+ return getSetupMessage(input);`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ export const LastVideoIntentHandler: RequestHandler = {`
`21`	`21`	const messages: any = require(`../languages/${getLocale(input.requestEnvelope)}.json`);
`22`	`22`
`23`	`23`	`if (!user?.channelId) {`
`24`		`- return getSetupMessage(input, user?.code);`
	`24`	`+ return getSetupMessage(input);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ export const LaunchRequestHandler: RequestHandler = {`
`18`	`18`	`}`
`19`	`19`	`});`
`20`	`20`	`if (!user?.channelId) {`
`21`		`- return getSetupMessage(input, user?.code);`
	`21`	`+ return getSetupMessage(input);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ export const SubscriberIntentHandler: RequestHandler = {`
`19`	`19`	const messages: any = require(`../languages/${getLocale(input.requestEnvelope)}.json`);
`20`	`20`
`21`	`21`	`if (!user?.channelId) {`
`22`		`- return getSetupMessage(input, user?.code);`
	`22`	`+ return getSetupMessage(input);`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`try {`