Update examples

terrorizer1980 · Mar 25, 2019 · 8d14167 · 8d14167
1 parent 8d92d8c
commit 8d14167
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 900 deletions.
diff --git a/examples/.nvmrc b/examples/.nvmrc
diff --git a/examples/README.md b/examples/README.md
diff --git a/examples/basic-incoming-webhook.js b/examples/basic-incoming-webhook.js
diff --git a/examples/basic-rtm-client.js b/examples/basic-rtm-client.js
diff --git a/examples/basic-web-client.js b/examples/basic-web-client.js
diff --git a/examples/express-all-interactions/package.json b/examples/express-all-interactions/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "express-all-interactions",
+  "name": "@slack/express-all-interactions",
   "private": true,
   "version": "1.0.0",
   "description": "An example of using Slack Interactive Messages for Node",
@@ -11,7 +11,7 @@
   "author": "Ankur Oberoi <aoberoi@gmail.com>",
   "license": "MIT",
   "dependencies": {
-    "@slack/client": "^4.1.0",
+    "@slack/web-api": "^5.0.0",
     "@slack/interactive-messages": "*",
     "axios": "^0.18.0",
     "body-parser": "^1.18.2",

diff --git a/examples/express-all-interactions/server.js b/examples/express-all-interactions/server.js
@@ -1,7 +1,7 @@
 const http = require('http');
 const express = require('express');
 const { createMessageAdapter } = require('@slack/interactive-messages');
-const { WebClient } = require('@slack/client');
+const { WebClient } = require('@slack/web-api');
 const { users, neighborhoods } = require('./models');
 const axios = require('axios');
 const bodyParser = require('body-parser');
@@ -223,14 +223,19 @@ function slackSlashCommand(req, res, next) {
       res.json(interactiveMenu);
     } else if (type === 'dialog') {
       res.send();
-      web.dialog.open({
-        trigger_id: req.body.trigger_id,
-        dialog,
-      }).catch((error) => {
-        return axios.post(req.body.response_url, {
-          text: `An error occurred while opening the dialog: ${error.message}`,
-        });
-      }).catch(console.error);
+      (async () => {
+        try {
+          // Open dialog
+          const response = await web.dialog.open({ 
+            trigger_id: req.body.trigger_id,
+            dialog,
+          });
+        } catch (error) {
+          axios.post(req.body.response_url, {
+            text: `An error occurred while opening the dialog: ${error.message}`,
+          }).catch(console.error);
+        }
+      })();
     } else {
       res.send('Use this command followed by `button`, `menu`, or `dialog`.');
     }

diff --git a/examples/greet-and-react/index.js b/examples/greet-and-react/index.js
@@ -1,16 +1,16 @@
 // Load environment variables from `.env` file (optional)
 require('dotenv').config();
 
-const slackEventsApi = require('@slack/events-api');
-const SlackClient = require('@slack/client').WebClient;
+const { createEventAdapter } = require('@slack/events-api');
+const { WebClient } = require('@slack/web-api');
 const passport = require('passport');
 const LocalStorage = require('node-localstorage').LocalStorage;
 const SlackStrategy = require('@aoberoi/passport-slack').default.Strategy;
 const http = require('http');
 const express = require('express');
 
 // *** Initialize event adapter using signing secret from environment variables ***
-const slackEvents = slackEventsApi.createEventAdapter(process.env.SLACK_SIGNING_SECRET, {
+const slackEvents = createEventAdapter(process.env.SLACK_SIGNING_SECRET, {
   includeBody: true
 });
 
@@ -25,7 +25,7 @@ const botAuthorizationStorage = new LocalStorage('./storage');
 const clients = {};
 function getClientByTeamId(teamId) {
   if (!clients[teamId] && botAuthorizationStorage.getItem(teamId)) {
-    clients[teamId] = new SlackClient(botAuthorizationStorage.getItem(teamId));
+    clients[teamId] = new WebClient(botAuthorizationStorage.getItem(teamId));
   }
   if (clients[teamId]) {
     return clients[teamId];
@@ -79,9 +79,15 @@ slackEvents.on('message', (message, body) => {
     if (!slack) {
       return console.error('No authorization found for this team. Did you install the app through the url provided by ngrok?');
     }
-    // Respond to the message back in the same channel
-    slack.chat.postMessage({ channel: message.channel, text: `Hello <@${message.user}>! :tada:` })
-      .catch(console.error);
+
+    (async () => {
+      try {
+        // Respond to the message back in the same channel
+        const response = await slack.chat.postMessage({ channel: message.channel, text: `Hello <@${message.user}>! :tada:` });
+      } catch (error) {
+        console.log(error.data);
+      }
+    })();
   }
 });
 
@@ -94,8 +100,15 @@ slackEvents.on('reaction_added', (event, body) => {
     return console.error('No authorization found for this team. Did you install the app through the url provided by ngrok?');
   }
   // Respond to the reaction back with the same emoji
-  slack.chat.postMessage({ channel: event.item.channel, text: `:${event.reaction}:` })
-    .catch(console.error);
+
+  (async () => {
+    try {
+      // Respond to the message back in the same channel
+      const response = await slack.chat.postMessage({ channel: event.item.channel, text: `:${event.reaction}:` });
+    } catch (error) {
+      console.log(error.data);
+    }
+  })();
 });
 
 // *** Handle errors ***

diff --git a/examples/greet-and-react/package.json b/examples/greet-and-react/package.json
@@ -11,7 +11,7 @@
   "license": "MIT",
   "dependencies": {
     "@aoberoi/passport-slack": "^1.0.5",
-    "@slack/client": "^4.3.1",
+    "@slack/web-api": "^5.0.0",
     "@slack/events-api": "^2.0.0",
     "dotenv": "^4.0.0",
     "express": "^4.16.3",

diff --git a/examples/incoming-webhook-with-proxy.js b/examples/incoming-webhook-with-proxy.js