Skip to content

Commit 7e6f362

Browse files
dartcafedartcafe
authored
Merge pull request #4664 from nextcloud/maintenance/axios-cancel-token-deprecation
Replace deprecated Canceltoken by AbortController
2 parents cd9259f + fde4267 commit 7e6f362

15 files changed

Lines changed: 178 additions & 179 deletions

‎src/Api/modules/HttpApi.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ const axiosOcsConfig = {
2222
},
2323
}
2424

25-
const CancelToken = axios.CancelToken
2625
const httpInstance = axios.create(axiosConfig)
2726
const ocsInstance = axios.create(axiosOcsConfig)
2827

@@ -53,12 +52,12 @@ const createCancelTokenHandler = (apiObject) => {
5352
handleRequestCancellation: (subKey) => {
5453
const key = String(subKey ?? '__default__')
5554
if (!handlers[key]) {
56-
handlers[key] = { cancelToken: undefined }
55+
handlers[key] = { controller: undefined }
5756
}
5857
const handler = handlers[key]
59-
handler.cancelToken?.cancel(`${propertyName} canceled`)
60-
handler.cancelToken = CancelToken.source()
61-
return handler.cancelToken
58+
handler.controller?.abort(`${propertyName} canceled`)
59+
handler.controller = new AbortController()
60+
return handler.controller
6261
},
6362
}
6463
})

‎src/Api/modules/activity.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ const activity = {
1616
object_type: 'poll',
1717
object_id: pollId,
1818
},
19-
cancelToken:
19+
signal:
2020
cancelTokenHandlerObject[
2121
this.getActivities.name
22-
].handleRequestCancellation().token,
22+
].handleRequestCancellation().signal,
2323
})
2424
return response
2525
},

‎src/Api/modules/admin.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ const adminJobs = {
1212
return httpInstance.request({
1313
method: 'GET',
1414
url: 'administration/jobs',
15-
cancelToken:
15+
signal:
1616
cancelTokenHandlerObject[
1717
this.getJobsList.name
18-
].handleRequestCancellation().token,
18+
].handleRequestCancellation().signal,
1919
})
2020
},
2121

@@ -27,10 +27,10 @@ const adminJobs = {
2727
job: job.className,
2828
},
2929

30-
cancelToken:
30+
signal:
3131
cancelTokenHandlerObject[
3232
this.runJob.name
33-
].handleRequestCancellation().token,
33+
].handleRequestCancellation().signal,
3434
})
3535
},
3636
}

‎src/Api/modules/appSettings.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ const appSettings = {
1414
method: 'GET',
1515
url: 'settings/app',
1616
params: { time: +new Date() },
17-
cancelToken:
17+
signal:
1818
cancelTokenHandlerObject[
1919
this.getAppSettings.name
20-
].handleRequestCancellation().token,
20+
].handleRequestCancellation().signal,
2121
})
2222
},
2323

@@ -28,21 +28,21 @@ const appSettings = {
2828
method: 'POST',
2929
url: 'settings/app',
3030
data: { appSettings },
31-
cancelToken:
31+
signal:
3232
cancelTokenHandlerObject[
3333
this.writeAppSettings.name
34-
].handleRequestCancellation().token,
34+
].handleRequestCancellation().signal,
3535
})
3636
},
3737

3838
getGroups(query: string): Promise<AxiosResponse<{ groups: Group[] }>> {
3939
return httpInstance.request({
4040
method: 'GET',
4141
url: `groups${query.trim() ? `/${query.trim()}` : ''}`,
42-
cancelToken:
42+
signal:
4343
cancelTokenHandlerObject[
4444
this.getGroups.name
45-
].handleRequestCancellation().token,
45+
].handleRequestCancellation().signal,
4646
})
4747
},
4848

