remove users endpoints

3 files changed, 70 insertions, 21 deletions

diff --git a/app.js b/app.js
index 940a4600..60edbc02 100644
--- a/app.js
+++ b/app.js
@@ -1,12 +1,14 @@
-import express from 'express'
+import ba from 'bitcoinaverage'
 import bodyParser from 'body-parser'
-import cookieParser from 'cookie-parser'
-import passport from './passport'
 import cache from './cache'
+import compression from 'compression'
+import cookieParser from 'cookie-parser'
+import cors from 'cors'
 import dotenv from 'dotenv'
-import ba from 'bitcoinaverage'
+import express from 'express'
 import fs from 'fs'
 import grpc from 'grpc'
+import passport from './passport'
 import { graphqlExpress, graphiqlExpress } from 'apollo-server-express'
 const { makeExecutableSchema } = require('graphql-tools');
 
@@ -40,8 +42,6 @@ const schema = makeExecutableSchema({
 });
 
 dotenv.config()
-
-require('dotenv').config()
 const l = console.log
 
 ;(async () => {
@@ -50,6 +50,8 @@ const l = console.log
   app.use(bodyParser.urlencoded({ extended: true }))
   app.use(bodyParser.json())
   app.use(cookieParser())
+  app.use(cors())
+  app.use(compression())
   app.use(passport.initialize())
 
   const users = require('./routes/users')
@@ -60,16 +62,9 @@ const l = console.log
   const meta = new grpc.Metadata();
   meta.add('macaroon', adminMacaroon.toString('hex'));
 
-
-  app.get('/users.json', transactions.index)
   app.post('/login', users.login)
   app.post('/users', users.create)
   app.get('/verify/:token', users.verify)
-  app.post('/:user', users.update)
-  // app.post('/:user/transactions', transactions.create)
-  app.get('/:user/transactions', transactions.index)
-  app.post('/transactions/:txid', transactions.update)
-  app['delete']('/:user/transactions/:txid', transactions['delete'])
   app.get('/secret', passport.authenticate('jwt', { session: false }), users.secret)
   app.get('/balance', async (req, res) => {
     res.json(await lnrpc.walletBalance({witness_only: true}, meta))
@@ -88,8 +83,10 @@ const l = console.log
   })
 
   app.use('/graphql', bodyParser.json(), graphqlExpress({ 
-    schema,
+    schema: schema,
     context: {},
+    tracing: true,
+    cacheControl: true,
   }))
 
   app.use('/graphiql', graphiqlExpress({ endpointURL: '/graphql' }))
diff --git a/package.json b/package.json
index d9718c96..7dceb221 100644
--- a/package.json
+++ b/package.json
@@ -18,10 +18,12 @@
     "bluebird": "^3.4.6",
     "body-parser": "^1.5.0",
     "browser-sync": "^2.11.0",
+    "compression": "^1.7.1",
     "connect-assets": "*",
     "connect-redis": "3.1.0",
     "consolidate": "0.14.1",
     "cookie-parser": "^1.3.2",
+    "cors": "^2.8.4",
     "dotenv": "^4.0.0",
     "express": "4.14.0",
     "express-session": "^1.6.5",
diff --git a/yarn.lock b/yarn.lock
index 819bc9f4..900caa38 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17,6 +17,13 @@ [email protected], accepts@~1.3.3:
     mime-types "~2.1.11"
     negotiator "0.6.1"
 
+accepts@~1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f"
+  dependencies:
+    mime-types "~2.1.16"
+    negotiator "0.6.1"
+
 acorn-jsx@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
@@ -1222,6 +1229,10 @@ [email protected]:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.4.0.tgz#7d97196f9d5baf7f6935e25985549edd2a6c2339"
 
[email protected]:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+
 [email protected]:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
@@ -1398,6 +1409,24 @@ compressible@^2.0.2:
   dependencies:
     mime-db ">= 1.27.0 < 2"
 
+compressible@~2.0.11:
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.12.tgz#c59a5c99db76767e9876500e271ef63b3493bd66"
+  dependencies:
+    mime-db ">= 1.30.0 < 2"
+
+compression@^1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.1.tgz#eff2603efc2e22cf86f35d2eb93589f9875373db"
+  dependencies:
+    accepts "~1.3.4"
+    bytes "3.0.0"
+    compressible "~2.0.11"
+    debug "2.6.9"
+    on-headers "~1.0.1"
+    safe-buffer "5.1.1"
+    vary "~1.1.2"
+
 [email protected]:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -1501,6 +1530,13 @@ core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
+cors@^2.8.4:
+  version "2.8.4"
+  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.4.tgz#2bd381f2eb201020105cd50ea59da63090694686"
+  dependencies:
+    object-assign "^4"
+    vary "^1"
+
 [email protected]:
   version "3.4.4"
   resolved "https://registry.yarnpkg.com/crc/-/crc-3.4.4.tgz#9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"
@@ -1579,7 +1615,7 @@ [email protected]:
   dependencies:
     ms "0.7.2"
 
-debug@^2.6.8:
[email protected], debug@^2.6.8:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
@@ -3023,7 +3059,7 @@ [email protected], micromatch@^2.1.5, micromatch@^2.3.11:
   version "1.27.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
 
-mime-db@^1.28.0:
+"mime-db@>= 1.30.0 < 2", mime-db@^1.28.0:
   version "1.32.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.32.0.tgz#485b3848b01a3cda5f968b4882c0771e58e09414"
 
@@ -3031,6 +3067,10 @@ mime-db@~1.12.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.12.0.tgz#3d0c63180f458eb10d325aaa37d7c58ae312e9d7"
 
+mime-db@~1.30.0:
+  version "1.30.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
+
 mime-types@^2.1.11, mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.7:
   version "2.1.15"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed"
@@ -3047,6 +3087,12 @@ mime-types@~2.0.3:
   dependencies:
     mime-db "~1.12.0"
 
+mime-types@~2.1.16:
+  version "2.1.17"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
+  dependencies:
+    mime-db "~1.30.0"
+
 [email protected]:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.4.tgz#11b5fdaf29c2509255176b80ad520294f5de92b7"
@@ -3299,7 +3345,7 @@ [email protected]:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
 
-object-assign@^4.0.1, object-assign@^4.1.0:
+object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
 
@@ -4048,14 +4094,14 @@ [email protected]:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
 
[email protected], safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
+
 safe-buffer@^5.0.1, safe-buffer@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
 
-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-
 [email protected]:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/scmp/-/scmp-0.0.3.tgz#3648df2d7294641e7f78673ffc29681d9bad9073"
@@ -4644,6 +4690,10 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
 
+vary@^1, vary@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+
 vary@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37"