Improve accessToken logic (#228)

Author: ehmicky

.eslintrc.js

@@ -11,7 +11,6 @@ module.exports = {
     'no-magic-numbers': 0,
     'no-param-reassign': 0,
     'fp/no-class': 0,
-    'fp/no-delete': 0,
     'fp/no-let': 0,
     'fp/no-loops': 0,
     'fp/no-mutating-assign': 0,

package-lock.json

@@ -69,16 +69,14 @@
     "@netlify/zip-it-and-ship-it": "^1.3.12",
     "backoff": "^2.5.0",
     "clean-deep": "^3.3.0",
-    "filter-obj": "^2.0.1",
     "flush-write-stream": "^2.0.0",
     "folder-walker": "^3.2.0",
     "from2-array": "0.0.4",
     "hasha": "^5.0.0",
     "lodash.camelcase": "^4.3.0",
-    "lodash.get": "^4.4.2",
-    "lodash.set": "^4.3.2",
     "micro-api-client": "^3.3.0",
     "node-fetch": "^2.2.0",
+    "omit.js": "^2.0.2",
     "p-map": "^3.0.0",
     "p-wait-for": "^3.1.0",
     "parallel-transform": "^1.1.0",

package.json

@@ -1,6 +1,4 @@
 const dfn = require('@netlify/open-api')
-const get = require('lodash.get')
-const set = require('lodash.set')
 const pWaitFor = require('p-wait-for')
 
 const deploy = require('./deploy')
@@ -41,15 +39,24 @@ class NetlifyAPI {
   }
 
   get accessToken() {
-    return (get(this, 'defaultHeaders.Authorization') || '').replace('Bearer ', '') || null
+    const {
+      defaultHeaders: { Authorization },
+    } = this
+    if (typeof Authorization !== 'string' || !Authorization.startsWith('Bearer ')) {
+      return null
+    }
+
+    return Authorization.replace('Bearer ', '')
   }
 
   set accessToken(token) {
-    if (token) {
-      set(this, 'defaultHeaders.Authorization', `Bearer ${token}`)
-    } else {
+    if (!token) {
+      // eslint-disable-next-line fp/no-delete
       delete this.defaultHeaders.Authorization
+      return
     }
+
+    this.defaultHeaders.Authorization = `Bearer ${token}`
   }
 
   get basePath() {

src/index.js

@@ -1,4 +1,5 @@
 const { JSONHTTPError, TextHTTPError } = require('micro-api-client')
+const omit = require('omit.js').default
 
 // Read and parse the HTTP response
 const parseResponse = async function (response) {
@@ -38,8 +39,7 @@ const parseJsonResponse = function (response, textResponse, responseType) {
 }
 
 const getFetchError = function (error, url, opts) {
-  const data = { ...opts }
-  delete data.Authorization
+  const data = omit(opts, ['Authorization'])
   Object.assign(error, { name: 'FetchError', url, data })
   return error
 }

src/methods/response.js

@@ -1,6 +1,5 @@
 const { paths } = require('@netlify/open-api')
-
-const { omit } = require('./utils/omit')
+const omit = require('omit.js').default
 
 // Retrieve all OpenAPI operations
 const getOperations = function () {