[Pkg-owncloud-commits] [owncloud-client] 45/83: Shib: Wizard: Return to IdP selection when returning to creds page

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 0582abe8dd61e656952c6044bf8e804ec18c74b7
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Mon May 26 15:57:01 2014 +0200

    Shib: Wizard: Return to IdP selection when returning to creds page
---
 src/wizard/owncloudshibbolethcredspage.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/wizard/owncloudshibbolethcredspage.cpp b/src/wizard/owncloudshibbolethcredspage.cpp
index a6b11eb..42b84ea 100644
--- a/src/wizard/owncloudshibbolethcredspage.cpp
+++ b/src/wizard/owncloudshibbolethcredspage.cpp
@@ -15,6 +15,8 @@
 
 #include "wizard/owncloudshibbolethcredspage.h"
 #include "mirall/theme.h"
+#include "mirall/account.h"
+#include "mirall/cookiejar.h"
 #include "wizard/owncloudwizardcommon.h"
 #include "wizard/owncloudwizard.h"
 #include "creds/shibbolethcredentials.h"
@@ -35,7 +37,17 @@ void OwncloudShibbolethCredsPage::setupBrowser()
         return;
     }
     OwncloudWizard *ocWizard = qobject_cast<OwncloudWizard*>(wizard());
-    _browser = new ShibbolethWebView(ocWizard->account());
+    Account *account = ocWizard->account();
+
+    // we need to reset the cookie jar to drop temporary cookies (like the shib cookie)
+    // i.e. if someone presses "back"
+    QNetworkAccessManager *qnam = account->networkAccessManager();
+    delete qnam->cookieJar();
+    CookieJar *jar = new CookieJar;
+    qnam->setCookieJar(jar);
+    jar->setParent(0);
+
+    _browser = new ShibbolethWebView(account);
     connect(_browser, SIGNAL(shibbolethCookieReceived(const QNetworkCookie&, Account*)),
             this, SLOT(slotShibbolethCookieReceived()));
     connect(_browser, SIGNAL(rejected()),

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git