-
Notifications
You must be signed in to change notification settings - Fork 260
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1171 from nextcloud/fix/case-sensitivity
Fix duplicate files / case-sensitivity issues
- Loading branch information
Showing
6 changed files
with
64 additions
and
714 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,22 @@ | ||
import HttpClient from 'nextcloud-axios' | ||
|
||
function fixAccountId (original) { | ||
return { | ||
id: original.accountId, | ||
...original | ||
} | ||
function fixAccountId(original) { | ||
return { | ||
id: original.accountId, | ||
...original | ||
} | ||
} | ||
|
||
export function fetchAll () { | ||
const url = OC.generateUrl('/apps/mail/api/accounts') | ||
export function fetchAll() { | ||
const url = OC.generateUrl('/apps/mail/api/accounts') | ||
|
||
return HttpClient.get(url).then(resp => resp.data.map(fixAccountId)) | ||
return HttpClient.get(url).then(resp => resp.data.map(fixAccountId)) | ||
} | ||
|
||
export function fetch (id) { | ||
const url = OC.generateUrl('/apps/mail/api/accounts/{id}', { | ||
id | ||
}) | ||
export function fetch(id) { | ||
const url = OC.generateUrl('/apps/mail/api/accounts/{id}', { | ||
id | ||
}) | ||
|
||
return HttpClient.get(url).then(resp => fixAccountId(resp.data)) | ||
return HttpClient.get(url).then(resp => fixAccountId(resp.data)) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
import HttpClient from 'nextcloud-axios' | ||
|
||
export function fetchAll (accountId) { | ||
const url = OC.generateUrl('/apps/mail/api/accounts/{accountId}/folders', { | ||
accountId | ||
}) | ||
export function fetchAll(accountId) { | ||
const url = OC.generateUrl('/apps/mail/api/accounts/{accountId}/folders', { | ||
accountId | ||
}) | ||
|
||
// FIXME: this return format is weird and should be avoided | ||
// TODO: respect `resp.data.delimiter` value | ||
return HttpClient.get(url).then(resp => resp.data.folders) | ||
// FIXME: this return format is weird and should be avoided | ||
// TODO: respect `resp.data.delimiter` value | ||
return HttpClient.get(url).then(resp => resp.data.folders) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,56 +1,56 @@ | ||
import HttpClient from 'nextcloud-axios' | ||
|
||
export function fetchEnvelopes (accountId, folderId, cursor) { | ||
const url = OC.generateUrl('/apps/mail/api/accounts/{accountId}/folders/{folderId}/messages', { | ||
accountId, | ||
folderId, | ||
}) | ||
const params = {} | ||
|
||
if (cursor) { | ||
params.cursor = cursor | ||
} | ||
|
||
return HttpClient.get(url, { | ||
params: params | ||
}).then(resp => resp.data) | ||
export function fetchEnvelopes(accountId, folderId, cursor) { | ||
const url = OC.generateUrl('/apps/mail/api/accounts/{accountId}/folders/{folderId}/messages', { | ||
accountId, | ||
folderId, | ||
}) | ||
const params = {} | ||
|
||
if (cursor) { | ||
params.cursor = cursor | ||
} | ||
|
||
return HttpClient.get(url, { | ||
params: params | ||
}).then(resp => resp.data) | ||
} | ||
|
||
export function syncEnvelopes (accountId, folderId, syncToken, uids) { | ||
const url = OC.generateUrl('/apps/mail/api/accounts/{accountId}/folders/{folderId}/sync', { | ||
accountId, | ||
folderId, | ||
}) | ||
|
||
return HttpClient.get(url, { | ||
params: { | ||
syncToken, | ||
uids, | ||
} | ||
}).then(resp => resp.data) | ||
export function syncEnvelopes(accountId, folderId, syncToken, uids) { | ||
const url = OC.generateUrl('/apps/mail/api/accounts/{accountId}/folders/{folderId}/sync', { | ||
accountId, | ||
folderId, | ||
}) | ||
|
||
return HttpClient.get(url, { | ||
params: { | ||
syncToken, | ||
uids, | ||
} | ||
}).then(resp => resp.data) | ||
} | ||
|
||
export function setEnvelopeFlag (accountId, folderId, id, flag, value) { | ||
const url = OC.generateUrl('apps/mail/api/accounts/{accountId}/folders/{folderId}/messages/{id}/flags', { | ||
accountId, | ||
folderId, | ||
id | ||
}) | ||
export function setEnvelopeFlag(accountId, folderId, id, flag, value) { | ||
const url = OC.generateUrl('apps/mail/api/accounts/{accountId}/folders/{folderId}/messages/{id}/flags', { | ||
accountId, | ||
folderId, | ||
id | ||
}) | ||
|
||
const flags = {} | ||
flags[flag] = value | ||
const flags = {} | ||
flags[flag] = value | ||
|
||
return HttpClient.put(url, { | ||
flags: flags | ||
}).then(resp => {flag: value}) | ||
return HttpClient.put(url, { | ||
flags: flags | ||
}).then(resp => { flag: value }) | ||
} | ||
|
||
export function fetchMessage (accountId, folderId, id) { | ||
const url = OC.generateUrl('/apps/mail/api/accounts/{accountId}/folders/{folderId}/messages/{id}', { | ||
accountId, | ||
folderId, | ||
id | ||
}) | ||
export function fetchMessage(accountId, folderId, id) { | ||
const url = OC.generateUrl('/apps/mail/api/accounts/{accountId}/folders/{folderId}/messages/{id}', { | ||
accountId, | ||
folderId, | ||
id | ||
}) | ||
|
||
return HttpClient.get(url).then(resp => resp.data) | ||
return HttpClient.get(url).then(resp => resp.data) | ||
} |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.