Skip to content
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.

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

Backport of Revert UI: replace localStorage with sessionStorage into release/1.10.x #15773

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions changelog/15769.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
ui: Revert using localStorage in favor of sessionStorage
```
8 changes: 4 additions & 4 deletions ui/app/lib/local-storage.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
export default {
getItem(key) {
var item = window.sessionStorage.getItem(key);
var item = window.localStorage.getItem(key);
return item && JSON.parse(item);
},

setItem(key, val) {
window.sessionStorage.setItem(key, JSON.stringify(val));
window.localStorage.setItem(key, JSON.stringify(val));
},

removeItem(key) {
return window.sessionStorage.removeItem(key);
return window.localStorage.removeItem(key);
},

keys() {
return Object.keys(window.sessionStorage);
return Object.keys(window.localStorage);
},
};
2 changes: 1 addition & 1 deletion ui/app/lib/token-storage.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default function (type) {
}
let storage;
try {
localStorageWrapper.getItem('test');
window.localStorage.getItem('test');
storage = localStorageWrapper;
} catch (e) {
storage = memoryStorage;
Expand Down
2 changes: 1 addition & 1 deletion ui/tests/acceptance/enterprise-control-groups-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ module('Acceptance | Enterprise | control groups', function (hooks) {
await authPage.login(context.userToken);
await settled();
if (shouldStoreToken) {
sessionStorage.setItem(
localStorage.setItem(
storageKey(accessor, 'kv/foo'),
JSON.stringify({
accessor,
Expand Down
2 changes: 1 addition & 1 deletion ui/tests/acceptance/redirect-to-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ module('Acceptance | redirect_to query param functionality', function (hooks) {
// normally we'd use the auth.logout helper to visit the route and reset the app, but in this case that
// also routes us to the auth page, and then all of the transitions from the auth page get redirected back
// to the auth page resulting in no redirect_to query param being set
sessionStorage.clear();
localStorage.clear();
});
test('redirect to a route after authentication', async function (assert) {
let url = '/vault/secrets/secret/create';
Expand Down