Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 18:41:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4661 from birarda/master

Browse source 
domain-server access token sanity for ENV, cleanup AM token output
This commit is contained in:
Leonardo Murillo 2015-04-17 12:05:27 -06:00
commit db294ce0ec
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
domain-server/src/DomainServer.cpp
View file

@ -302,6 +302,9 @@ bool DomainServer::didSetupAccountManagerWithAccessToken() {
<< "at keypath metaverse.access_token or in your ENV at key DOMAIN_SERVER_ACCESS_TOKEN"; << "at keypath metaverse.access_token or in your ENV at key DOMAIN_SERVER_ACCESS_TOKEN";
return false; return false;
} }
} else {
qDebug() << "Using access token from DOMAIN_SERVER_ACCESS_TOKEN in env. This overrides any access token present"
<< " in the user or master config.";
} }
// give this access token to the AccountManager // give this access token to the AccountManager

2
libraries/networking/src/AccountManager.cpp
View file

@ -366,7 +366,7 @@ void AccountManager::setAccessTokenForCurrentAuthURL(const QString& accessToken)
OAuthAccessToken newOAuthToken; OAuthAccessToken newOAuthToken;
newOAuthToken.token = accessToken; newOAuthToken.token = accessToken;
qCDebug(networking) << "Setting new account manager access token to" << accessToken; qCDebug(networking) << "Setting new account manager access token. F2C:" << accessToken.left(2) << "L2C:" << accessToken.right(2);
_accountInfo.setAccessToken(newOAuthToken); _accountInfo.setAccessToken(newOAuthToken);
} }