Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-07-19 09:24:51 +00:00
Code Issues Projects Releases Wiki Activity

renamed config options ouath_client_id and oauth_client_secre to github_id and github_secret. Added dropbox_id option.

Browse source
This commit is contained in:
coderaiser 2012-12-03 08:44:39 -05:00
parent a6ef735553
commit 72eebd2287
5 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/client/storage/_github.js
View file

@ -8,8 +8,8 @@ var CloudCommander, Util, DOM, $, Github, cb;
APIURL = '/api/v1',
AuthURL = APIURL + '/auth',
ClientIdURL = APIURL + '/client_id',
CLIENT_ID,
GitHubIdURL = APIURL + '/github_id',
GitHub_ID,
Cache = DOM.Cache,
GithubLocal,
User,
@ -46,9 +46,9 @@ var CloudCommander, Util, DOM, $, Github, cb;
function setConfig(pCallBack){
DOM.ajax({
url : ClientIdURL,
url : GitHubIdURL,
success : function(pData){
CLIENT_ID = pData;
GitHub_ID = pData;
Util.exec(pCallBack);
}
});
@ -113,7 +113,7 @@ var CloudCommander, Util, DOM, $, Github, cb;
//window.open('welcome.html', 'welcome','width=300,height=200,menubar=yes,status=yes')">
window.location =
'https://github.com/login/oauth/authorize?client_id=' +
CLIENT_ID + '&&scope=repo,user,gist';
GitHub_ID + '&&scope=repo,user,gist';
}
}

9
lib/server/auth.js
View file

@ -36,18 +36,19 @@
};
function authenticate(pCode, pCallBack) {
var lId = Config.oauth_client_id,
lSecret = Config.oauth_client_secret,
var lId = Config.github_id,
lSecret = Config.github_secret,
lEnv = process.env,
lClientId = lEnv.oauth_client_id || lId,
lClientSecret = lEnv.oauth_client_secret || lSecret;
lClientId = lEnv.github_id || lId,
lClientSecret = lEnv.github_secret || lSecret;
var data = qs.stringify({
client_id : lClientId,
client_secret : lClientSecret,
code : pCode
});
console.log(data);
GithubAuth.headers = { 'content-length': data.length };

4
lib/server/rest.js
View file

@ -101,11 +101,11 @@
lResult = {info: 'Cloud Commander API v1'};
break;
case 'client_id':
case 'github_id':
var lEnv = process.env,
lConfig = main.config;
lResult = lEnv.oauth_client_id || lConfig.oauth_client_id;
lResult = lEnv.github_id || lConfig.github_id;
break;
case 'kill':