Skip to content

Extract localStorage wrappers with try/catch #2511

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

Merged
merged 1 commit into from
May 14, 2020
Merged
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
8 changes: 3 additions & 5 deletions app/routes/login.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import { inject as service } from '@ember/service';

import window from 'ember-window-mock';

import * as localStorage from '../utils/local-storage';

/**
* This route will open a popup window directed at the `github-login` route.
* After the window has opened it will wait for the window to close and
Expand All @@ -15,11 +17,7 @@ export default Route.extend({
session: service(),

beforeModel(transition) {
try {
window.localStorage.removeItem('github_response');
} catch (e) {
// ignore error
}
localStorage.removeItem('github_response');

window.github_response = undefined;
let windowDimensions = [
Expand Down
5 changes: 3 additions & 2 deletions app/services/design.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ import { tracked } from '@glimmer/tracking';
import window from 'ember-window-mock';

import config from '../config/environment';
import * as localStorage from '../utils/local-storage';

export default class DesignService extends Service {
@service fastboot;

@tracked useNewDesign = !this.fastboot.isFastBoot && window.localStorage.getItem('use-new-design') === 'true';
@tracked useNewDesign = !this.fastboot.isFastBoot && localStorage.getItem('use-new-design') === 'true';
@tracked showToggleButton = config.environment === 'development';

constructor() {
Expand All @@ -20,6 +21,6 @@ export default class DesignService extends Service {
@action
toggle() {
this.useNewDesign = !this.useNewDesign;
window.localStorage.setItem('use-new-design', String(this.useNewDesign));
localStorage.setItem('use-new-design', String(this.useNewDesign));
}
}
20 changes: 6 additions & 14 deletions app/services/session.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { alias } from '@ember/object/computed';
import Service, { inject as service } from '@ember/service';

import { task } from 'ember-concurrency';
import window from 'ember-window-mock';

import ajax from '../utils/ajax';
import * as localStorage from '../utils/local-storage';

export default class SessionService extends Service {
@service store;
Expand All @@ -16,22 +16,14 @@ export default class SessionService extends Service {
@alias('loadUserTask.last.value.ownedCrates') ownedCrates;

get isLoggedIn() {
try {
return window.localStorage.getItem('isLoggedIn') === '1';
} catch (e) {
return false;
}
return localStorage.getItem('isLoggedIn') === '1';
}

set isLoggedIn(value) {
try {
if (value) {
window.localStorage.setItem('isLoggedIn', '1');
} else {
window.localStorage.removeItem('isLoggedIn');
}
} catch (e) {
// ignore error
if (value) {
localStorage.setItem('isLoggedIn', '1');
} else {
localStorage.removeItem('isLoggedIn');
}
}

Expand Down
25 changes: 25 additions & 0 deletions app/utils/local-storage.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import window from 'ember-window-mock';

export function getItem(key) {
try {
return window.localStorage.getItem(key);
} catch (e) {
return null;
}
}

export function setItem(key, value) {
try {
window.localStorage.setItem(key, value);
} catch (e) {
// ignored
}
}

export function removeItem(key) {
try {
window.localStorage.removeItem(key);
} catch (e) {
// ignored
}
}