Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[buteo-sync-plugins-social] Fix Dropbox initial account creation. Con…
…tributes to JB#32395
  • Loading branch information
Jonni Rainisto committed Oct 1, 2015
1 parent b7aee4b commit 04fa48d
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions src/dropbox/dropbox-signon/dropboxsignonsyncadaptor.cpp
Expand Up @@ -207,11 +207,9 @@ void DropboxSignonSyncAdaptor::initialSignonResponse(const SignOn::SessionData &
QString mechanism = session->property("mechanism").toString();
QVariantMap signonSessionData = session->property("signonSessionData").toMap();

// Now expire the tokens.
QVariantMap providedTokens;
providedTokens.insert("AccessToken", responseData.getProperty(QStringLiteral("AccessToken")).toString());
providedTokens.insert("RefreshToken", responseData.getProperty(QStringLiteral("RefreshToken")).toString()); // TODO dropbox doesnt havge refresh token
providedTokens.insert("ExpiresIn", 2); // TODO: dropbox tokens dont expire
providedTokens.insert("RefreshToken", responseData.getProperty(QStringLiteral("RefreshToken")).toString());
signonSessionData.insert("ProvidedTokens", providedTokens);

session->process(SignOn::SessionData(signonSessionData), mechanism);
Expand Down Expand Up @@ -245,7 +243,7 @@ void DropboxSignonSyncAdaptor::triggerRefresh()

SignOn::AuthSession *session = timer->property("session").value<SignOn::AuthSession*>();
connect(session, SIGNAL(response(SignOn::SessionData)),
this, SLOT(refreshTokenResponse(SignOn::SessionData)),
this, SLOT(requestTokenResponse(SignOn::SessionData)),
Qt::UniqueConnection);
connect(session, SIGNAL(error(SignOn::Error)),
this, SLOT(signonError(SignOn::Error)),
Expand All @@ -256,6 +254,7 @@ void DropboxSignonSyncAdaptor::triggerRefresh()

void DropboxSignonSyncAdaptor::refreshTokenResponse(const SignOn::SessionData &responseData)
{
Q_UNUSED(responseData);
SignOn::AuthSession *session = qobject_cast<SignOn::AuthSession*>(sender());
int accountId = session->property("accountId").toInt();
session->disconnect(this);
Expand All @@ -269,8 +268,8 @@ void DropboxSignonSyncAdaptor::refreshTokenResponse(const SignOn::SessionData &r
}

SOCIALD_LOG_INFO(
QString(QLatin1String("successfully performed signon refresh for Dropbox account %1: new ExpiresIn: %3"))
.arg(accountId).arg(responseData.getProperty("ExpiresIn").toInt()));
QString(QLatin1String("successfully performed signon refresh for Dropbox account %1"))
.arg(accountId));

lowerCredentialsNeedUpdateFlag(accountId);
decrementSemaphore(accountId);
Expand Down

0 comments on commit 04fa48d

Please sign in to comment.