Skip to content

Commit

Permalink
Merge pull request #1171 from nextcloud/fix/case-sensitivity
Browse files Browse the repository at this point in the history
Fix duplicate files / case-sensitivity issues
  • Loading branch information
ChristophWurst authored Sep 28, 2018
2 parents 1402ee9 + 659b4c4 commit 03f9a51
Show file tree
Hide file tree
Showing 6 changed files with 64 additions and 714 deletions.
26 changes: 13 additions & 13 deletions js/service/AccountService.js
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))
}
14 changes: 7 additions & 7 deletions js/service/FolderService.js
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)
}
88 changes: 44 additions & 44 deletions js/service/MessageService.js
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)
}
145 changes: 0 additions & 145 deletions js/service/accountservice.js

This file was deleted.

69 changes: 0 additions & 69 deletions js/service/folderservice.js

This file was deleted.

Loading

0 comments on commit 03f9a51

Please sign in to comment.