Remove redundant dependencies (#1830)

* Optimize auth.js

defaultsDeep includes the lodash.defaultsdeep file what weight 51kb
we can use just Object.assign here

* chore(auth.js): merge remote branch

- remove loadah.defaultsdeep library
- remove object.assign and use spread instread

* chore(sdk-auth): add lodash.defaultsdeep and refactor

* chore(sdk-auth): remove lodash.defaultsdeep dependency from sdk-auth package

* Create tiny-wombats-arrive.md

Add changeset

Co-authored-by: Ivan Maslov <cryptox3@gmail.com>

Author: ajimae

.changeset/tiny-wombats-arrive.md

@@ -0,0 +1,5 @@
+---
+"@commercetools/sdk-auth": patch
+---
+
+Remove redundant dependencies and improve browser integration.

packages/sdk-auth/package.json

@@ -36,7 +36,6 @@
   },
   "dependencies": {
     "@commercetools/sdk-middleware-http": "^7.0.0",
-    "lodash.defaultsdeep": "^4.6.0",
     "qss": "2.0.3"
   },
   "devDependencies": {

packages/sdk-auth/src/auth.js

@@ -1,5 +1,4 @@
 /* @flow */
-
 import type {
   AuthOptions,
   CustomAuthOptions,
@@ -9,7 +8,6 @@ import type {
   UserAuthOptions,
 } from 'types/sdk'
 import { decode, encode } from 'qss'
-import defaultsDeep from 'lodash.defaultsdeep'
 import { getErrorByCode } from '@commercetools/sdk-middleware-http'
 import * as constants from './constants'
 
@@ -88,7 +86,8 @@ export default class SdkAuth {
     clientId,
     clientSecret,
   }: ClientAuthOptions): string {
-    return Buffer.from(`${clientId}:${clientSecret}`).toString('base64')
+    const targetStr = `${clientId}:${clientSecret}`
+    return typeof Buffer === 'undefined' ? btoa(targetStr) : Buffer.from(targetStr).toString('base64')
   }
 
   static _getScopes(scopes: ?Array<string>, projectKey: ?string): string {
@@ -221,7 +220,7 @@ export default class SdkAuth {
     const { uri, body, basicAuth, authType, headers } = request
     const fetchHeaders = headers || {
       Authorization: `${authType || constants.DEFAULT_AUTH_TYPE} ${basicAuth}`,
-      'Content-Length': Buffer.byteLength(body).toString(),
+      'Content-Length': JSON.stringify(body?.length || 0),
       'Content-Type': 'application/x-www-form-urlencoded',
     }
 
@@ -237,10 +236,8 @@ export default class SdkAuth {
   }
 
   _getRequestConfig(config: CustomAuthOptions = {}): AuthOptions {
-    const mergedConfig = defaultsDeep({}, config, this.config)
-
-    // handle scopes array - defaultsDeep would merge arrays together
-    // instead of taking its first occurrence
+    // eslint-disable-next-line prefer-object-spread
+    const mergedConfig = Object.assign({}, this.config, config)
     if (config.scopes) mergedConfig.scopes = config.scopes
 
     return mergedConfig

packages/sdk-auth/test/token-provider.spec.js

@@ -342,4 +342,20 @@ describe('Token Provider', () => {
       expect(_tokenProvider.tokenInfo).toEqual(null)
     })
   })
+
+  describe('scopes', () => {
+    const auth = new Auth(config)
+    test('should include scope in the merged config', () => {
+      expect(config.scopes).toBeFalsy()
+
+      const mergedConfig = auth._getRequestConfig({ scopes: ['new-scope:demo-projectKey'] })
+
+      expect(mergedConfig).toBeTruthy()
+      expect(mergedConfig).toMatchObject(
+        expect.objectContaining({
+          scopes: ['new-scope:demo-projectKey']
+        })
+      )
+    })
+  })
 })

yarn.lock

@@ -1625,6 +1625,14 @@
     update-notifier "^2.2.0"
     yargs "^8.0.2"
 
+"@iarna/cli@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@iarna/cli/-/cli-2.1.0.tgz#f830356d54c72c804bd7afc43999de31e40fc3d6"
+  integrity sha512-rvVVqDa2g860niRbqs3D5RhL4la3dc1vwk+NlpKPZxKaMSHtE2se6C2x8NeveN+rcjp3/686X+u+09CZ+7lmAQ==
+  dependencies:
+    glob "^7.1.2"
+    signal-exit "^3.0.2"
+
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
@@ -9575,7 +9583,7 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
-lock-verify@^2.0.2, lock-verify@^2.1.0:
+lock-verify@^2.0.2:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/lock-verify/-/lock-verify-2.2.1.tgz#81107948c51ed16f97b96ff8b60675affb243fc1"
   integrity sha512-n0Zw2DVupKfZMazy/HIFVNohJ1z8fIoZ77WBnyyBGG6ixw83uJNyrbiJvvHWe1QKkGiBCjj8RCPlymltliqEww==
@@ -9584,6 +9592,15 @@ lock-verify@^2.0.2, lock-verify@^2.1.0:
     npm-package-arg "^6.1.0"
     semver "^5.4.1"
 
+lock-verify@^2.1.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/lock-verify/-/lock-verify-2.2.2.tgz#9e93c0999dc3cbbede4f16f9cfdaa93ead8c76ef"
+  integrity sha512-2CUNtr1ZSVKJHcYP8uEzafmmuyauCB5zZimj8TvQd/Lflt9kXVZs+8S+EbAzZLaVUDn8CYGmeC3DFGdYfnCzeQ==
+  dependencies:
+    "@iarna/cli" "^2.1.0"
+    npm-package-arg "^6.1.0"
+    semver "^5.4.1"
+
 lockfile@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.4.tgz#07f819d25ae48f87e538e6578b6964a4981a5609"
@@ -9703,11 +9720,6 @@ lodash.defaults@^4.0.1, lodash.defaults@^4.2.0:
   resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
   integrity sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==
 
-lodash.defaultsdeep@^4.6.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz#512e9bd721d272d94e3d3a63653fa17516741ca6"
-  integrity sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==
-
 lodash.difference@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c"