keeweb
/
keeweb
mirror of https://github.com/keeweb/keeweb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

extracted get url method

This commit is contained in:
antelle 2016-04-03 17:33:34 +03:00
parent 307e9786e4
commit cc15cc24e0
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/scripts/storage/storage-base.js
View File

@ -112,6 +112,14 @@ _.extend(StorageBase.prototype, {
return win;
},
_getOauthRedirectUrl: function() {
var redirectUrl = window.location.href;
if (redirectUrl.lastIndexOf('file:', 0) === 0) {
redirectUrl = Links.WebApp;
}
return redirectUrl;
},
_oauthAuthorize: function(callback) {
var that = this;
if (that._oauthToken && !that._oauthToken.expired) {
@ -124,14 +132,10 @@ _.extend(StorageBase.prototype, {
callback();
return;
}
var redirectUrl = window.location.href;
if (redirectUrl.lastIndexOf('file:', 0) === 0) {
redirectUrl = Links.WebApp;
}
var url = opts.url + '?client_id={cid}&scope={scope}&response_type=token&redirect_uri={url}'
.replace('{cid}', opts.clientId)
.replace('{cid}', encodeURIComponent(opts.clientId))
.replace('{scope}', encodeURIComponent(opts.scope))
.replace('{url}', encodeURIComponent(redirectUrl));
.replace('{url}', encodeURIComponent(this._getOauthRedirectUrl()));
that.logger.debug('OAuth popup opened');
if (!that._openPopup(url, 'OAuth', opts.width, opts.height)) {
callback('cannot open popup');