@@ -54,10 +54,10 @@ const appSettings = {
5454
method: 'GET',
5555
url: `search/users${query.trim() ? `/${query.trim()}` : ''}`,
5656
params: { types: types.toString() },
57-
cancelToken:
57+
signal:
5858
cancelTokenHandlerObject[
5959
this.getUsers.name
60-
].handleRequestCancellation().token,
60+
].handleRequestCancellation().signal,
6161
})
6262
},
6363
}

‎src/Api/modules/calendar.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ const calendar = {
1414
method: 'GET',
1515
url: 'calendars',
1616
params: { time: +new Date() },
17-
cancelToken:
17+
signal:
1818
cancelTokenHandlerObject[
1919
this.getCalendars.name
20-
].handleRequestCancellation().token,
20+
].handleRequestCancellation().signal,
2121
})
2222
},
2323
getEvents(

‎src/Api/modules/comments.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ const comments = {
1313
method: 'GET',
1414
url: `poll/${pollId}/comments`,
1515
params: { time: +new Date() },
16-
cancelToken:
16+
signal:
1717
cancelTokenHandlerObject[
1818
this.getComments.name
19-
].handleRequestCancellation().token,
19+
].handleRequestCancellation().signal,
2020
})
2121
},
2222
addComment(
@@ -29,10 +29,10 @@ const comments = {
2929
url: `poll/${pollId}/comment`,
3030
data: { message, confidential },
3131
params: { time: +new Date() },
32-
cancelToken:
32+
signal:
3333
cancelTokenHandlerObject[
3434
this.addComment.name
35-
].handleRequestCancellation().token,
35+
].handleRequestCancellation().signal,
3636
})
3737
},
3838

@@ -42,10 +42,10 @@ const comments = {
4242
url: `comment/${commentId}`,
4343
params: { time: +new Date() },
4444

45-
cancelToken:
45+
signal:
4646
cancelTokenHandlerObject[
4747
this.deleteComment.name
48-
].handleRequestCancellation().token,
48+
].handleRequestCancellation().signal,
4949
})
5050
},
5151
restoreComment(commentId: number): Promise<AxiosResponse<{ comment: Comment }>> {
@@ -54,10 +54,10 @@ const comments = {
5454
url: `comment/${commentId}/restore`,
5555
params: { time: +new Date() },
5656

57-
cancelToken:
57+
signal:
5858
cancelTokenHandlerObject[
5959
this.restoreComment.name
60-
].handleRequestCancellation().token,
60+
].handleRequestCancellation().signal,
6161
})
6262
},
6363
}

‎src/Api/modules/options.ts‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ const options = {
1515
method: 'GET',
1616
url: `poll/${pollId}/options`,
1717
params: { time: +new Date() },
18-
cancelToken:
18+
signal:
1919
cancelTokenHandlerObject[
2020
this.getOptions.name
21-
].handleRequestCancellation().token,
21+
].handleRequestCancellation().signal,
2222
})
2323
},
2424

@@ -39,10 +39,10 @@ const options = {
3939
url: `poll/${pollId}/option`,
4040
// data: { ...option },
4141
data: { option, sequence, voteYes },
42-
cancelToken:
42+
signal:
4343
cancelTokenHandlerObject[
4444
this.addOption.name
45-
].handleRequestCancellation().token,
45+
].handleRequestCancellation().signal,
4646
})
4747
},
4848

@@ -51,10 +51,10 @@ const options = {
5151
method: 'PUT',
5252
url: `option/${option.id}`,
5353
data: { ...option },
54-
cancelToken:
54+
signal:
5555
cancelTokenHandlerObject[
5656
this.updateOption.name
57-
].handleRequestCancellation().token,
57+
].handleRequestCancellation().signal,
5858
})
5959
},
6060

@@ -63,10 +63,10 @@ const options = {
6363
method: 'DELETE',
6464
url: `option/${optionId}`,
6565
params: { time: +new Date() },
66-
cancelToken:
66+
signal:
6767
cancelTokenHandlerObject[
6868
this.deleteOption.name
69-
].handleRequestCancellation().token,
69+
].handleRequestCancellation().signal,
7070
})
7171
},
7272

