coolaj86
/
oauth3.js
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update sessions api

This commit is contained in:
AJ ONeal 2017-03-21 17:33:03 -06:00
parent cf6c1b9e5a
commit 5047fc1aff
3 changed files with 54 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/oauth3.js
View File

@ -4,10 +4,17 @@
var form = require('terminal-forms.js').create(process.stdin, process.stdout); var form = require('terminal-forms.js').create(process.stdin, process.stdout);
var OAUTH3 = require('../oauth3.node.js'); var OAUTH3 = require('../oauth3.node.js');
// TODO change to ._hooks // TODO change to ._hooks
OAUTH3.hooks.directives._get = require('../oauth3.node.storage.js').directives._get; OAUTH3._hooks = require('../oauth3.node.storage.js');
// directives = { get, set }
// sessions = { get, set }
OAUTH3.hooks.directives._set = require('../oauth3.node.storage.js').directives._set; OAUTH3.hooks.directives._set = require('../oauth3.node.storage.js').directives._set;
OAUTH3.hooks.session._get = require('../oauth3.node.storage.js').session._get; OAUTH3.hooks.session._get = require('../oauth3.node.storage.js').session._get;
OAUTH3.hooks.session._set = require('../oauth3.node.storage.js').session._set; OAUTH3.hooks.session._set = require('../oauth3.node.storage.js').session._set;
OAUTH3._hooks.directives.get = require('../oauth3.node.storage.js').directives._get;
OAUTH3._hooks.directives.set = require('../oauth3.node.storage.js').directives._set;
OAUTH3._hooks.session.get = require('../oauth3.node.storage.js').session._get;
OAUTH3._hooks.session.set = require('../oauth3.node.storage.js').session._set;
var url = require('url'); var url = require('url');
//console.log('stdin tty', process.stdin.isTTY); //console.log('stdin tty', process.stdin.isTTY);
//console.log('stdout tty', process.stdout.isTTY); //console.log('stdout tty', process.stdout.isTTY);

2
node_modules/terminal-forms.js generated vendored

@ -1 +1 @@
Subproject commit 66d46eab32d8014f43307f9fbe97027b8c913f7a Subproject commit 3f2e11a41d5dbf5903abbf457eba3b2f3ec6a1d8

52
oauth3.core.js
View File

