Merge pull request #25 from isayme/issue/apikey-strategy

fix 24, support getting api-key from header

README.md

@@ -72,7 +72,7 @@ In order to use these APIs you need to generate an API key from settings. Do not
 
 All API requests and responses are in JSON format.
 
-Include the API key as `apikey` in the body of all below requests. Available API URLs with body parameters:
+Include the API key as `X-API-Key` in the header of all below requests. Available API URLs with body parameters:
 
 **Get shortened URLs list:**
 ```

package-lock.json

@@ -6189,24 +6189,13 @@
         "passport-strategy": "1.0.0"
       }
     },
-    "passport-localapikey": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/passport-localapikey/-/passport-localapikey-0.0.3.tgz",
-      "integrity": "sha1-pERzXILME1J2gp3eJ9etAfqj/aA=",
+    "passport-localapikey-update": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/passport-localapikey-update/-/passport-localapikey-update-0.6.0.tgz",
+      "integrity": "sha512-NklCLY68AdepFID+HQ9CVPqRKKYIPw+fGQBsQoP/WZ2ovVfmJ0Qx7eoBpUtpta0vyav2TPDoHSAKoHTjO+LPcw==",
       "requires": {
-        "passport": "0.1.18",
+        "passport-strategy": "1.0.0",
         "pkginfo": "0.2.3"
-      },
-      "dependencies": {
-        "passport": {
-          "version": "0.1.18",
-          "resolved": "https://registry.npmjs.org/passport/-/passport-0.1.18.tgz",
-          "integrity": "sha1-yCZEedy2QUytu2Z1LRKzfgtlJaE=",
-          "requires": {
-            "pause": "0.0.1",
-            "pkginfo": "0.2.3"
-          }
-        }
       }
     },
     "passport-strategy": {

package.json

@@ -53,7 +53,7 @@
     "passport": "^0.4.0",
     "passport-jwt": "^3.0.1",
     "passport-local": "^1.0.0",
-    "passport-localapikey": "0.0.3",
+    "passport-localapikey-update": "^0.6.0",
     "prop-types": "^15.6.0",
     "raven": "^2.4.0",
     "react": "^16.2.0",

server/passport.js

@@ -2,7 +2,7 @@ const passport = require('passport');
 const JwtStrategy = require('passport-jwt').Strategy;
 const { ExtractJwt } = require('passport-jwt');
 const LocalStratergy = require('passport-local').Strategy;
-const LocalAPIKeyStrategy = require('passport-localapikey').Strategy;
+const LocalAPIKeyStrategy = require('passport-localapikey-update').Strategy;
 const bcrypt = require('bcryptjs');
 const config = require('./config');
 const { getUser } = require('./db/user');
@@ -46,8 +46,13 @@ passport.use(
   })
 );
 
+const localAPIKeyOptions = {
+  apiKeyField: 'apikey',
+  apiKeyHeader: 'x-api-key',
+};
+
 passport.use(
-  new LocalAPIKeyStrategy(async (apikey, done) => {
+  new LocalAPIKeyStrategy(localAPIKeyOptions, async (apikey, done) => {
     try {
       const user = await getUser({ apikey });
       if (!user) {