mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[OAuth] Fix naming

Browse Source
This commit is contained in:
Hannah von Reth 2020-02-10 13:05:07 +01:00 committed by Hannah von Reth
parent ee57badea2
commit bc21511eec
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/creds/httpcredentialsgui.cpp
View File

@ -52,7 +52,7 @@ void HttpCredentialsGui::askFromUserAsync()
this, &HttpCredentialsGui::asyncAuthResult);
connect(_asyncAuth.data(), &OAuth::destroyed,
this, &HttpCredentialsGui::authorisationLinkChanged);
_asyncAuth->startAuthentification();
_asyncAuth->startAuthentication();
emit authorisationLinkChanged();
} else if (type == DetermineAuthTypeJob::Basic) {
showDialog();

2
src/gui/wizard/owncloudoauthcredspage.cpp
View File

@ -72,7 +72,7 @@ void OwncloudOAuthCredsPage::initializePage()
ocWizard->account()->setCredentials(new HttpCredentialsGui);
_asyncAuth.reset(new OAuth(ocWizard->account().data(), this));
connect(_asyncAuth.data(), &OAuth::result, this, &OwncloudOAuthCredsPage::asyncAuthResult, Qt::QueuedConnection);
_asyncAuth->startAuthentification();
_asyncAuth->startAuthentication();
wizard()->hide();
}

2
src/libsync/creds/httpcredentials.cpp
View File

@ -431,7 +431,7 @@ bool HttpCredentials::refreshAccessToken()
_retryQueue.clear();
emit fetched();
});
oauth->refreshAuthentification(_refreshToken);
oauth->refreshAuthentication(_refreshToken);
_isRenewingOAuthToken = true;
return true;
}

4
src/libsync/creds/oauth.cpp
View File

@ -60,7 +60,7 @@ const char *moreHeaders = nullptr)
socket->setParent(nullptr);
}
void OAuth::startAuthentification()
void OAuth::startAuthentication()
{
// Listen on the socket to get a port which will be used in the redirect_uri
if (!_server.listen(QHostAddress::LocalHost)) {
@ -174,7 +174,7 @@ void OAuth::startAuthentification()
});
}
void OAuth::refreshAuthentification(const QString &refreshToken)
void OAuth::refreshAuthentication(const QString &refreshToken)
{
connect(this, &OAuth::fetchWellKnownFinished, this, [this, refreshToken] {
auto job = postTokenRequest({ { QStringLiteral("grant_type"), QStringLiteral("refresh_token") },

4
src/libsync/creds/oauth.h
View File

@ -58,8 +58,8 @@ public:
OAuth(Account *account, QObject *parent);
~OAuth();
void startAuthentification();
void refreshAuthentification(const QString &refreshToken);
void startAuthentication();
void refreshAuthentication(const QString &refreshToken);
void openBrowser();
QUrl authorisationLink() const;
/**

2
test/testoauth.cpp
View File

@ -145,7 +145,7 @@ public:
oauth.reset(new OAuth(account.data(), nullptr));
QObject::connect(oauth.data(), &OAuth::result, this, &OAuthTestCase::oauthResult);
oauth->startAuthentification();
oauth->startAuthentication();
QTRY_VERIFY(done());
}