fix: assign domain after cookie storage options are given (#528)

dnshi · web-flow · commit 2440e9a03092 · 2022-05-10T22:18:27.000-07:00
* fix: Assign domain after cookie storage options are added

* fix: address comment
diff --git a/src/amplitude-client.js b/src/amplitude-client.js
@@ -141,13 +141,14 @@ AmplitudeClient.prototype.init = function init(apiKey, opt_userId, opt_config, o
     const hasNewCookie = !!this._metadataStorage.load();
     this._useOldCookie = !hasNewCookie && hasOldCookie && !this.options.cookieForceUpgrade;
     const hasCookie = hasNewCookie || hasOldCookie;
-    this.options.domain = this.cookieStorage.options().domain;
 
     if (this.options.deferInitialization && !hasCookie) {
       this._deferInitialization(apiKey, opt_userId, opt_config, opt_callback);
       return;
     }
 
+    this.options.domain = this.cookieStorage.options().domain;
+
     if (type(this.options.logLevel) === 'string') {
       utils.setLogLevel(this.options.logLevel);
     }

Original file line number	Diff line number	Diff line change
`@@ -141,13 +141,14 @@ AmplitudeClient.prototype.init = function init(apiKey, opt_userId, opt_config, o`
`141`	`141`	`const hasNewCookie = !!this._metadataStorage.load();`
`142`	`142`	`this._useOldCookie = !hasNewCookie && hasOldCookie && !this.options.cookieForceUpgrade;`
`143`	`143`	`const hasCookie = hasNewCookie \|\| hasOldCookie;`
`144`		`- this.options.domain = this.cookieStorage.options().domain;`
`145`	`144`
`146`	`145`	`if (this.options.deferInitialization && !hasCookie) {`
`147`	`146`	`this._deferInitialization(apiKey, opt_userId, opt_config, opt_callback);`
`148`	`147`	`return;`
`149`	`148`	`}`
`150`	`149`
	`150`	`+ this.options.domain = this.cookieStorage.options().domain;`
	`151`	`+`
`151`	`152`	`if (type(this.options.logLevel) === 'string') {`
`152`	`153`	`utils.setLogLevel(this.options.logLevel);`
`153`	`154`	`}`