Merge pull request #13 from PerfectFit-project/348-tokens-expiration

348 tokens expiration

Author: wbaccinelli

niceday-api/controllers/FileSharing.js

@@ -4,9 +4,10 @@ const FileSharing = require('../service/FilesSharingService');
 module.exports.uploadFile = function uploadFile(req, res, next, body) {
   FileSharing.uploadFile(req, body)
     .then((response) => {
+      console.log('Uploaded file: ', response);
       utils.writeJson(res, response);
     })
     .catch((response) => {
-      utils.writeJson(res, response);
+      utils.writeJson(res, utils.respondWithCode(500, response));
     });
 };

niceday-api/index.js

@@ -1,4 +1,5 @@
 const { Authentication, SenseServer } = require('@sense-os/goalie-js');
+const schedule = require('node-schedule');
 const path = require('path');
 const http = require('http');
 const oas3Tools = require('oas3-tools');
@@ -9,27 +10,28 @@ require('dotenv').config();
 
 const serverPort = 8080;
 
-function createNicedayApiServer() {
-  const { THERAPIST_PASSWORD, THERAPIST_EMAIL_ADDRESS, ENVIRONMENT } = process.env;
-  let selectedServer;
-
-  if (ENVIRONMENT === 'dev') {
-    selectedServer = SenseServer.Alpha;
-  } else {
-    selectedServer = SenseServer.Production;
-  }
-
-  const authSdk = new Authentication(selectedServer);
-  // swaggerRouter configuration
-  const options = {
-    routing: {
-      controllers: path.join(__dirname, './controllers'),
-    },
-  };
-
-  const expressAppConfig = oas3Tools.expressAppConfig(path.join(__dirname, 'api/openapi.yaml'), options);
-  const app = expressAppConfig.getApp();
+const { THERAPIST_PASSWORD, THERAPIST_EMAIL_ADDRESS, ENVIRONMENT } = process.env;
+let selectedServer;
+
+if (ENVIRONMENT === 'dev') {
+  selectedServer = SenseServer.Alpha;
+} else {
+  selectedServer = SenseServer.Production;
+}
+
+const authSdk = new Authentication(selectedServer);
 
+// swaggerRouter configuration
+const options = {
+  routing: {
+    controllers: path.join(__dirname, './controllers'),
+  },
+};
+
+const expressAppConfig = oas3Tools.expressAppConfig(path.join(__dirname, 'api/openapi.yaml'), options);
+const app = expressAppConfig.getApp();
+
+function createNicedayApiServer() {
   authSdk.login(THERAPIST_EMAIL_ADDRESS, THERAPIST_PASSWORD)
     .then((response) => {
       app.set('therapistId', response.user.id);
@@ -45,10 +47,31 @@ function createNicedayApiServer() {
   return server;
 }
 
+function setupTokenRegeneration() {
+  const rule = new schedule.RecurrenceRule();
+  rule.hour = new schedule.Range(0, 23, 8);
+
+  const job = schedule.scheduleJob(rule, () => {
+    authSdk.login(THERAPIST_EMAIL_ADDRESS, THERAPIST_PASSWORD)
+      .then((response) => {
+        app.set('therapistId', response.user.id);
+        app.set('token', response.token);
+      })
+      .catch((error) => {
+        throw Error(`Error during authentication: ${error}`);
+      });
+  });
+
+  return job;
+}
+
 module.exports.createNicedayApiServer = createNicedayApiServer;
 if (require.main === module) {
   const server = createNicedayApiServer();
 
+  // schedule a tasks to regenerate the token every 9 hours
+  setupTokenRegeneration();
+
   server.listen(serverPort, () => {
     console.log('Your server is listening on port %d (http://localhost:%d)', serverPort, serverPort);
     console.log('Swagger-ui is available on http://localhost:%d/docs', serverPort);

niceday-api/package-lock.json

@@ -22,6 +22,7 @@
     "form-data": "^4.0.0",
     "isomorphic-fetch": "^3.0.0",
     "js-yaml": "^3.3.0",
+    "node-schedule": "^2.1.1",
     "oas3-tools": "^2.2.3"
   },
   "devDependencies": {

niceday-api/package.json

@@ -1,14 +1,20 @@
-const { Chat, SenseServerEnvironment, ConnectionStatus } = require('@sense-os/goalie-js');
+const {
+  Authentication, Chat, SenseServer, SenseServerEnvironment, ConnectionStatus,
+} = require('@sense-os/goalie-js');
+
+const { ENVIRONMENT, THERAPIST_EMAIL_ADDRESS, THERAPIST_PASSWORD } = process.env;
 
-const { ENVIRONMENT } = process.env;
 let selectedServerEnv;
+let selectedServer;
 
 if (ENVIRONMENT === 'dev') {
   selectedServerEnv = SenseServerEnvironment.Alpha;
+  selectedServer = SenseServer.Alpha;
 } else {
   selectedServerEnv = SenseServerEnvironment.Production;
+  selectedServer = SenseServer.Production;
 }
-
+const authSdk = new Authentication(selectedServer);
 /**
  * Send a text message
  *
@@ -22,7 +28,22 @@ exports.sendTextMessage = function (req, body) {
     const chatSdk = new Chat();
     chatSdk.init(selectedServerEnv);
     chatSdk.connect(req.app.get('therapistId'), req.app.get('token'))
-      .catch((error) => reject(error));
+      .catch(() => {
+        // if the connection fails, we regenreate the token by logging in again
+        // and we try to reconnect
+        authSdk.login(THERAPIST_EMAIL_ADDRESS, THERAPIST_PASSWORD)
+          .then((response) => {
+            req.app.set('therapistId', response.user.id);
+            req.app.set('token', response.token);
+            chatSdk.connect(response.user.id, response.token)
+              .catch((connectError) => {
+                throw Error(`Error during chat connection: ${connectError}`);
+              });
+          })
+          .catch((loginError) => {
+            throw Error(`Error during authentication: ${loginError}`);
+          });
+      });
 
     const subscriptionId = chatSdk.subscribeToConnectionStatusChanges((connectionStatus) => {
       if (connectionStatus === ConnectionStatus.Connected) {

niceday-api/service/MessagesService.js

@@ -1,4 +1,5 @@
 const goalieJs = require('@sense-os/goalie-js');
+const schedule = require('node-schedule');
 
 const {
   Chat, Authentication, SenseServer, SenseServerEnvironment,
@@ -102,6 +103,27 @@ class MessageHandler {
   }
 }
 
+function setupTokenRegeneration() {
+  const rule = new schedule.RecurrenceRule();
+  rule.hour = new schedule.Range(0, 23, 8);
+
+  const job = schedule.scheduleJob(rule, () => {
+    authSdk.login(THERAPIST_EMAIL_ADDRESS, THERAPIST_PASSWORD)
+      .then((response) => {
+        chatSdk.init(selectedServerEnv);
+        chatSdk.connect(response.user.id, response.token)
+          .catch((connectError) => {
+            throw Error(`Error during chat connection: ${connectError}`);
+          });
+      })
+      .catch((error) => {
+        throw Error(`Error during authentication: ${error}`);
+      });
+  });
+
+  return job;
+}
+
 function setup(therapistId, token) {
   // Setup connection
   chatSdk.init(selectedServerEnv);
@@ -121,6 +143,11 @@ function setup(therapistId, token) {
 }
 module.exports.setup = setup;
 
-authSdk.login(THERAPIST_EMAIL_ADDRESS, THERAPIST_PASSWORD).then((response) => {
-  setup(response.user.id, response.token);
-});
+if (require.main === module) {
+  authSdk.login(THERAPIST_EMAIL_ADDRESS, THERAPIST_PASSWORD).then((response) => {
+    setup(response.user.id, response.token);
+  });
+
+  // schedule a tasks to regenerate the token every 9 hours
+  setupTokenRegeneration();
+}