Skip to content

fix: wait to create cookie storage based on user options in init() #579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 16, 2023
Merged

fix: wait to create cookie storage based on user options in init() #579

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3edc1b
fix: wait to create cookie storage based on user options in init()
justin-fiedler Feb 16, 2023
a96f993
chore: add test for disableCookies cookie creation
justin-fiedler Feb 16, 2023
562e908
chore: add test for disableCookies=false cookie creation
justin-fiedler Feb 16, 2023
47adb72
chore: remove duplicated test
justin-fiedler Feb 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/amplitude-client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ var AmplitudeClient = function AmplitudeClient(instanceName) {
plan: { ...DEFAULT_OPTIONS.plan },
trackingOptions: { ...DEFAULT_OPTIONS.trackingOptions },
};
this.cookieStorage = new cookieStorage().getStorage();
this._q = []; // queue for proxied functions before script load
this._sending = false;
this._updateScheduled = false;
Expand Down Expand Up @@ -127,6 +126,7 @@ AmplitudeClient.prototype.init = function init(apiKey, opt_userId, opt_config, o

this._cookieName = Constants.COOKIE_PREFIX + '_' + this._storageSuffixV5;

this.cookieStorage = new cookieStorage().getStorage(this.options.disableCookies);
this.cookieStorage.options({
expirationDays: this.options.cookieExpiration,
domain: this.options.domain,
Expand Down
4 changes: 2 additions & 2 deletions src/cookiestorage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ var cookieStorage = function () {
this.storage = null;
};

cookieStorage.prototype.getStorage = function () {
cookieStorage.prototype.getStorage = function (disableCookies) {
if (this.storage !== null) {
return this.storage;
}

if (baseCookie.areCookiesEnabled()) {
if (!disableCookies && baseCookie.areCookiesEnabled()) {
this.storage = Cookie;
} else {
// if cookies disabled, fallback to localstorage
Expand Down
4 changes: 2 additions & 2 deletions test/amplitude-client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,11 +888,11 @@ describe('AmplitudeClient', function () {
var onErrorSpy = sinon.spy();

var amplitude = new AmplitudeClient();
sinon.stub(amplitude.cookieStorage, 'options').throws();
sinon.stub(amplitude, '_refreshDynamicConfig').throws();
amplitude.init(apiKey, null, { onError: onErrorSpy });
assert.isTrue(onErrorSpy.calledOnce);

amplitude.cookieStorage.options.restore();
amplitude['_refreshDynamicConfig'].restore();
});

it('should set observer plan options', function () {
Expand Down