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

accept providerUri and session on create

This commit is contained in:
AJ ONeal 2017-03-24 10:13:15 -06:00
parent f37d47b0d4
commit 4bdacf9770
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
oauth3.core.js
View File

@ -1065,7 +1065,7 @@
// this is not necessary, but it's relatively small // this is not necessary, but it's relatively small
// and gives people the 3-line examples they love so much // and gives people the 3-line examples they love so much
OAUTH3.create = function (location/*, opts*/) { OAUTH3.create = function (location, opts) {
if (!location) { if (!location) {
location = OAUTH3._browser.window.location; location = OAUTH3._browser.window.location;
} }
@ -1073,16 +1073,29 @@
var result = { var result = {
_clientUri: OAUTH3.clientUri(location) _clientUri: OAUTH3.clientUri(location)
, _providerUri: null , _providerUri: null
, init: function (location) { , _init: function (location, opts) {
var me = this;
if (location) {
me._clientUri = OAUTH3.clientUri(location);
}
if (opts) {
if (opts.providerUri) {
me._providerUri = opts.providerUri;
}
if (opts.session) {
me.session(opts.session, opts.sessionId);
}
}
}
, init: function (location/*, opts*/) {
var me = this; var me = this;
var p = OAUTH3.PromiseA.resolve(); var p = OAUTH3.PromiseA.resolve();
if (location) { me._init(location, opts);
this._clientUri = OAUTH3.clientUri(location);
} if (me._providerUri) {
if (this._providerUri) {
// returns directives // returns directives
p = OAUTH3.discover(this._providerUri, { client_id: this._clientUri }); p = OAUTH3.discover(me._providerUri, { client_id: this._clientUri });
} }
return p.then(function () { return p.then(function () {
@ -1158,6 +1171,9 @@
result.authenticate = result.login; result.authenticate = result.login;
result.authorize = result.login; result.authorize = result.login;
result.expire = result.logout; result.expire = result.logout;
result._init(location, opts);
return result; return result;
}; };