Revert "fix: use sameSite: none for iframe compatibility (#334)"

This reverts commit d651361.
okta · Mar 2, 2020 · 4984e8f · 4984e8f
1 parent c410f7d
commit 4984e8f
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,5 @@
 # Changelog
 
-## 2.13.1
-
-### Bug Fixes
-
-- [#334](https://github.com/okta/okta-auth-js/pull/334) - Setting 'SameSite=none' for all cookies (Fix for iFrame)
-
 ## 2.13.0
 
 ### Features

diff --git a/packages/okta-auth-js/lib/browser/browserStorage.js b/packages/okta-auth-js/lib/browser/browserStorage.js
@@ -70,7 +70,7 @@ storageUtil.getSessionStorage = function() {
 storageUtil.getCookieStorage = function(options) {
   options = options || {};
   var secure = options.secure; // currently opt-in
-  var sameSite = options.sameSite || 'none';
+  var sameSite = options.sameSite || 'lax';
   return {
     getItem: storageUtil.storage.get,
     setItem: function(key, value) {

diff --git a/packages/okta-auth-js/lib/token.js b/packages/okta-auth-js/lib/token.js
@@ -644,17 +644,17 @@ function getWithRedirect(sdk, oauthOptions, options) {
         urls: urls,
         ignoreSignature: oauthParams.ignoreSignature
       }), null, {
-        sameSite: 'none'
+        sameSite: 'lax'
       });
 
       // Set nonce cookie for servers to validate nonce in id_token
       cookies.set(constants.REDIRECT_NONCE_COOKIE_NAME, oauthParams.nonce, null, {
-        sameSite: 'none'
+        sameSite: 'lax'
       });
 
       // Set state cookie for servers to validate state
       cookies.set(constants.REDIRECT_STATE_COOKIE_NAME, oauthParams.state, null, {
-        sameSite: 'none'
+        sameSite: 'lax'
       });
 
       sdk.token.getWithRedirect._setLocation(requestUrl);

diff --git a/packages/okta-auth-js/package.json b/packages/okta-auth-js/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@okta/okta-auth-js",
   "description": "The Okta Auth SDK",
-  "version": "2.13.1",
+  "version": "2.13.0",
   "homepage": "https://github.com/okta/okta-auth-js",
   "license": "Apache-2.0",
   "main": "lib/server/serverIndex.js",

diff --git a/packages/okta-auth-js/test/spec/cookies.js b/packages/okta-auth-js/test/spec/cookies.js
@@ -43,11 +43,11 @@ describe('cookie', function () {
 
     it('proxies JsCookie.set with "sameSite" setting',  function ()  {
       Cookies.set('foo', 'bar', null, {
-        sameSite: 'none'
+        sameSite: 'lax'
       });
       expect(JsCookie.set).toHaveBeenCalledWith('foo', 'bar', {
         path: '/',
-        sameSite: 'none'
+        sameSite: 'lax'
       });
     });
   });

diff --git a/packages/okta-auth-js/test/spec/oauthUtil.js b/packages/okta-auth-js/test/spec/oauthUtil.js
@@ -252,7 +252,7 @@ describe('getWellKnown', function() {
         }),
         '2200-01-01T00:00:00.000Z',
         {
-          sameSite: 'none'
+          sameSite: 'lax'
         }
       );
     }

diff --git a/packages/okta-auth-js/test/spec/token.js b/packages/okta-auth-js/test/spec/token.js
@@ -1196,7 +1196,7 @@ describe('token.getWithRedirect', function() {
       oauthUtil.mockedNonce,
       null, // expiresAt
       {
-        sameSite: 'none'
+        sameSite: 'lax'
       }
     ];
 
@@ -1205,7 +1205,7 @@ describe('token.getWithRedirect', function() {
       oauthUtil.mockedState,
       null, // expiresAt
       {
-        sameSite: 'none'
+        sameSite: 'lax'
       }
     ];
   });
@@ -1237,7 +1237,7 @@ describe('token.getWithRedirect', function() {
             ignoreSignature: false
           }),
           null, {
-            sameSite: 'none'
+            sameSite: 'lax'
           }
         ],
         nonceCookie,
@@ -1276,7 +1276,7 @@ describe('token.getWithRedirect', function() {
             ignoreSignature: false
           }),
           null, {
-            sameSite: 'none'
+            sameSite: 'lax'
           }
         ],
         nonceCookie,
@@ -1311,7 +1311,7 @@ describe('token.getWithRedirect', function() {
             ignoreSignature: false
           }),
           null, {
-            sameSite: 'none'
+            sameSite: 'lax'
           }
         ],
         nonceCookie,
@@ -1352,7 +1352,7 @@ describe('token.getWithRedirect', function() {
             ignoreSignature: false
           }),
           null, {
-            sameSite: 'none'
+            sameSite: 'lax'
           }
         ],
         nonceCookie,
@@ -1397,7 +1397,7 @@ describe('token.getWithRedirect', function() {
             ignoreSignature: false
           }),
           null, {
-            sameSite: 'none'
+            sameSite: 'lax'
           }
         ],
         nonceCookie,