@@ -76,10 +76,10 @@ const options = {
7676
url: `option/${optionId}/restore`,
7777
params: { time: +new Date() },
7878

79-
cancelToken:
79+
signal:
8080
cancelTokenHandlerObject[
8181
this.restoreOption.name
82-
].handleRequestCancellation().token,
82+
].handleRequestCancellation().signal,
8383
})
8484
},
8585

@@ -101,21 +101,21 @@ const options = {
101101
pollId,
102102
text: optionsBatch,
103103
},
104-
cancelToken:
104+
signal:
105105
cancelTokenHandlerObject[
106106
this.addOptions.name
107-
].handleRequestCancellation().token,
107+
].handleRequestCancellation().signal,
108108
})
109109
},
110110

111111
confirmOption(optionId: number): Promise<AxiosResponse<{ option: OptionDto }>> {
112112
return httpInstance.request({
113113
method: 'PUT',
114114
url: `option/${optionId}/confirm`,
115-
cancelToken:
115+
signal:
116116
cancelTokenHandlerObject[
117117
this.confirmOption.name
118-
].handleRequestCancellation().token,
118+
].handleRequestCancellation().signal,
119119
})
120120
},
121121

@@ -130,10 +130,10 @@ const options = {
130130
method: 'POST',
131131
url: `poll/${pollId}/options/reorder`,
132132
data: { options },
133-
cancelToken:
133+
signal:
134134
cancelTokenHandlerObject[
135135
this.reorderOptions.name
136-
].handleRequestCancellation().token,
136+
].handleRequestCancellation().signal,
137137
})
138138
},
139139

@@ -147,10 +147,10 @@ const options = {
147147
data: {
148148
sequence,
149149
},
150-
cancelToken:
150+
signal:
151151
cancelTokenHandlerObject[
152152
this.addOptionsSequence.name
153-
].handleRequestCancellation().token,
153+
].handleRequestCancellation().signal,
154154
})
155155
},
156156

@@ -166,10 +166,10 @@ const options = {
166166
step,
167167
unit,
168168
},
169-
cancelToken:
169+
signal:
170170
cancelTokenHandlerObject[
171171
this.shiftOptions.name
172-
].handleRequestCancellation().token,
172+
].handleRequestCancellation().signal,
173173
})
174174
},
175175
}

‎src/Api/modules/pollGroups.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ const pollGroups = {
1414
method: 'GET',
1515
url: 'pollgroups',
1616
params: { time: +new Date() },
17-
cancelToken:
17+
signal:
1818
cancelTokenHandlerObject[
1919
this.getPollGroups.name
20-
].handleRequestCancellation().token,
20+
].handleRequestCancellation().signal,
2121
})
2222
},
2323

@@ -46,10 +46,10 @@ const pollGroups = {
4646
method: verb,
4747
url,
4848
data,
49-
cancelToken:
49+
signal:
5050
cancelTokenHandlerObject[
5151
this.addPollToGroup.name
52-
].handleRequestCancellation().token,
52+
].handleRequestCancellation().signal,
5353
})
5454
},
5555

@@ -60,10 +60,10 @@ const pollGroups = {
6060
return httpInstance.request({
6161
method: 'DELETE',
6262
url: `pollgroup/${pollGroupId}/poll/${pollId}`,
63-
cancelToken:
63+
signal:
6464
cancelTokenHandlerObject[
6565
this.removePollFromGroup.name
66-
].handleRequestCancellation().token,
66+
].handleRequestCancellation().signal,
6767
})
6868
},
6969

@@ -81,10 +81,10 @@ const pollGroups = {
8181
titleExt: payload.titleExt,
8282
description: payload.description,
8383
},
84-
cancelToken:
84+
signal:
8585
cancelTokenHandlerObject[
8686
this.updatePollGroup.name
87-
].handleRequestCancellation().token,
87+
].handleRequestCancellation().signal,
8888
})
8989
},
9090
}

0 commit comments

Comments
 (0)