Skip to content

Commit

Permalink
Use secure localStorage in browser (requires npm i) (refs alastria#76)
Browse files Browse the repository at this point in the history
  • Loading branch information
Rafael Barriuso committed Oct 17, 2020
1 parent 4971d03 commit 000c67a
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 19 deletions.
19 changes: 19 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"hammerjs": "^2.0.8",
"ngx-qrcode2": "0.0.9",
"rxjs": "^6.5.5",
"secure-ls": "^1.2.6",
"web3": "1.2.4",
"zone.js": "~0.9.1"
},
Expand Down
39 changes: 20 additions & 19 deletions src/app/services/securedStorage.service.ts
Original file line number Diff line number Diff line change
@@ -1,40 +1,41 @@
import { Injectable } from '@angular/core';
import { SecureStorageEcho, SecureStorageEchoObject } from '@ionic-native/secure-storage-echo/ngx';

import * as SecureLS from 'secure-ls';
import { AppConfig } from '../../app.config';

class LocalStorageWrapper {
interface ISecureStorage {
get(key: string): Promise<string>;
set(key: string, value: string): Promise<any>;
remove(key: string): Promise<string>;
keys(): Promise<string[]>;
clear(): Promise<any>;
secureDevice(): Promise<any>;
}

class SecureLsWrapper implements ISecureStorage {

private readonly PREFIX = '__SS__';
private readonly secureLs = new SecureLS({encodingType: 'aes'});

get(key: string): Promise<string> {
return Promise.resolve(localStorage.getItem(this.PREFIX + key));
return Promise.resolve(this.secureLs.get(key));
}

set(key: string, value: string): Promise<any> {
return Promise.resolve(localStorage.setItem(this.PREFIX + key, value));
return Promise.resolve(this.secureLs.set(key, value));
}

remove(key: string): Promise<string> {
localStorage.removeItem(this.PREFIX + key);
this.secureLs.remove(key);
return Promise.resolve(key);
}

keys(): Promise<string[]> {
const ret = new Array<string>();
for(let i = 0; i < localStorage.length; ++i) {
ret.push(localStorage.key(i));
}
return Promise.resolve(ret.filter(key => key && key.indexOf(this.PREFIX) === 0));
return Promise.resolve(this.secureLs.getAllKeys());
}

clear(): Promise<any> {
for(let i = 0; i < localStorage.length; ++i) {
const key = localStorage.key(i);
if(key && key.indexOf(this.PREFIX) === 0) {
localStorage.removeItem(key);
}
}
this.secureLs.removeAll();
return Promise.resolve();
}

Expand All @@ -49,7 +50,7 @@ class LocalStorageWrapper {
})
export class SecuredStorageService {

private securedStorageObject: SecureStorageEchoObject;
private securedStorageObject: ISecureStorage;

constructor(
private securedStorage: SecureStorageEcho
Expand All @@ -61,8 +62,8 @@ export class SecuredStorageService {
.then(ssObj => {
this.securedStorageObject = ssObj;
}).catch(err => {
console.log('WARNING: Secure storage not available, falling back to localStorage. Err: ', err);
this.securedStorageObject = new LocalStorageWrapper() as unknown as SecureStorageEchoObject;
console.log('WARNING: Secure storage not available, falling back to SecureLS. Err: ', err);
this.securedStorageObject = new SecureLsWrapper();
});
}

Expand Down

0 comments on commit 000c67a

Please sign in to comment.