Skip to content

Commit 97a208d

Browse files
authored
Refactor CSRF token API to move it into the main commons code base (commons-app#5472)
* Remove redundent constructor parameter * Converted the CsrfTokenClient and test to kotlin * Moved getCsrfTokenCall() out of the data client
1 parent e8e87b1 commit 97a208d

File tree

14 files changed

+263
-348
lines changed

14 files changed

+263
-348
lines changed

app/src/main/java/fr/free/nrw/commons/actions/PageEditClient.kt

+5-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class PageEditClient(
2525
*/
2626
fun edit(pageTitle: String, text: String, summary: String): Observable<Boolean> {
2727
return try {
28-
pageEditInterface.postEdit(pageTitle, summary, text, csrfTokenClient.tokenBlocking)
28+
pageEditInterface.postEdit(pageTitle, summary, text, csrfTokenClient.getTokenBlocking())
2929
.map { editResponse -> editResponse.edit()!!.editSucceeded() }
3030
} catch (throwable: Throwable) {
3131
Observable.just(false)
@@ -41,7 +41,7 @@ class PageEditClient(
4141
*/
4242
fun appendEdit(pageTitle: String, appendText: String, summary: String): Observable<Boolean> {
4343
return try {
44-
pageEditInterface.postAppendEdit(pageTitle, summary, appendText, csrfTokenClient.tokenBlocking)
44+
pageEditInterface.postAppendEdit(pageTitle, summary, appendText, csrfTokenClient.getTokenBlocking())
4545
.map { editResponse -> editResponse.edit()!!.editSucceeded() }
4646
} catch (throwable: Throwable) {
4747
Observable.just(false)
@@ -57,7 +57,7 @@ class PageEditClient(
5757
*/
5858
fun prependEdit(pageTitle: String, prependText: String, summary: String): Observable<Boolean> {
5959
return try {
60-
pageEditInterface.postPrependEdit(pageTitle, summary, prependText, csrfTokenClient.tokenBlocking)
60+
pageEditInterface.postPrependEdit(pageTitle, summary, prependText, csrfTokenClient.getTokenBlocking())
6161
.map { editResponse -> editResponse.edit()!!.editSucceeded() }
6262
} catch (throwable: Throwable) {
6363
Observable.just(false)
@@ -76,7 +76,8 @@ class PageEditClient(
7676
language: String, value: String) : Observable<Int>{
7777
return try {
7878
pageEditInterface.postCaptions(summary, title, language,
79-
value, csrfTokenClient.tokenBlocking).map { it.success }
79+
value, csrfTokenClient.getTokenBlocking()
80+
).map { it.success }
8081
} catch (throwable: Throwable) {
8182
Observable.just(0)
8283
}

app/src/main/java/fr/free/nrw/commons/actions/ThanksClient.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class ThanksClient @Inject constructor(
2727
service.thank(
2828
revisionId.toString(), // Rev
2929
null, // Log
30-
csrfTokenClient.tokenBlocking, // Token
30+
csrfTokenClient.getTokenBlocking(), // Token
3131
CommonsApplication.getInstance().userAgent // Source
3232
).map {
3333
mwThankPostResponse -> mwThankPostResponse.result?.success == 1

app/src/main/java/fr/free/nrw/commons/auth/csrf/CsrfTokenClient.java

-247
This file was deleted.

0 commit comments

Comments
 (0)