1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
|
From 4ded388b2b2672f5f7fb953a0150a69fcfaa7cb0 Mon Sep 17 00:00:00 2001
From: David Barchiesi <david@barchie.si>
Date: Mon, 8 Jul 2019 09:54:08 +0200
Subject: Re get Google credentials from KAccounts when a refresh is needed.
Summary: Currently, when the Google access token in use expires, the KIO slave silently ignores refreshing the token (only 'not implemented' gets logged) and fails all subsequent api requests. This patch prevents the slave from breaking by requesting new credentials from KAccounts.
Test Plan: Open a Google Drive folder in Dolphin, wait until accounts token needs a refresh, open another Google Drive folder. The folder loads because a new access token was requested.
Reviewers: elvisangelaccio
Reviewed By: elvisangelaccio
Subscribers: mck182, elvisangelaccio
Differential Revision: https://phabricator.kde.org/D22009
---
src/kaccountsmanager.cpp | 45 ++++++++++++++++++++++++++++++++-------------
src/kaccountsmanager.h | 2 ++
2 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/src/kaccountsmanager.cpp b/src/kaccountsmanager.cpp
index 08272df..dc35852 100644
--- a/src/kaccountsmanager.cpp
+++ b/src/kaccountsmanager.cpp
@@ -85,8 +85,19 @@ AccountPtr KAccountsManager::createAccount()
AccountPtr KAccountsManager::refreshAccount(const AccountPtr &account)
{
- Q_UNUSED(account)
- qCWarning(GDRIVE) << Q_FUNC_INFO << "not implemented.";
+ const QString accountName = account->accountName();
+ for (auto it = m_accounts.constBegin(); it != m_accounts.constEnd(); ++it) {
+ if (it.value()->accountName() != accountName) {
+ continue;
+ }
+
+ const auto id = it.key();
+ qCDebug(GDRIVE) << "Refreshing" << accountName;
+ auto gapiAccount = getAccountCredentials(id, accountName);
+ m_accounts.insert(id, gapiAccount);
+ return gapiAccount;
+ }
+
return {};
}
@@ -143,19 +154,27 @@ void KAccountsManager::loadAccounts()
}
qCDebug(GDRIVE) << account->displayName() << "supports gdrive!";
- auto job = new GetCredentialsJob(id, nullptr);
- job->exec();
+ auto gapiAccount = getAccountCredentials(id, account->displayName());
+ m_accounts.insert(id, gapiAccount);
+ }
+ }
+}
- auto gapiAccount = AccountPtr(new Account(account->displayName(),
- job->credentialsData().value(QStringLiteral("AccessToken")).toString(),
- job->credentialsData().value(QStringLiteral("RefreshToken")).toString()));
+AccountPtr KAccountsManager::getAccountCredentials(Accounts::AccountId id, const QString& displayName)
+{
+ auto job = new GetCredentialsJob(id, nullptr);
+ job->exec();
- const auto scopes = job->credentialsData().value(QStringLiteral("Scope")).toStringList();
- for (const auto &scope : scopes) {
- gapiAccount->addScope(QUrl::fromUserInput(scope));
- }
+ auto gapiAccount = AccountPtr(new Account(displayName,
+ job->credentialsData().value(QStringLiteral("AccessToken")).toString(),
+ job->credentialsData().value(QStringLiteral("RefreshToken")).toString()));
- m_accounts.insert(id, gapiAccount);
- }
+ const auto scopes = job->credentialsData().value(QStringLiteral("Scope")).toStringList();
+ for (const auto &scope : scopes) {
+ gapiAccount->addScope(QUrl::fromUserInput(scope));
}
+
+ qCDebug(GDRIVE) << "Got account credentials for:" << gapiAccount->accountName() << ", accessToken:" << gapiAccount->accessToken() << ", refreshToken:" << gapiAccount->refreshToken();
+
+ return gapiAccount;
}
diff --git a/src/kaccountsmanager.h b/src/kaccountsmanager.h
index 235d11a..d2dbc43 100644
--- a/src/kaccountsmanager.h
+++ b/src/kaccountsmanager.h
@@ -40,6 +40,8 @@ public:
private:
void loadAccounts();
+ KGAPI2::AccountPtr getAccountCredentials(Accounts::AccountId id, const QString& displayName);
+
QMap<Accounts::AccountId, KGAPI2::AccountPtr> m_accounts;
};
--
cgit v1.1
|
GitWeb