Mirroristas/gun
2
0
Fork 0
mirror of https://github.com/amark/gun.git synced 2025-06-07 22:56:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed SEA tests for enc/dec & refactored common.js for revised server imports

Browse Source
This commit is contained in:
mhelander 2017-09-16 00:43:45 +03:00
parent b90640d3dc
commit 47dc30f098
5 changed files with 115 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -53,6 +53,7 @@
"ws": "~>2.2.3" "ws": "~>2.2.3"
}, },
"devDependencies": { "devDependencies": {
"@trust/webcrypto": "^0.5.0",
"buffer": "^5.0.7", "buffer": "^5.0.7",
"eccrypto": "^1.0.3", "eccrypto": "^1.0.3",
"express": ">=4.15.2", "express": ">=4.15.2",
@ -63,7 +64,6 @@
"node-localstorage": "^1.3.0", "node-localstorage": "^1.3.0",
"panic-manager": "^1.2.0", "panic-manager": "^1.2.0",
"panic-server": "^1.1.0", "panic-server": "^1.1.0",
"subtle": "^0.1.8",
"text-encoding": "^0.6.4", "text-encoding": "^0.6.4",
"uglify-js": ">=2.8.22", "uglify-js": ">=2.8.22",
"uws": "~>0.14.1" "uws": "~>0.14.1"

21
sea.js
View File

@ -35,7 +35,7 @@
indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB
|| window.msIndexedDB || window.shimIndexedDB; || window.msIndexedDB || window.shimIndexedDB;
} else { } else {
subtle = require('subtle'); // Web Cryptography API for NodeJS subtle = require('@trust/webcrypto').subtle;
getRandomBytes = function(len){ return crypto.randomBytes(len) }; getRandomBytes = function(len){ return crypto.randomBytes(len) };
TextEncoder = require('text-encoding').TextEncoder; TextEncoder = require('text-encoding').TextEncoder;
TextDecoder = require('text-encoding').TextDecoder; TextDecoder = require('text-encoding').TextDecoder;
@ -840,7 +840,6 @@
var r = {iv: iv.toString('hex'), s: s.toString('hex')}; var r = {iv: iv.toString('hex'), s: s.toString('hex')};
var key = makeKey(p, s); var key = makeKey(p, s);
m = (m.slice && m) || JSON.stringify(m); m = (m.slice && m) || JSON.stringify(m);
if(typeof window !== 'undefined'){ // Browser doesn't run createCipheriv
subtle.importKey('raw', key, 'AES-CBC', false, ['encrypt']) subtle.importKey('raw', key, 'AES-CBC', false, ['encrypt'])
.then(function(aesKey){ .then(function(aesKey){
key = getRandomBytes(key.length); key = getRandomBytes(key.length);
@ -852,14 +851,6 @@
return JSON.stringify(r); return JSON.stringify(r);
}).then(resolve).catch(function(e){ Gun.log(e); reject(e) }); }).then(resolve).catch(function(e){ Gun.log(e); reject(e) });
}).catch(function(e){ Gun.log(e); reject(e)} ); }).catch(function(e){ Gun.log(e); reject(e)} );
} else { // NodeJS doesn't support subtle.importKey properly
try{
var cipher = crypto.createCipheriv(aes.enc, key, iv);
r.ct = cipher.update(m, 'utf8', 'base64') + cipher.final('base64');
key = getRandomBytes(key.length);
}catch(e){ Gun.log(e); return reject(e) }
resolve(JSON.stringify(r));
}
}; };
if(cb){doIt(cb, function(){cb()})} else { return new Promise(doIt) } if(cb){doIt(cb, function(){cb()})} else { return new Promise(doIt) }
}; };
@ -868,7 +859,6 @@
try{ m = m.slice ? JSON.parse(m) : m }catch(e){} //eslint-disable-line no-empty try{ m = m.slice ? JSON.parse(m) : m }catch(e){} //eslint-disable-line no-empty
var key = makeKey(p, new Buffer(m.s, 'hex')); var key = makeKey(p, new Buffer(m.s, 'hex'));
var iv = new Buffer(m.iv, 'hex'); var iv = new Buffer(m.iv, 'hex');
if(typeof window !== 'undefined'){ // Browser doesn't run createDecipheriv
subtle.importKey('raw', key, 'AES-CBC', false, ['decrypt']) subtle.importKey('raw', key, 'AES-CBC', false, ['decrypt'])
.then(function(aesKey){ .then(function(aesKey){
key = getRandomBytes(key.length); key = getRandomBytes(key.length);
@ -881,15 +871,6 @@
}catch(e){ return ctUtf8 } }catch(e){ return ctUtf8 }
}).then(resolve).catch(function(e){Gun.log(e); reject(e)}); }).then(resolve).catch(function(e){Gun.log(e); reject(e)});
}).catch(function(e){Gun.log(e); reject(e)}); }).catch(function(e){Gun.log(e); reject(e)});
} else { // NodeJS doesn't support subtle.importKey properly
var r;
try{
var decipher = crypto.createDecipheriv(aes.enc, key, iv);
r = decipher.update(m.ct, 'base64', 'utf8') + decipher.final('utf8');
key = getRandomBytes(key.length);
}catch(e){ Gun.log(e); return reject(e) }
resolve(r);
}
}; };
if(cb){doIt(cb, function(){cb()})} else { return new Promise(doIt) } if(cb){doIt(cb, function(){cb()})} else { return new Promise(doIt) }
}; };

