@amplitude/analytics-client-common - npm Package Compare versions

Comparing version 2.2.3 to 2.2.4

lib/cjs/storage/cookie.js

@@ -46,9 +46,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
     CookieStorage.prototype.get = function (key) {
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var value;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
+            var value, decodedValue;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
                     case 0: return [4 /*yield*/, this.getRaw(key)];
                     case 1:
-                        value = _a.sent();
+                        value = _b.sent();
                         if (!value) {
@@ -58,10 +59,9 @@ return [2 /*return*/, undefined];
                         try {
-                            try {
-                                value = decodeURIComponent(atob(value));
-                            }
-                            catch (_b) {
+                            decodedValue = (_a = decodeCookiesAsDefault(value)) !== null && _a !== void 0 ? _a : decodeCookiesWithDoubleUrlEncoding(value);
+                            if (decodedValue === undefined) {
                                 console.error("Amplitude Logger [Error]: Failed to decode cookie value for key: ".concat(key, ", value: ").concat(value));
+                                return [2 /*return*/, undefined];
                             }
                             // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-                            return [2 /*return*/, JSON.parse(value)];
+                            return [2 /*return*/, JSON.parse(decodedValue)];
                         }
@@ -155,2 +155,20 @@ catch (_c) {
 exports.CookieStorage = CookieStorage;
+var decodeCookiesAsDefault = function (value) {
+    try {
+        return decodeURIComponent(atob(value));
+    }
+    catch (_a) {
+        return undefined;
+    }
+};
+var decodeCookiesWithDoubleUrlEncoding = function (value) {
+    // Modern Ruby (v7+) automatically encodes cookies with URL encoding by
+    // https://api.rubyonrails.org/classes/ActionDispatch/Cookies.html
+    try {
+        return decodeURIComponent(atob(decodeURIComponent(value)));
+    }
+    catch (_a) {
+        return undefined;
+    }
+};
 //# sourceMappingURL=cookie.js.map

lib/esm/storage/cookie.js

@@ -44,9 +44,10 @@ import { __assign, __awaiter, __generator } from "tslib";
     CookieStorage.prototype.get = function (key) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var value;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var value, decodedValue;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0: return [4 /*yield*/, this.getRaw(key)];
                     case 1:
-                        value = _a.sent();
+                        value = _b.sent();
                         if (!value) {
@@ -56,10 +57,9 @@ return [2 /*return*/, undefined];
                         try {
-                            try {
-                                value = decodeURIComponent(atob(value));
-                            }
-                            catch (_b) {
+                            decodedValue = (_a = decodeCookiesAsDefault(value)) !== null && _a !== void 0 ? _a : decodeCookiesWithDoubleUrlEncoding(value);
+                            if (decodedValue === undefined) {
                                 console.error("Amplitude Logger [Error]: Failed to decode cookie value for key: ".concat(key, ", value: ").concat(value));
+                                return [2 /*return*/, undefined];
                             }
                             // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-                            return [2 /*return*/, JSON.parse(value)];
+                            return [2 /*return*/, JSON.parse(decodedValue)];
                         }
@@ -153,2 +153,20 @@ catch (_c) {
 export { CookieStorage };
+var decodeCookiesAsDefault = function (value) {
+    try {
+        return decodeURIComponent(atob(value));
+    }
+    catch (_a) {
+        return undefined;
+    }
+};
+var decodeCookiesWithDoubleUrlEncoding = function (value) {
+    // Modern Ruby (v7+) automatically encodes cookies with URL encoding by
+    // https://api.rubyonrails.org/classes/ActionDispatch/Cookies.html
+    try {
+        return decodeURIComponent(atob(decodeURIComponent(value)));
+    }
+    catch (_a) {
+        return undefined;
+    }
+};
 //# sourceMappingURL=cookie.js.map

package.json

 {
   "name": "@amplitude/analytics-client-common",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "description": "",
@@ -46,3 +46,3 @@ "author": "Amplitude Inc",
   ],
-  "gitHead": "58f78b288db20dec13ef0c4381d14916ad4d4811"
+  "gitHead": "bd12b9b751890e3e1b802235a748d729c624866f"
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

226317

increased by1.5%

Lines of code

2074

increased by1.77%

No dependency changes