@@ -1435,7 +1435,7 @@ describe('token.getWithRedirect', function() {
             ignoreSignature: false
           }),
           null, {
-            sameSite: 'none'
+            sameSite: 'lax'
           }
         ],
         nonceCookie,
@@ -1478,7 +1478,7 @@ describe('token.getWithRedirect', function() {
             ignoreSignature: false
           }),
           null, {
-            sameSite: 'none'
+            sameSite: 'lax'
           }
         ],
         nonceCookie,
@@ -1515,7 +1515,7 @@ describe('token.getWithRedirect', function() {
             ignoreSignature: false
           }),
           null, {
-            sameSite: 'none'
+            sameSite: 'lax'
           }
         ],
         nonceCookie,
@@ -1557,7 +1557,7 @@ describe('token.getWithRedirect', function() {
             ignoreSignature: false
           }),
           null, {
-            sameSite: 'none'
+            sameSite: 'lax'
           }
         ],
         nonceCookie,
@@ -1594,7 +1594,7 @@ describe('token.getWithRedirect', function() {
             ignoreSignature: false
           }),
           null, {
-            sameSite: 'none'
+            sameSite: 'lax'
           }
         ],
         nonceCookie,
@@ -1635,7 +1635,7 @@ describe('token.getWithRedirect', function() {
             ignoreSignature: false
           }),
           null, {
-            sameSite: 'none'
+            sameSite: 'lax'
           }
         ],
         nonceCookie,
@@ -1678,7 +1678,7 @@ describe('token.getWithRedirect', function() {
             ignoreSignature: false
           }),
 null, {
-            sameSite: 'none'
+            sameSite: 'lax'
           }
         ],
         nonceCookie,
@@ -1723,7 +1723,7 @@ null, {
             ignoreSignature: false
           }),
           null, {
-            sameSite: 'none'
+            sameSite: 'lax'
           }
         ],
         nonceCookie,
@@ -1761,7 +1761,7 @@ null, {
             ignoreSignature: false
           }),
           null, {
-            sameSite: 'none'
+            sameSite: 'lax'
           }
         ],
         nonceCookie,
@@ -1803,7 +1803,7 @@ null, {
           ignoreSignature: false
         }),
         null, {
-          sameSite: 'none'
+          sameSite: 'lax'
         }
       ],
       nonceCookie,
@@ -1843,7 +1843,7 @@ null, {
             ignoreSignature: false
           }),
           null, {
-            sameSite: 'none'
+            sameSite: 'lax'
           }
         ],
         nonceCookie,
@@ -1879,7 +1879,7 @@ null, {
             ignoreSignature: false
           }),
           null, {
-            sameSite: 'none'
+            sameSite: 'lax'
           }
         ],
         nonceCookie,
@@ -1915,7 +1915,7 @@ null, {
             ignoreSignature: false
           }),
           null, {
-            sameSite: 'none'
+            sameSite: 'lax'
           }
         ],
         nonceCookie,
@@ -1951,7 +1951,7 @@ null, {
             ignoreSignature: false
           }),
 null, {
-            sameSite: 'none'
+            sameSite: 'lax'
           }
         ],
         nonceCookie,

diff --git a/packages/okta-auth-js/test/spec/tokenManager.js b/packages/okta-auth-js/test/spec/tokenManager.js
@@ -198,7 +198,7 @@ describe('TokenManager', function() {
         'okta-token-storage',
         JSON.stringify({'test-idToken': tokens.standardIdTokenParsed}),
         '2200-01-01T00:00:00.000Z', {
-          sameSite: 'none'
+          sameSite: 'lax'
         }
       );
     });
@@ -221,7 +221,7 @@ describe('TokenManager', function() {
         'okta-token-storage',
         JSON.stringify({'test-idToken': tokens.standardIdTokenParsed}),
         '2200-01-01T00:00:00.000Z', {
-          sameSite: 'none'
+          sameSite: 'lax'
         }
       );
     });
@@ -1242,7 +1242,7 @@ describe('TokenManager', function() {
           'okta-token-storage',
           JSON.stringify({'test-idToken': tokens.standardIdTokenParsed}),
           '2200-01-01T00:00:00.000Z', {
-            sameSite: 'none'
+            sameSite: 'lax'
           }
         );
       });
@@ -1256,7 +1256,7 @@ describe('TokenManager', function() {
           JSON.stringify({'test-idToken': tokens.standardIdTokenParsed}),
           '2200-01-01T00:00:00.000Z', {
             secure: true,
-            sameSite: 'none'
+            sameSite: 'lax'
           }
         );
       });
@@ -1295,7 +1295,7 @@ describe('TokenManager', function() {
           'okta-token-storage',
           JSON.stringify({anotherKey: tokens.standardIdTokenParsed}),
           '2200-01-01T00:00:00.000Z', {
-            sameSite: 'none'
+            sameSite: 'lax'
           }
         );
       });
@@ -1312,7 +1312,7 @@ describe('TokenManager', function() {
           'okta-token-storage',
           '{}',
           '2200-01-01T00:00:00.000Z', {
-            sameSite: 'none'
+            sameSite: 'lax'
           }
         );
       });