19
test/common.js
View File

@ -1,3 +1,8 @@
/* global Gun,describe,expect,it */
/*eslint max-len: ["error", 95, { "ignoreComments": true }]*/
/*eslint semi: ["error", "always", { "omitLastInOneLineBlock": true}]*/
/*eslint object-curly-spacing: ["error", "never"]*/
/*eslint node/no-deprecated-api: [error, {ignoreModuleItems: ["new buffer.Buffer()"]}] */
var root; var root;
(function(env){ (function(env){
root = env.window? env.window : global; root = env.window? env.window : global;
@ -9,7 +14,7 @@ var root;
root.localStorage = new require('node-localstorage').LocalStorage('local'); root.localStorage = new require('node-localstorage').LocalStorage('local');
} }
root.localStorage.clear(); root.localStorage.clear();
try{ require('fs').unlinkSync('data.json') }catch(e){} try{ require('fs').unlinkSync('data.json') }catch(e){} //eslint-disable-line no-empty
//root.Gun = root.Gun || require('../gun'); //root.Gun = root.Gun || require('../gun');
if(root.Gun){ if(root.Gun){
root.Gun = root.Gun; root.Gun = root.Gun;
@ -17,20 +22,12 @@ var root;
root.Gun.SEA = require('../sea'); root.Gun.SEA = require('../sea');
} }
} else { } else {
root.Gun = require('../gun'); root.Gun = require('./index');
if (process.env.SEA) {
Gun.SEA = require('../sea');
}
Gun.serve = require('../lib/serve');
//require('./s3');
//require('./uws');
//require('./wsp/server');
require('../lib/file');
} }
}(this)); }(this));
//Gun.log.squelch = true; //Gun.log.squelch = true;
var gleak = {globals: {}, check: function(){ // via tobyho var gleak = {globals: {}, check: function(){ // via tobyho
var leaked = [] var leaked = [];
for (var key in gleak.globe){ if (!(key in gleak.globals)){ leaked.push(key)} } for (var key in gleak.globe){ if (!(key in gleak.globals)){ leaked.push(key)} }
if (leaked.length > 0){ console.log("GLOBAL LEAK!", leaked); return leaked } if (leaked.length > 0){ console.log("GLOBAL LEAK!", leaked); return leaked }
}}; }};

16
test/index.js Normal file
View File

@ -0,0 +1,16 @@
// Let's do all old-fashion require stuff before '@std/mjs' steps in...
const Gun = require('../gun')
if (process.env.SEA) {
Gun.SEA = require('../sea')
}
require('../lib/file')
const myDir = __dirname // TODO: where did __dirname go ?
// From here on we're ES6 import compatible...
require = require('@std/esm')(module) // eslint-disable-line no-global-assign
module.exports = require('../lib/server.mjs').default(Gun, myDir)

134
test/sea.js
View File

