🐛 cookie options not using defaults

Author: Crhistian Ramirez

codegen/templates/Configuration.ts

@@ -1,7 +1,7 @@
 import { SdkConfiguration } from './models'
 
 class Configuration {
-  private config: SdkConfiguration = {
+  private defaultConfig: SdkConfiguration = {
     baseApiUrl: 'https://api.ordercloud.io',
     apiVersion: 'v1',
     timeoutInMilliseconds: 60 * 1000, // 60 seconds by default
@@ -14,6 +14,7 @@ class Configuration {
       path: '/', // accessible on any path in the domain
     },
   }
+  private config: SdkConfiguration = cloneDeep(this.defaultConfig)
 
   /**
    * @ignore
@@ -25,8 +26,9 @@ class Configuration {
   }
 
   Set(config: SdkConfiguration): void {
-    this.config = { ...this.config, ...(config || {}) }
+    this.config = { ...this.defaultConfig, ...this.config, ...(config || {}) }
     this.config.cookieOptions = {
+      ...this.defaultConfig.cookieOptions,
       ...this.config.cookieOptions,
       ...(config?.cookieOptions || {}),
     }
@@ -37,4 +39,10 @@ class Configuration {
   }
 }
 
+// takes an object and creates a new one with same properties/values
+// useful so we don't mutate original object
+function cloneDeep(obj: any): any {
+  return JSON.parse(JSON.stringify(obj))
+}
+
 export default new Configuration()

docs/assets/js/search.js

@@ -235,6 +235,7 @@ <h3>Type aliases</h3>
 						<section class="tsd-index-section ">
 							<h3>Functions</h3>
 							<ul class="tsd-index-list">
+								<li class="tsd-kind-function"><a href="globals.html#clonedeep" class="tsd-kind-icon">clone<wbr>Deep</a></li>
 								<li class="tsd-kind-function"><a href="globals.html#geterrorcode" class="tsd-kind-icon">get<wbr>Error<wbr>Code</a></li>
 							</ul>
 						</section>
@@ -487,6 +488,26 @@ <h3>Xp<wbr>Thing<wbr>Type</h3>
 			</section>
 			<section class="tsd-panel-group tsd-member-group ">
 				<h2>Functions</h2>
+				<section class="tsd-panel tsd-member tsd-kind-function">
+					<a name="clonedeep" class="tsd-anchor"></a>
+					<h3>clone<wbr>Deep</h3>
+					<ul class="tsd-signatures tsd-kind-function">
+						<li class="tsd-signature tsd-kind-icon">clone<wbr>Deep<span class="tsd-signature-symbol">(</span>obj<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">any</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">any</span></li>
+					</ul>
+					<ul class="tsd-descriptions">
+						<li class="tsd-description">
+							<aside class="tsd-sources">
+							</aside>
+							<h4 class="tsd-parameters-title">Parameters</h4>
+							<ul class="tsd-parameters">
+								<li>
+									<h5>obj: <span class="tsd-signature-type">any</span></h5>
+								</li>
+							</ul>
+							<h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">any</span></h4>
+						</li>
+					</ul>
+				</section>
 				<section class="tsd-panel tsd-member tsd-kind-function">
 					<a name="geterrorcode" class="tsd-anchor"></a>
 					<h3>get<wbr>Error<wbr>Code</h3>
@@ -1035,6 +1056,9 @@ <h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">string</s
 					<li class=" tsd-kind-type-alias">
 						<a href="index.html#xpthingtype" class="tsd-kind-icon">Xp<wbr>Thing<wbr>Type</a>
 					</li>
+					<li class=" tsd-kind-function">
+						<a href="globals.html#clonedeep" class="tsd-kind-icon">clone<wbr>Deep</a>
+					</li>
 					<li class=" tsd-kind-function">
 						<a href="globals.html#geterrorcode" class="tsd-kind-icon">get<wbr>Error<wbr>Code</a>
 					</li>

docs/index.html

@@ -1,7 +1,7 @@
 import { SdkConfiguration } from './models'
 
 class Configuration {
-  private config: SdkConfiguration = {
+  private defaultConfig: SdkConfiguration = {
     baseApiUrl: 'https://api.ordercloud.io',
     apiVersion: 'v1',
     timeoutInMilliseconds: 60 * 1000, // 60 seconds by default
@@ -14,6 +14,7 @@ class Configuration {
       path: '/', // accessible on any path in the domain
     },
   }
+  private config: SdkConfiguration = cloneDeep(this.defaultConfig)
 
   /**
    * @ignore
@@ -25,8 +26,9 @@ class Configuration {
   }
 
   Set(config: SdkConfiguration): void {
-    this.config = { ...this.config, ...(config || {}) }
+    this.config = { ...this.defaultConfig, ...this.config, ...(config || {}) }
     this.config.cookieOptions = {
+      ...this.defaultConfig.cookieOptions,
       ...this.config.cookieOptions,
       ...(config?.cookieOptions || {}),
     }
@@ -37,4 +39,10 @@ class Configuration {
   }
 }
 
+// takes an object and creates a new one with same properties/values
+// useful so we don't mutate original object
+function cloneDeep(obj: any): any {
+  return JSON.parse(JSON.stringify(obj))
+}
+
 export default new Configuration()

src/configuration.ts

@@ -7,23 +7,23 @@ beforeEach(() => {
 })
 
 test('should handle modifying a top level property', () => {
-  const newApiUrl = 'https://sandboxapi.ordercloud.io'
+  const baseApiUrl = 'https://sandboxapi.ordercloud.io'
 
   const expected = cloneDeep(defaultConfig) as SdkConfiguration
-  expected.baseApiUrl = newApiUrl
-  Configuration.Set({ baseApiUrl: newApiUrl })
+  expected.baseApiUrl = baseApiUrl
+  Configuration.Set({ baseApiUrl })
 
-  expect(expected).toMatchObject(Configuration.Get())
+  expect(expected).toStrictEqual(Configuration.Get())
 })
 
 test('should handle modifying a cookie option', () => {
-  const newCookiePrefix = 'myprefix'
+  const prefix = 'myprefix'
 
   const expected = cloneDeep(defaultConfig) as SdkConfiguration
-  expected.cookieOptions.prefix = newCookiePrefix
-  Configuration.Set({ cookieOptions: { prefix: newCookiePrefix } })
+  expected.cookieOptions.prefix = prefix
+  Configuration.Set({ cookieOptions: { prefix } })
 
-  expect(expected).toMatchObject(Configuration.Get())
+  expect(expected).toStrictEqual(Configuration.Get())
 })
 
 // takes an object and creates a new one with same properties/values