442: also clear csrf token and cookies

Wikidata · Sep 20, 2023 · b8dc29a · b8dc29a
1 parent 9f8d68b
commit b8dc29a
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.wikidata.wdtk</groupId>
 	<artifactId>wdtk-parent</artifactId>
-	<version>0.14.7-SNAPSHOT</version>
+	<version>0.14.7</version>
 	<packaging>pom</packaging>
 
 	<name>Wikidata Toolkit</name>

diff --git a/wdtk-datamodel/pom.xml b/wdtk-datamodel/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.wikidata.wdtk</groupId>
 		<artifactId>wdtk-parent</artifactId>
-		<version>0.14.7-SNAPSHOT</version>
+		<version>0.14.7</version>
 	</parent>
 
 	<artifactId>wdtk-datamodel</artifactId>

diff --git a/wdtk-distribution/pom.xml b/wdtk-distribution/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.wikidata.wdtk</groupId>
 		<artifactId>wdtk-parent</artifactId>
-		<version>0.14.7-SNAPSHOT</version>
+		<version>0.14.7</version>
 	</parent>
 
 	<artifactId>wdtk-distribution</artifactId>

diff --git a/wdtk-dumpfiles/pom.xml b/wdtk-dumpfiles/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.wikidata.wdtk</groupId>
 		<artifactId>wdtk-parent</artifactId>
-		<version>0.14.7-SNAPSHOT</version>
+		<version>0.14.7</version>
 	</parent>
 
 	<artifactId>wdtk-dumpfiles</artifactId>

diff --git a/wdtk-examples/pom.xml b/wdtk-examples/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.wikidata.wdtk</groupId>
 		<artifactId>wdtk-parent</artifactId>
-		<version>0.14.7-SNAPSHOT</version>
+		<version>0.14.7</version>
 	</parent>
 
 	<artifactId>wdtk-examples</artifactId>

diff --git a/wdtk-rdf/pom.xml b/wdtk-rdf/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.wikidata.wdtk</groupId>
     <artifactId>wdtk-parent</artifactId>
-    <version>0.14.7-SNAPSHOT</version>
+    <version>0.14.7</version>
   </parent>
 
   <artifactId>wdtk-rdf</artifactId>

diff --git a/wdtk-storage/pom.xml b/wdtk-storage/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.wikidata.wdtk</groupId>
 		<artifactId>wdtk-parent</artifactId>
-		<version>0.14.7-SNAPSHOT</version>
+		<version>0.14.7</version>
 	</parent>
 
 	<artifactId>wdtk-storage</artifactId>

diff --git a/wdtk-testing/pom.xml b/wdtk-testing/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.wikidata.wdtk</groupId>
 		<artifactId>wdtk-parent</artifactId>
-		<version>0.14.7-SNAPSHOT</version>
+		<version>0.14.7</version>
 	</parent>
 
 	<artifactId>wdtk-testing</artifactId>

diff --git a/wdtk-util/pom.xml b/wdtk-util/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.wikidata.wdtk</groupId>
 		<artifactId>wdtk-parent</artifactId>
-		<version>0.14.7-SNAPSHOT</version>
+		<version>0.14.7</version>
 	</parent>
 
 	<artifactId>wdtk-util</artifactId>

diff --git a/wdtk-wikibaseapi/pom.xml b/wdtk-wikibaseapi/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.wikidata.wdtk</groupId>
 		<artifactId>wdtk-parent</artifactId>
-		<version>0.14.7-SNAPSHOT</version>
+		<version>0.14.7</version>
 	</parent>
 
 	<artifactId>wdtk-wikibaseapi</artifactId>

diff --git a/wdtk-wikibaseapi/src/main/java/org/wikidata/wdtk/wikibaseapi/BasicApiConnection.java b/wdtk-wikibaseapi/src/main/java/org/wikidata/wdtk/wikibaseapi/BasicApiConnection.java
@@ -184,6 +184,8 @@ protected void login(String username, String password, ILogin loginFunction) thr
 				loginFunction.login(token, username, password);
 			} catch (NeedLoginTokenException | TokenErrorException e) { // try once more
 				clearToken("login");
+				clearToken("csrf");
+				clearCookies();
 				token = getOrFetchToken("login");
 				loginFunction.login(token, username, password);
 			}