@ -1,3 +1,8 @@
/* global Gun,describe,expect,it,beforeEach */
/*eslint max-len: ["error", 95, { "ignoreComments": true }]*/
/*eslint semi: ["error", "always", { "omitLastInOneLineBlock": true}]*/
/*eslint object-curly-spacing: ["error", "never"]*/
/*eslint node/no-deprecated-api: [error, {ignoreModuleItems: ["new buffer.Buffer()"]}] */
var root; var root;
(function(env){ (function(env){
@ -19,7 +24,7 @@ Gun.SEA && describe('SEA', function(){
expect(proof).to.not.be(undefined); expect(proof).to.not.be(undefined);
expect(proof).to.not.be(''); expect(proof).to.not.be('');
done(); done();
} };
// proof - generates PBKDF2 hash from user's alias and password // proof - generates PBKDF2 hash from user's alias and password
// which is then used to decrypt user's auth record // which is then used to decrypt user's auth record
if(type === 'callback'){ if(type === 'callback'){
@ -44,17 +49,16 @@ Gun.SEA && describe('SEA', function(){
if(type === 'callback'){ if(type === 'callback'){
Gun.SEA.pair(check); Gun.SEA.pair(check);
} else { } else {
Gun.SEA.pair().then(check).catch(done);; Gun.SEA.pair().then(check).catch(done);
} }
}); });
it('en', function(done){ it('enc', function(done){
Gun.SEA.pair().then(function(key){ Gun.SEA.pair().then(function(key){
var check = function(jsonSecret){ var check = function(jsonSecret){
expect(jsonSecret).to.not.be(undefined); expect(jsonSecret).to.not.be(undefined);
expect(jsonSecret).to.not.be(''); expect(jsonSecret).to.not.be('');
expect(jsonSecret).to.not.eql(clearText); expect(jsonSecret).to.not.eql(clearText);
expect(jsonSecret).to.not.eql(JSON.stringify(clearText));
var objSecret = JSON.parse(jsonSecret); var objSecret = JSON.parse(jsonSecret);
expect(objSecret).to.have.keys(encKeys); expect(objSecret).to.have.keys(encKeys);
encKeys.map(function(key){ encKeys.map(function(key){
@ -65,9 +69,9 @@ Gun.SEA && describe('SEA', function(){
}; };
// en - encrypts JSON data using user's private or derived ECDH key // en - encrypts JSON data using user's private or derived ECDH key
if(type === 'callback'){ if(type === 'callback'){
Gun.SEA.en(JSON.stringify(clearText), key.priv, check); Gun.SEA.enc(clearText, key.priv, check);
} else { } else {
Gun.SEA.en(JSON.stringify(clearText), key.priv).then(check); Gun.SEA.enc(clearText, key.priv).then(check);
} }
}).catch(function(e){done(e)}); }).catch(function(e){done(e)});
}); });
@ -108,24 +112,20 @@ Gun.SEA && describe('SEA', function(){
}).catch(function(e){done(e)}); }).catch(function(e){done(e)});
}); });
it('de', function(done){ it('dec', function(done){
Gun.SEA.pair().then(function(key){ Gun.SEA.pair().then(function(key){
var check = function(jsonText){ var check = function(decText){
expect(jsonText).to.not.be(undefined); expect(decText).to.not.be(undefined);
expect(jsonText).to.not.be(''); expect(decText).to.not.be('');
expect(jsonText).to.not.eql(clearText); expect(decText).to.be.eql(clearText);
var decryptedSecret = JSON.parse(jsonText);
expect(decryptedSecret).to.not.be(undefined);
expect(decryptedSecret).to.not.be('');
expect(decryptedSecret).to.be.eql(clearText);
done(); done();
}; };
Gun.SEA.en(JSON.stringify(clearText), key.priv).then(function(jsonSecret){ Gun.SEA.enc(clearText, key.priv).then(function(jsonSecret){
// de - decrypts JSON data using user's private or derived ECDH key // de - decrypts JSON data using user's private or derived ECDH key
if(type === 'callback'){ if(type === 'callback'){
Gun.SEA.de(jsonSecret, key.priv, check); Gun.SEA.dec(jsonSecret, key.priv, check);
} else { } else {
Gun.SEA.de(jsonSecret, key.priv).then(check); Gun.SEA.dec(jsonSecret, key.priv).then(check);
} }
}); });
}).catch(function(e){done(e)}); }).catch(function(e){done(e)});
@ -134,7 +134,7 @@ Gun.SEA && describe('SEA', function(){
it('derive', function(done){ it('derive', function(done){
Gun.SEA.pair().then(function(txKey){ Gun.SEA.pair().then(function(txKey){
return Gun.SEA.pair().then(function(rxKey){ return Gun.SEA.pair().then(function(rxKey){
return { tx: txKey, rx: rxKey }; return {tx: txKey, rx: rxKey};
}); });
}).then(function(keys){ }).then(function(keys){
var check = function(shared){ var check = function(shared){
@ -223,7 +223,7 @@ Gun().user && describe('Gun', function(){
if(wipeStorageData){ if(wipeStorageData){
// ... and persisted session // ... and persisted session
localStorage.removeItem('remember') localStorage.removeItem('remember');
sessionStorage.removeItem('remember'); sessionStorage.removeItem('remember');
sessionStorage.removeItem('alias'); sessionStorage.removeItem('alias');
} }
@ -245,7 +245,7 @@ Gun().user && describe('Gun', function(){
expect(ack).to.not.be(undefined); expect(ack).to.not.be(undefined);
expect(ack).to.not.be(''); expect(ack).to.not.be('');
expect(ack).to.have.keys([ 'ok', 'pub' ]); expect(ack).to.have.keys([ 'ok', 'pub' ]);
}catch(e){ done(e); return }; }catch(e){ done(e); return }
done(); done();
}; };
// Gun.user.create - creates new user // Gun.user.create - creates new user
@ -266,7 +266,7 @@ Gun().user && describe('Gun', function(){
expect(ack.err).not.to.be(undefined); expect(ack.err).not.to.be(undefined);
expect(ack.err).not.to.be(''); expect(ack.err).not.to.be('');
expect(ack.err.toLowerCase().indexOf('already created')).not.to.be(-1); expect(ack.err.toLowerCase().indexOf('already created')).not.to.be(-1);
}catch(e){ done(e); return }; }catch(e){ done(e); return }
done(); done();
}; };
// Gun.user.create - fails to create existing user // Gun.user.create - fails to create existing user
@ -301,7 +301,7 @@ Gun().user && describe('Gun', function(){
expect(ack).to.not.be(undefined); expect(ack).to.not.be(undefined);
expect(ack).to.not.be(''); expect(ack).to.not.be('');
expect(ack).to.not.have.key('err'); expect(ack).to.not.have.key('err');
}catch(e){ done(e); return }; }catch(e){ done(e); return }
done(); done();
}; };
// Gun.user.auth - authenticates existing user // Gun.user.auth - authenticates existing user
@ -322,7 +322,7 @@ Gun().user && describe('Gun', function(){
expect(ack.err).to.not.be(''); expect(ack.err).to.not.be('');
expect(ack.err.toLowerCase().indexOf('failed to decrypt secret')) expect(ack.err.toLowerCase().indexOf('failed to decrypt secret'))
.not.to.be(-1); .not.to.be(-1);
}catch(e){ done(e); return }; }catch(e){ done(e); return }
done(); done();
}; };
if(type === 'callback'){ if(type === 'callback'){
@ -343,7 +343,7 @@ Gun().user && describe('Gun', function(){
expect(ack.err).to.not.be(undefined); expect(ack.err).to.not.be(undefined);
expect(ack.err).to.not.be(''); expect(ack.err).to.not.be('');
expect(ack.err.toLowerCase().indexOf('no user')).not.to.be(-1); expect(ack.err.toLowerCase().indexOf('no user')).not.to.be(-1);
}catch(e){ done(e); return }; }catch(e){ done(e); return }
done(); done();
}; };
if(type === 'callback'){ if(type === 'callback'){
@ -361,7 +361,7 @@ Gun().user && describe('Gun', function(){
expect(ack).to.not.be(undefined); expect(ack).to.not.be(undefined);
expect(ack).to.not.be(''); expect(ack).to.not.be('');
expect(ack).to.not.have.key('err'); expect(ack).to.not.have.key('err');
}catch(e){ done(e); return }; }catch(e){ done(e); return }
done(); done();
}; };
// Gun.user.auth - with newpass props sets new password // Gun.user.auth - with newpass props sets new password
@ -383,10 +383,9 @@ Gun().user && describe('Gun', function(){
expect(ack.err).to.not.be(''); expect(ack.err).to.not.be('');
expect(ack.err.toLowerCase().indexOf('failed to decrypt secret')) expect(ack.err.toLowerCase().indexOf('failed to decrypt secret'))
.not.to.be(-1); .not.to.be(-1);
}catch(e){ done(e); return }; }catch(e){ done(e); return }
done(); done();
}; };
var props = {alias: alias+type, pass: pass+'not', newpass: pass+' new'};
if(type === 'callback'){ if(type === 'callback'){
user.auth(alias+type, pass+'not', check, {newpass: pass+' new'}); user.auth(alias+type, pass+'not', check, {newpass: pass+' new'});
} else { } else {
@ -420,7 +419,7 @@ Gun().user && describe('Gun', function(){
expect(ack).to.not.have.key('err'); expect(ack).to.not.have.key('err');
expect(ack).to.have.key('ok'); expect(ack).to.have.key('ok');
expect(gun.back(-1)._.user).to.not.have.keys([ 'sea', 'pub' ]); expect(gun.back(-1)._.user).to.not.have.keys([ 'sea', 'pub' ]);
}catch(e){ done(e); return }; }catch(e){ done(e); return }
done(); done();
}; };
var usr = alias+type+'leave'; var usr = alias+type+'leave';
@ -434,7 +433,7 @@ Gun().user && describe('Gun', function(){
expect(usr).to.not.be(''); expect(usr).to.not.be('');
expect(usr).to.not.have.key('err'); expect(usr).to.not.have.key('err');
expect(usr).to.have.key('put'); expect(usr).to.have.key('put');
}catch(e){ done(e); return }; }catch(e){ done(e); return }
// Gun.user.leave - performs logout for authenticated user // Gun.user.leave - performs logout for authenticated user
if(type === 'callback'){ if(type === 'callback'){
user.leave(check); user.leave(check);
@ -452,7 +451,7 @@ Gun().user && describe('Gun', function(){
expect(ack).to.not.be(''); expect(ack).to.not.be('');
expect(ack).to.not.have.key('err'); expect(ack).to.not.have.key('err');
expect(ack).to.have.key('ok'); expect(ack).to.have.key('ok');
}catch(e){ done(e); return }; }catch(e){ done(e); return }
done(); done();
}; };
expect(gun.back(-1)._.user).to.not.have.keys([ 'sea', 'pub' ]); expect(gun.back(-1)._.user).to.not.have.keys([ 'sea', 'pub' ]);
@ -483,7 +482,7 @@ Gun().user && describe('Gun', function(){
expect(ack).to.not.have.key('err'); expect(ack).to.not.have.key('err');
expect(ack).to.have.key('ok'); expect(ack).to.have.key('ok');
expect(gun.back(-1)._.user).to.not.have.keys([ 'sea', 'pub' ]); expect(gun.back(-1)._.user).to.not.have.keys([ 'sea', 'pub' ]);
}catch(e){ done(e); return }; }catch(e){ done(e); return }
done(); done();
}; };
}; };
@ -496,7 +495,7 @@ Gun().user && describe('Gun', function(){
expect(ack).to.not.be(''); expect(ack).to.not.be('');
expect(ack).to.not.have.key('err'); expect(ack).to.not.have.key('err');
expect(ack).to.have.key('put'); expect(ack).to.have.key('put');
}catch(e){ done(e); return }; }catch(e){ done(e); return }
// Gun.user.delete - deletes existing user account // Gun.user.delete - deletes existing user account
if(type === 'callback'){ if(type === 'callback'){
user.delete(usr, pass, check(done)); user.delete(usr, pass, check(done));
@ -526,7 +525,7 @@ Gun().user && describe('Gun', function(){
expect(ack).to.not.have.key('put'); expect(ack).to.not.have.key('put');
expect(ack).to.have.key('err'); expect(ack).to.have.key('err');
expect(ack.err.toLowerCase().indexOf('no user')).not.to.be(-1); expect(ack.err.toLowerCase().indexOf('no user')).not.to.be(-1);
}catch(e){ done(e); return }; }catch(e){ done(e); return }
done(); done();
}; };
if(type === 'callback'){ if(type === 'callback'){
@ -578,7 +577,7 @@ Gun().user && describe('Gun', function(){
var remember = hasPin ? localStorage.getItem('remember') var remember = hasPin ? localStorage.getItem('remember')
: sessionStorage.getItem('remember'); : sessionStorage.getItem('remember');
return Gun.SEA.read(remember, usr._.pub).then(function(props){ return Gun.SEA.read(remember, usr._.pub).then(function(props){
try{ props && (props = JSON.parse(props)) }catch(e){} try{ props && (props = JSON.parse(props)) }catch(e){} //eslint-disable-line no-empty
return props; return props;
}).then(manipulate).then(function(props){ }).then(manipulate).then(function(props){
expect(props).to.not.be(undefined); expect(props).to.not.be(undefined);
@ -593,13 +592,13 @@ Gun().user && describe('Gun', function(){
it('with PIN auth session stored to localStorage', function(done){ it('with PIN auth session stored to localStorage', function(done){
var doAction = function(){ var doAction = function(){
user.auth(alias+type, pass+' new', { pin: 'PIN' }) user.auth(alias+type, pass+' new', {pin: 'PIN'})
.then(doCheck(done, true)).catch(done); .then(doCheck(done, true)).catch(done);
}; };
if(type === 'callback'){ if(type === 'callback'){
user.recall(doAction, { session: false }); user.recall(doAction, {session: false});
} else { } else {
user.recall({ session: false }).then(doAction).catch(done) user.recall({session: false}).then(doAction).catch(done);
} }
}); });
@ -609,9 +608,9 @@ Gun().user && describe('Gun', function(){
}; };
user.leave().then(function(){ user.leave().then(function(){
if(type === 'callback'){ if(type === 'callback'){
user.recall(doAction, { session: false }); user.recall(doAction, {session: false});
} else { } else {
user.recall({ session: false }).then(doAction).catch(done) user.recall({session: false}).then(doAction).catch(done);
} }
}).catch(done); }).catch(done);
}); });
@ -654,14 +653,14 @@ Gun().user && describe('Gun', function(){
sUser = root.sessionStorage.getItem('user'); sUser = root.sessionStorage.getItem('user');
sRemember = root.sessionStorage.getItem('remember'); sRemember = root.sessionStorage.getItem('remember');
}catch(e){ done(e); return }; }catch(e){ done(e); return }
user.leave().then(function(ack){ user.leave().then(function(ack){
try{ try{
expect(ack).to.have.key('ok'); expect(ack).to.have.key('ok');
expect(gun.back(-1)._.user).to.not.have.keys([ 'sea', 'pub' ]); expect(gun.back(-1)._.user).to.not.have.keys([ 'sea', 'pub' ]);
expect(root.sessionStorage.getItem('user')).to.not.be(sUser); expect(root.sessionStorage.getItem('user')).to.not.be(sUser);
expect(root.sessionStorage.getItem('remember')).to.not.be(sRemember); expect(root.sessionStorage.getItem('remember')).to.not.be(sRemember);
}catch(e){ done(e); return }; }catch(e){ done(e); return }
root.sessionStorage.setItem('user', sUser); root.sessionStorage.setItem('user', sUser);
root.sessionStorage.setItem('remember', sRemember); root.sessionStorage.setItem('remember', sRemember);
@ -673,7 +672,7 @@ Gun().user && describe('Gun', function(){
}); });
it('valid localStorage session bootstrap', function(done){ it('valid localStorage session bootstrap', function(done){
user.auth(alias+type, pass+' new', { pin: 'PIN' }).then(function(usr){ user.auth(alias+type, pass+' new', {pin: 'PIN'}).then(function(usr){
var sUser; var sUser;
var sRemember; var sRemember;
var lRemember; var lRemember;
@ -691,7 +690,7 @@ Gun().user && describe('Gun', function(){
sUser = root.sessionStorage.getItem('user'); sUser = root.sessionStorage.getItem('user');
sRemember = root.sessionStorage.getItem('remember'); sRemember = root.sessionStorage.getItem('remember');
lRemember = root.localStorage.getItem('remember'); lRemember = root.localStorage.getItem('remember');
}catch(e){ done(e); return }; }catch(e){ done(e); return }
user.leave().then(function(ack){ user.leave().then(function(ack){
try{ try{
@ -700,7 +699,7 @@ Gun().user && describe('Gun', function(){
expect(root.sessionStorage.getItem('user')).to.not.be(sUser); expect(root.sessionStorage.getItem('user')).to.not.be(sUser);
expect(root.sessionStorage.getItem('remember')).to.not.be(sRemember); expect(root.sessionStorage.getItem('remember')).to.not.be(sRemember);
expect(root.localStorage.getItem('remember')).to.not.be(lRemember); expect(root.localStorage.getItem('remember')).to.not.be(lRemember);
}catch(e){ done(e); return }; }catch(e){ done(e); return }
root.sessionStorage.setItem('user', sUser); root.sessionStorage.setItem('user', sUser);
root.sessionStorage.setItem('remember', sRemember); root.sessionStorage.setItem('remember', sRemember);
@ -714,7 +713,7 @@ Gun().user && describe('Gun', function(){
it('valid localStorage session bootstraps using PIN', function(done){ it('valid localStorage session bootstraps using PIN', function(done){
user.recall(12 * 60, {session: false}).then(function(){ user.recall(12 * 60, {session: false}).then(function(){
return user.auth(alias+type, pass+' new', { pin: 'PIN' }); return user.auth(alias+type, pass+' new', {pin: 'PIN'});
}).then(doCheck(function(){ }).then(doCheck(function(){
// Let's save remember props // Let's save remember props
var sUser = root.sessionStorage.getItem('user'); var sUser = root.sessionStorage.getItem('user');
@ -728,7 +727,7 @@ Gun().user && describe('Gun', function(){
expect(root.sessionStorage.getItem('user')).to.not.be(sUser); expect(root.sessionStorage.getItem('user')).to.not.be(sUser);
expect(root.sessionStorage.getItem('remember')).to.not.be(sRemember); expect(root.sessionStorage.getItem('remember')).to.not.be(sRemember);
expect(root.localStorage.getItem('remember')).to.not.be(lRemember); expect(root.localStorage.getItem('remember')).to.not.be(lRemember);
}catch(e){ done(e); return }; }catch(e){ done(e); return }
// Then restore localStorage remember data, skip sessionStorage // Then restore localStorage remember data, skip sessionStorage
root.localStorage.setItem('remember', lRemember); root.localStorage.setItem('remember', lRemember);
}); });
@ -742,9 +741,9 @@ Gun().user && describe('Gun', function(){
// Which fails to missing PIN // Which fails to missing PIN
expect(props.err.toLowerCase() expect(props.err.toLowerCase()
.indexOf('missing pin')).not.to.be(-1); .indexOf('missing pin')).not.to.be(-1);
}catch(e){ done(e); return }; }catch(e){ done(e); return }
// Ok, time to try auth with alias & PIN // Ok, time to try auth with alias & PIN
return user.auth(alias+type, undefined, { pin: 'PIN' }); return user.auth(alias+type, undefined, {pin: 'PIN'});
}); });
}).then(doCheck(function(usr){ }).then(doCheck(function(usr){
try{ try{
@ -752,7 +751,7 @@ Gun().user && describe('Gun', function(){
expect(usr).to.not.be(''); expect(usr).to.not.be('');
expect(usr).to.not.have.key('err'); expect(usr).to.not.have.key('err');
expect(usr).to.have.key('put'); expect(usr).to.have.key('put');
}catch(e){ done(e); return }; }catch(e){ done(e); return }
// We've recalled authenticated session using alias & PIN! // We've recalled authenticated session using alias & PIN!
done(); done();
}, true, true)).catch(done); }, true, true)).catch(done);
@ -761,7 +760,7 @@ Gun().user && describe('Gun', function(){
it('valid localStorage session fails to bootstrap using wrong PIN', it('valid localStorage session fails to bootstrap using wrong PIN',
function(done){ function(done){
user.recall(12 * 60, {session: false}).then(function(){ user.recall(12 * 60, {session: false}).then(function(){
return user.auth(alias+type, pass+' new', { pin: 'PIN' }); return user.auth(alias+type, pass+' new', {pin: 'PIN'});
}).then(doCheck(function(){ }).then(doCheck(function(){
var sUser = root.sessionStorage.getItem('user'); var sUser = root.sessionStorage.getItem('user');
var sRemember = root.sessionStorage.getItem('remember'); var sRemember = root.sessionStorage.getItem('remember');
@ -773,12 +772,12 @@ Gun().user && describe('Gun', function(){
expect(root.sessionStorage.getItem('user')).to.not.be(sUser); expect(root.sessionStorage.getItem('user')).to.not.be(sUser);
expect(root.sessionStorage.getItem('remember')).to.not.be(sRemember); expect(root.sessionStorage.getItem('remember')).to.not.be(sRemember);
expect(root.localStorage.getItem('remember')).to.not.be(lRemember); expect(root.localStorage.getItem('remember')).to.not.be(lRemember);
}catch(e){ done(e); return }; }catch(e){ done(e); return }
root.localStorage.setItem('remember', lRemember); root.localStorage.setItem('remember', lRemember);
}); });
}, true)).then(function(){ }, true)).then(function(){
// Ok, time to try auth with alias & PIN // Ok, time to try auth with alias & PIN
return user.auth(alias+type, undefined, { pin: 'PiN' }); return user.auth(alias+type, undefined, {pin: 'PiN'});
}).then(function(){ }).then(function(){
done('Unexpected login success!'); done('Unexpected login success!');
}).catch(function(ack){ }).catch(function(ack){
@ -788,7 +787,7 @@ Gun().user && describe('Gun', function(){
expect(ack).to.have.key('err'); expect(ack).to.have.key('err');
expect(ack.err.toLowerCase() expect(ack.err.toLowerCase()
.indexOf('no session data for alias & pin')).not.to.be(-1); .indexOf('no session data for alias & pin')).not.to.be(-1);
}catch(e){ done(e); return }; }catch(e){ done(e); return }
// We've recalled authenticated session using alias & PIN! // We've recalled authenticated session using alias & PIN!
done(); done();
}); });
@ -800,7 +799,7 @@ Gun().user && describe('Gun', function(){
}).then(doCheck(function(){ }).then(doCheck(function(){
// Storage data OK, let's back up time of auth to exp + 65 seconds // Storage data OK, let's back up time of auth to exp + 65 seconds
return manipulateStorage(function(props){ return manipulateStorage(function(props){
var ret = Object.assign({}, props, { iat: props.iat - 65 - props.exp }); var ret = Object.assign({}, props, {iat: props.iat - 65 - props.exp});
return ret; return ret;
}, false); }, false);
})).then(function(){ })).then(function(){
@ -822,7 +821,7 @@ Gun().user && describe('Gun', function(){
it('changed password', function(done){ it('changed password', function(done){
user.recall(60, {session: false}).then(function(){ user.recall(60, {session: false}).then(function(){
return user.auth(alias+type, pass+' new', { pin: 'PIN' }); return user.auth(alias+type, pass+' new', {pin: 'PIN'});
}).then(function(usr){ }).then(function(usr){
var sUser; var sUser;
var sRemember; var sRemember;
@ -841,21 +840,20 @@ Gun().user && describe('Gun', function(){
sUser = root.sessionStorage.getItem('user'); sUser = root.sessionStorage.getItem('user');
sRemember = root.sessionStorage.getItem('remember'); sRemember = root.sessionStorage.getItem('remember');
lRemember = root.localStorage.getItem('remember'); lRemember = root.localStorage.getItem('remember');
}catch(e){ done(e); return }; }catch(e){ done(e); return }
// Time to do new login with new password set // Time to do new login with new password set
user.leave().then(function(ack){ user.leave().then(function(ack){
try{ try{
expect(ack).to.have.key('ok'); expect(ack).to.have.key('ok');
}catch(e){ done(e); return }; }catch(e){ done(e); return }
return user.auth(alias+type, pass+' new', {newpass: pass, pin: 'PIN' }).then(function(usr){ return user.auth(alias+type, pass+' new', {newpass: pass, pin: 'PIN'})
expect(usr).to.not.have.key('err'); .then(function(usr){ expect(usr).to.not.have.key('err') });
});
}).then(function(){ }).then(function(){
return user.leave().then(function(ack){ return user.leave().then(function(ack){
try{ try{
expect(ack).to.have.key('ok'); expect(ack).to.have.key('ok');
}catch(e){ done(e); return }; }catch(e){ done(e); return }
throwOutUser(); throwOutUser();
}); });
}).then(function(){ }).then(function(){
@ -883,12 +881,12 @@ Gun().user && describe('Gun', function(){
var exp; var exp;
var hookFunc = function(props){ var hookFunc = function(props){
exp = props.exp * 2; exp = props.exp * 2;
var ret = Object.assign({}, props, { exp: exp }); var ret = Object.assign({}, props, {exp: exp});
return (type === 'callback' && ret) || new Promise(function(resolve){ return (type === 'callback' && ret) || new Promise(function(resolve){
resolve(ret); resolve(ret);
}); });
}; };
user.recall(60, { session: true, hook: hookFunc }).then(function(){ user.recall(60, {session: true, hook: hookFunc}).then(function(){
return user.auth(alias+type, pass); return user.auth(alias+type, pass);
}).then(function(){ }).then(function(){
// Storage data OK, let's back up time of auth 65 minutes // Storage data OK, let's back up time of auth 65 minutes
@ -910,7 +908,7 @@ Gun().user && describe('Gun', function(){
expect(ack).to.not.be(''); expect(ack).to.not.be('');
expect(ack).to.not.have.key('err'); expect(ack).to.not.have.key('err');
expect(ack).to.have.keys([ 'sea', 'pub' ]); expect(ack).to.have.keys([ 'sea', 'pub' ]);
}catch(e){ done(e); return }; }catch(e){ done(e); return }
done(); done();
}; };
var aliveUser = alias+type+'alive'; var aliveUser = alias+type+'alive';
@ -918,13 +916,13 @@ Gun().user && describe('Gun', function(){
expect(ack).to.not.be(undefined); expect(ack).to.not.be(undefined);
expect(ack).to.not.be(''); expect(ack).to.not.be('');
expect(ack).to.have.keys([ 'ok', 'pub' ]); expect(ack).to.have.keys([ 'ok', 'pub' ]);
user.auth(aliveUser, pass, { pin: 'PIN' }).then(function(usr){ user.auth(aliveUser, pass, {pin: 'PIN'}).then(function(usr){
try{ try{
expect(usr).to.not.be(undefined); expect(usr).to.not.be(undefined);
expect(usr).to.not.be(''); expect(usr).to.not.be('');
expect(usr).to.not.have.key('err'); expect(usr).to.not.have.key('err');
expect(usr).to.have.key('put'); expect(usr).to.have.key('put');
}catch(e){ done(e); return }; }catch(e){ done(e); return }
// Gun.user.alive - keeps/checks User authentiation state // Gun.user.alive - keeps/checks User authentiation state
if(type === 'callback'){ if(type === 'callback'){
user.alive(check); user.alive(check);
@ -943,7 +941,7 @@ Gun().user && describe('Gun', function(){
expect(ack).to.not.have.keys([ 'sea', 'pub' ]); expect(ack).to.not.have.keys([ 'sea', 'pub' ]);
expect(ack).to.have.key('err'); expect(ack).to.have.key('err');
expect(ack.err.toLowerCase().indexOf('no session')).not.to.be(-1); expect(ack.err.toLowerCase().indexOf('no session')).not.to.be(-1);
}catch(e){ done(e); return }; }catch(e){ done(e); return }
done(); done();
}; };
user.leave().catch(function(){}).then(function(){ user.leave().catch(function(){}).then(function(){