From 1649b902ecb2cd07d99429f4eb4e47eafc6d92e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?KE=2EHAO=2ECHANG=20=E5=BC=B5=E6=A0=BC=E8=B1=AA?=
 <KE.HAO.CHANG@deltaww.com>
Date: Fri, 24 Apr 2020 22:58:41 +0800
Subject: [PATCH] update server, no token in source code

---
 .gitignore                 |  1 +
 linebot/package.json       |  2 +-
 server/.vscode/launch.json | 15 +++++++++++++++
 server/index.js            | 16 +++++++++++-----
 server/package.json        |  1 +
 ui2/backend/index.js       |  2 ++
 6 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 server/.vscode/launch.json

diff --git a/.gitignore b/.gitignore
index ea686ac..f487943 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ ui2/backend/config.js
 ssl_auth_files/certrequest.csr
 ssl_auth_files/pillaAuth-cert.pem
 ssl_auth_files/pillaAuth-key.pem
+server/.env
diff --git a/linebot/package.json b/linebot/package.json
index 05761f8..09bbbde 100644
--- a/linebot/package.json
+++ b/linebot/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "PORT=5001 bottender dev",
+    "dev": "bottender dev",
     "lint": "eslint . ",
     "start": "bottender start",
     "test": "jest"
diff --git a/server/.vscode/launch.json b/server/.vscode/launch.json
new file mode 100644
index 0000000..5b3fbda
--- /dev/null
+++ b/server/.vscode/launch.json
@@ -0,0 +1,15 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "node",
+      "program": "${workspaceFolder}/index.js",
+      "skipFiles": ["<node_internals>/**"]
+    }
+  ]
+}
diff --git a/server/index.js b/server/index.js
index 8901ef7..cbe23f2 100644
--- a/server/index.js
+++ b/server/index.js
@@ -9,10 +9,9 @@ const morgan = require("morgan");
 const axios = require("axios");
 const config = require("../config");
 const { SlackOAuthClient } = require("messaging-api-slack");
+require("dotenv").config();
 
-const slackClient = SlackOAuthClient.connect(
-  "xoxb-1082926328692-1089407482497-XJENYGhYIJQrZRndVDGrk1aZ"
-);
+const slackClient = SlackOAuthClient.connect(process.env.SLACK_ACCESS_TOKEN);
 
 const https_options = {
   key: fs.readFileSync("./ssl_files/server_private_key.pem"),
@@ -22,7 +21,7 @@ const https_options = {
 
 app.use(cors());
 app.use(bodyParser.urlencoded({ extended: false }));
-app.use(bodyParser.text());
+app.use(bodyParser.json());
 app.use(morgan("dev"));
 
 app.get("/version", (req, res) => {
@@ -30,10 +29,17 @@ app.get("/version", (req, res) => {
 });
 
 app.post("/module/offline", (req, res) => {
-  slackClient.postMessage("#statusreport", req.body);
+  // slackClient.postMessage("#statusreport", req.body);
   res.sendStatus(200);
 });
 
+app.post("/forslack", (req, res) => {
+  // slackClient.postMessage("#statusreport", req.body);
+  // res.status(200).send(req.body.challenge.toString());
+  let str = req.body.challenge.toString();
+  res.send(str);
+});
+
 http.createServer(app).listen(config.serverPort, () => {
   console.log("cake vending server listening on port " + config.serverPort);
 });
diff --git a/server/package.json b/server/package.json
index 022f222..7e590cc 100644
--- a/server/package.json
+++ b/server/package.json
@@ -13,6 +13,7 @@
     "axios": "^0.19.2",
     "body-parser": "^1.19.0",
     "cors": "^2.8.5",
+    "dotenv": "^8.2.0",
     "express": "^4.17.1",
     "messaging-api-line": "^0.8.5",
     "messaging-api-slack": "^0.8.2",
diff --git a/ui2/backend/index.js b/ui2/backend/index.js
index 2f18368..a7a805c 100644
--- a/ui2/backend/index.js
+++ b/ui2/backend/index.js
@@ -14,6 +14,8 @@ const config = require("../../config");
 const sqlite3 = require("sqlite3").verbose();
 const os = require("os");
 
+//todo: idle的時候每五分鐘回抽
+
 const mqttOpt = {
   port: config.mqttBrokerPort,
   clientId: config.backendVersion,