Merge pull request #59 from ClickPop/release/1.0.0-alpha.3

Release/1.0.0 alpha.3

middleware/restrictAccess.js

@@ -1,9 +1,11 @@
-const isbot = require('isbot');
+const DeviceDetector = require('device-detector-js');
 
 module.exports = async (req, _, next) => {
-  const userAgent = req.get('user-agent');
+  let userAgent = req.get('user-agent');
+  let detector = new DeviceDetector();
+  let bot = detector.botParser.parse(userAgent);
 
-  if (isbot(userAgent)) {
+  if (bot) {
     return next({
       status: 403,
       errors: [

models/response.js

@@ -5,6 +5,7 @@ const ip6addr = require('ip6addr');
 const hashIds = require('../helpers/hashIds');
 var iso31661 = require('iso-3166');
 var iso31662 = require('iso-3166/2');
+const DeviceDetector = require('device-detector-js');
 
 module.exports = (sequelize, DataTypes) => {
   class Response extends Model {}
@@ -132,6 +133,23 @@ module.exports = (sequelize, DataTypes) => {
           );
         },
       },
+      device: {
+        type: DataTypes.VIRTUAL,
+        get() {
+          let rVal = null;
+          let device = new DeviceDetector();
+          if (this.userAgent !== null && typeof this.userAgent === 'string') {
+            let decodedDevice = device.parse(this.userAgent);
+            rVal = typeof decodedDevice === 'object' ? decodedDevice : null;
+          }
+          return rVal;
+        },
+        set(value) {
+          throw new Error(
+            `Cannot explicitly set the \`device\` property. Value: \`${value}\` rejected.`,
+          );
+        },
+      },
     },
     {
       sequelize,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "backtalk-api",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.3",
   "description": "API Service for backtalk.io",
   "main": "./server/server.js",
   "scripts": {
@@ -30,16 +30,19 @@
     "docker-down:combined": "docker-compose down && cd client/ && yarn docker-down"
   },
   "keywords": [],
-  "author": "ClickPopMedia",
+  "author": "ClickPop",
   "contributors": [
     {
-      "name": "Graham Vasquez"
+      "name": "Graham Vasquez",
+      "url": "https://github.com/gv14982"
     },
     {
-      "name": "Sean Metzgar"
+      "name": "Sean Metzgar",
+      "url": "https://github.com/seanmetzgar"
     },
     {
-      "name": "Chris Vasquez"
+      "name": "Chris Vasquez",
+      "url": "https://github.com/cvasquez"
     }
   ],
   "license": "ISC",
@@ -65,14 +68,14 @@
     "cookie-parser": "^1.4.5",
     "cors": "^2.8.5",
     "cross-env": "^7.0.2",
+    "device-detector-js": "^2.2.5",
     "dotenv": "^8.2.0",
     "express": "^4.17.1",
     "express-validator": "^6.6.1",
     "faker": "^5.1.0",
     "geoip-lite": "^1.4.2",
     "hashids": "^2.2.1",
     "ip6addr": "^0.2.3",
-    "isbot": "3.0.11",
     "iso-3166": "3.1.0",
     "jsonwebtoken": "^8.5.1",
     "morgan": "^1.10.0",

scripts/develop.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
 cd backtalk-develop
-docker-compose up -d --build --force-recreate
-# rm .env
+docker-compose down
+docker-compose up -d --build
+rm .env

scripts/production.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
 cd backtalk-api
-docker-compose up -d --build --force-recreate
+docker-compose down
+docker-compose up -d --build
 rm .env