Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Molkentin <danimo@owncloud.com>2014-02-06 16:00:57 +0400
committerDaniel Molkentin <danimo@owncloud.com>2014-02-06 16:02:01 +0400
commit4ae66b8b2089b8b08d94103993332d7743086075 (patch)
treecde25c1fd6ddfadff649579f047e67ffd41b0258 /src/wizard
parentccb45bfea65a55d0b329414440e65ba13928c634 (diff)
ShibbolethCredetials: Try to avoid re-auth
...by storing the shib cookie in key chain
Diffstat (limited to 'src/wizard')
-rw-r--r--src/wizard/owncloudshibbolethcredspage.cpp6
-rw-r--r--src/wizard/owncloudshibbolethcredspage.h3
2 files changed, 5 insertions, 4 deletions
diff --git a/src/wizard/owncloudshibbolethcredspage.cpp b/src/wizard/owncloudshibbolethcredspage.cpp
index ffdcc3482..533201517 100644
--- a/src/wizard/owncloudshibbolethcredspage.cpp
+++ b/src/wizard/owncloudshibbolethcredspage.cpp
@@ -84,8 +84,8 @@ void OwncloudShibbolethCredsPage::disposeBrowser()
this, SLOT(slotOtherCookiesReceived(QList<QNetworkCookie>, QUrl)));
disconnect(_browser, SIGNAL(viewHidden()),
this, SLOT(slotViewHidden()));
- disconnect(_browser, SIGNAL(shibbolethCookieReceived(QNetworkCookie)),
- this, SLOT(slotShibbolethCookieReceived(QNetworkCookie)));
+ disconnect(_browser, SIGNAL(shibbolethCookieReceived(QNetworkCookie, Account*)),
+ this, SLOT(slotShibbolethCookieReceived(QNetworkCookie, Account*)));
_browser->hide();
_browser->deleteLater();
_browser = 0;
@@ -107,7 +107,7 @@ AbstractCredentials* OwncloudShibbolethCredsPage::getCredentials() const
return new ShibbolethCredentials(_cookie, _cookiesForUrl);
}
-void OwncloudShibbolethCredsPage::slotShibbolethCookieReceived(const QNetworkCookie& cookie)
+void OwncloudShibbolethCredsPage::slotShibbolethCookieReceived(const QNetworkCookie& cookie, Account*)
{
disposeBrowser();
_cookie = cookie;
diff --git a/src/wizard/owncloudshibbolethcredspage.h b/src/wizard/owncloudshibbolethcredspage.h
index 37e51ea35..c67bfd442 100644
--- a/src/wizard/owncloudshibbolethcredspage.h
+++ b/src/wizard/owncloudshibbolethcredspage.h
@@ -23,6 +23,7 @@
namespace Mirall {
+class Account;
class ShibbolethWebView;
class OwncloudShibbolethCredsPage : public AbstractCredentialsWizardPage
@@ -44,7 +45,7 @@ public Q_SLOTS:
void setVisible(bool visible);
private Q_SLOTS:
- void slotShibbolethCookieReceived(const QNetworkCookie& cookie);
+ void slotShibbolethCookieReceived(const QNetworkCookie& cookie, Account*);
void slotOtherCookiesReceived(const QList<QNetworkCookie>& cookieList, const QUrl& url);
void slotViewHidden();