@ -417,14 +417,20 @@
return OAUTH3.PromiseA.resolve(OAUTH3.hooks.directives._set(providerUri, directives)); return OAUTH3.PromiseA.resolve(OAUTH3.hooks.directives._set(providerUri, directives));
} }
, _get: function (providerUri) { , _get: function (providerUri) {
console.warn('[Warn] Please implement OAUTH3.hooks.directives._get = function (providerUri) { return PromiseA<directives>; }'); if (!OAUTH3._hooks || !OAUTH3._hooks.directives || !OAUTH3._hooks.directives.get) {
console.warn('[Warn] Please implement OAUTH3._hooks.directives.get = function (providerUri) { return PromiseA<directives>; }');
return JSON.parse(window.localStorage.getItem('directives-' + providerUri) || '{}'); return JSON.parse(window.localStorage.getItem('directives-' + providerUri) || '{}');
} }
return OAUTH3._hooks.directives.get(providerUri);
}
, _set: function (providerUri, directives) { , _set: function (providerUri, directives) {
console.warn('[Warn] Please implement OAUTH3.hooks.directives._set = function (providerUri, directives) { return PromiseA<directives>; }'); if (!OAUTH3._hooks || !OAUTH3._hooks.directives || !OAUTH3._hooks.directives.set) {
console.warn('[Warn] Please implement OAUTH3._hooks.directives.set = function (providerUri, directives) { return PromiseA<directives>; }');
window.localStorage.setItem('directives-' + providerUri, JSON.stringify(directives)); window.localStorage.setItem('directives-' + providerUri, JSON.stringify(directives));
return directives; return directives;
} }
return OAUTH3._hooks.directives.set(providerUri, directives);
}
} }
, session: { , session: {
refresh: function (oldSession, newSession) { refresh: function (oldSession, newSession) {
@ -509,42 +515,62 @@
return newSession; // oauth3.hooks.refreshSession(expiredSession, newSession); return newSession; // oauth3.hooks.refreshSession(expiredSession, newSession);
}); });
} }
, _getCached: function (providerUri) { , _getCached: function (providerUri, id) {
providerUri = OAUTH3.uri.normalize(providerUri); providerUri = OAUTH3.uri.normalize(providerUri);
if (!OAUTH3.hooks.session._cache) { OAUTH3.hooks.session._cache = {}; } if (!OAUTH3.hooks.session._cache) { OAUTH3.hooks.session._cache = {}; }
if (id) {
return OAUTH3.hooks.session._cache[providerUri + id];
}
return OAUTH3.hooks.session._cache[providerUri]; return OAUTH3.hooks.session._cache[providerUri];
} }
, set: function (providerUri, newSession) { , set: function (providerUri, newSession, id) {
if (!providerUri) { if (!providerUri) {
console.error(new Error('no providerUri').stack); console.error(new Error('no providerUri').stack);
throw new Error("providerUri is not set"); throw new Error("providerUri is not set");
} }
providerUri = OAUTH3.uri.normalize(providerUri); providerUri = OAUTH3.uri.normalize(providerUri);
if (!OAUTH3.hooks.session._cache) { OAUTH3.hooks.session._cache = {}; } if (!OAUTH3.hooks.session._cache) { OAUTH3.hooks.session._cache = {}; }
OAUTH3.hooks.session._cache[providerUri + (id || newSession.id || newSession.token.id || '')] = newSession;
if (!id) {
OAUTH3.hooks.session._cache[providerUri] = newSession; OAUTH3.hooks.session._cache[providerUri] = newSession;
}
return OAUTH3.PromiseA.resolve(OAUTH3.hooks.session._set(providerUri, newSession)); return OAUTH3.PromiseA.resolve(OAUTH3.hooks.session._set(providerUri, newSession));
} }
, get: function (providerUri) { , get: function (providerUri, id) {
providerUri = OAUTH3.uri.normalize(providerUri); providerUri = OAUTH3.uri.normalize(providerUri);
if (!providerUri) { if (!providerUri) {
throw new Error("providerUri is not set"); throw new Error("providerUri is not set");
} }
return OAUTH3.PromiseA.resolve(OAUTH3.hooks.session._getCached(providerUri) return OAUTH3.PromiseA.resolve(
|| OAUTH3.hooks.session._get(providerUri)).then(function (session) { OAUTH3.hooks.session._getCached(providerUri, id) || OAUTH3.hooks.session._get(providerUri, id)
).then(function (session) {
OAUTH3.hooks.session._cache[providerUri + (id || session.id || session.token.id || '')] = session;
if (!id) {
OAUTH3.hooks.session._cache[providerUri] = session; OAUTH3.hooks.session._cache[providerUri] = session;
}
return session; return session;
}); });
} }
, _get: function (providerUri) { , _get: function (providerUri, id) {
console.warn('[Warn] Please implement OAUTH3.hooks.session._get = function (providerUri) { return PromiseA<savedSession>; }'); if (!OAUTH3._hooks || !OAUTH3._hooks.sessions || !OAUTH3._hooks.sessions.all) {
return JSON.parse(window.localStorage.getItem('session-' + providerUri) || 'null'); console.warn('[Warn] Please implement OAUTH3._hooks.sessions.all = function ([providerUri]) { return PromiseA<sessions>; }');
} }
, _set: function (providerUri, newSession) { if (!OAUTH3._hooks || !OAUTH3._hooks.sessions || !OAUTH3._hooks.sessions.get) {
console.warn('[Warn] Please implement OAUTH3.hooks.session._set = function (providerUri, newSession) { return PromiseA<newSession>; }'); console.warn('[Warn] Please implement OAUTH3._hooks.sessions.get = function (providerUri[, id]) { return PromiseA<session>; }');
window.localStorage.setItem('session-' + providerUri, JSON.stringify(newSession)); return JSON.parse(window.sessionStorage.getItem('session-' + providerUri + (id || '')) || 'null');
}
return OAUTH3._hooks.directives.get(providerUri, id);
}
, _set: function (providerUri, newSession, id) {
if (!OAUTH3._hooks || !OAUTH3._hooks.sessions || !OAUTH3._hooks.sessions.set) {
console.warn('[Warn] Please implement OAUTH3._hooks.sessions.set = function (providerUri, newSession[, id]) { return PromiseA<newSession>; }');
window.sessionStorage.setItem('session-' + providerUri, JSON.stringify(newSession));
window.sessionStorage.setItem('session-' + providerUri + (id || newSession.id || newSession.token.id || ''), JSON.stringify(newSession));
return newSession; return newSession;
} }
return OAUTH3._hooks.directives.set(providerUri, newSession, id);
}
} }
} }
, discover: function (providerUri, opts) { , discover: function (providerUri, opts) {