Merge pull request #70 from Luidog/session-handling

Session handling

Author: Luidog

.prettierrc.js

@@ -1,4 +1,6 @@
 module.exports = {
 	singleQuote: true,
-	tabWidth: 2
+	tabWidth: 2,
+	arrowParens: 'avoid',
+	trailingComma: 'none'
 };

.travis.yml

@@ -1,6 +1,7 @@
 language: node_js
 node_js:
 - node
+services: mongodb
 install:
 - npm install
 - npm install marpat

package-lock.json

@@ -4,7 +4,7 @@
   "description": "A FileMaker Data API client designed to allow easier interaction with a FileMaker database from a web environment.",
   "main": "index.js",
   "scripts": {
-    "test": "snyk test && nyc _mocha --recursive  ./test --timeout=15000 --exit",
+    "test": "nyc _mocha --recursive  ./test/*.test.js --timeout=15000 --exit",
     "coverage": "nyc report --reporter=text-lcov | coveralls",
     "report": "nyc report --reporter=html",
     "examples": "node examples/index.js",
@@ -47,31 +47,31 @@
     "marpat": "^3.0.2",
     "mime-types": "^2.1.26",
     "moment": "^2.24.0",
-    "object-sizeof": "^1.5.2",
+    "object-sizeof": "^1.5.3",
     "prettysize": "^2.0.0",
-    "snyk": "^1.290.2",
+    "snyk": "^1.303.0",
     "stream-to-array": "^2.3.0",
-    "tough-cookie": "^3.0.1",
-    "uuid": "^3.4.0"
+    "tough-cookie": "^4.0.0",
+    "uuid": "^7.0.2"
   },
   "devDependencies": {
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
-    "coveralls": "^3.0.9",
+    "coveralls": "^3.0.11",
     "deep-map": "^2.0.0",
     "dotenv": "^8.2.0",
     "es6-weak-map": "^2.0.3",
     "eslint": "^6.8.0",
     "eslint-config-google": "^0.14.0",
-    "eslint-config-prettier": "^6.10.0",
+    "eslint-config-prettier": "^6.10.1",
     "eslint-plugin-prettier": "^3.1.2",
-    "fs-extra": "^8.1.0",
+    "fs-extra": "^9.0.0",
     "handlebars": "^4.7.3",
     "http-proxy": "^1.18.0",
     "jsdoc": "^3.6.3",
     "jsdoc-to-markdown": "^5.0.3",
     "minami": "^1.2.3",
-    "mocha": "^7.0.1",
+    "mocha": "^7.1.1",
     "mocha-lcov-reporter": "^1.3.0",
     "mos": "^1.3.1",
     "mos-plugin-dependencies": "^2.2.2",
@@ -80,9 +80,9 @@
     "mos-plugin-license": "^1.2.2",
     "mos-plugin-snippet": "^2.1.3",
     "nyc": "^15.0.0",
-    "prettier": "^1.19.1",
-    "sinon": "^8.1.1",
+    "prettier": "^2.0.1",
+    "sinon": "^9.0.1",
     "varium": "^2.0.6"
   },
   "snyk": true
-}
+}

package.json

@@ -2,7 +2,7 @@
 
 const https = require('https');
 const http = require('http');
-const uuidv4 = require('uuid/v4');
+const { v4: uuidv4 } = require('uuid');
 const { EmbeddedDocument } = require('marpat');
 const _ = require('lodash');
 const { deepMapKeys } = require('../utilities');

src/models/agent.model.js

@@ -137,7 +137,8 @@ class Client extends Document {
     return new Promise((resolve, reject) =>
       this.agent.connection
         .start(!_.isEmpty(this.agent.agent) ? this.agent.localize() : false)
-        .then(response => resolve(response))
+        .then(body => this.data.outgoing(body))
+        .then(body => this._save(resolve(body)))
         .catch(error => this._save(reject(error)))
     );
   }

src/models/client.model.js

@@ -2,7 +2,7 @@
 
 const moment = require('moment');
 const { EmbeddedDocument } = require('marpat');
-const uuidv4 = require('uuid/v4');
+const { v4: uuidv4 } = require('uuid');
 /**
  * @class Session
  * @classdesc The class used to save FileMaker Data API Session information
@@ -34,10 +34,7 @@ class Session extends EmbeddedDocument {
        */
       expires: {
         type: String,
-        default: () =>
-          moment()
-            .add(15, 'minutes')
-            .format()
+        default: () => moment().add(15, 'minutes').format()
       },
       /* A string containing the last time the token was used.
        * @member Session#used
@@ -103,9 +100,7 @@ class Session extends EmbeddedDocument {
    */
   extend() {
     this.active = false;
-    this.expires = moment()
-      .add(15, 'minutes')
-      .format();
+    this.expires = moment().add(15, 'minutes').format();
   }
 }
 

src/models/session.model.js

@@ -7,7 +7,7 @@ const path = require('path');
 const toArray = require('stream-to-array');
 const { CookieJar } = require('tough-cookie');
 const mime = require('mime-types');
-const uuidv4 = require('uuid/v4');
+const { v4: uuidv4 } = require('uuid');
 const _ = require('lodash');
 const { interceptResponse } = require('./request.service')
 

src/services/container.service.js

@@ -0,0 +1,65 @@
+const axios = require('axios');
+const path = require('path');
+const environment = require('dotenv');
+const varium = require('varium');
+const manifestPath = path.join(__dirname, '../env.manifest');
+
+environment.config({ path: './test/.env' });
+varium({ manifestPath });
+
+const instance = axios.create({
+  baseURL: process.env.SERVER
+});
+
+let adminToken = false;
+
+const login = () =>
+  instance
+    .post(
+      '/fmi/admin/api/v2/user/auth',
+      {},
+      {
+        auth: {
+          username: process.env.ADMIN_USER,
+          password: process.env.ADMIN_PASSWORD
+        }
+      }
+    )
+    .then(response => {
+      adminToken = response.data.response.token;
+      return response.data.response.token;
+    });
+
+const logout = (token = adminToken) => instance
+        .delete(`/fmi/admin/api/v2/user/auth/${token}`, {})
+
+const remove = ({ id }, token = adminToken) =>
+  instance
+    .delete(`/fmi/admin/api/v2/clients/${id}`, {
+      params: {
+        graceTime: 0
+      },
+      headers: { Authorization: `Bearer ${token}` }
+    })
+    .then(response => response.data)
+    .catch(error => console.log(error.response.data));
+
+const drop = account =>
+  find(account).then(sessions => {
+    const removals = [];
+    sessions.forEach(session => removals.push(remove(session)));
+    return Promise.all(removals);
+  });
+
+const find = ({ userName }, token = adminToken) =>
+  instance
+    .get('/fmi/admin/api/v2/clients', {
+      headers: { Authorization: `Bearer ${token}` }
+    })
+    .then(response =>
+      response.data.response.clients.filter(
+        client => client.userName === userName
+      )
+    );
+
+module.exports = { admin: { login, logout, sessions: { find, drop } } };

test/admin/index.js

@@ -7,6 +7,11 @@ PASSWORD : String
 LAYOUT : String
 CONTAINER_LAYOUT : String
 
+# FileMaker Server Configuration
+
+ADMIN_USER: String
+ADMIN_PASSWORD: String
+
 # Client Configuration
 
 CLIENT_NAME: String | star-wars-fan