Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

core/remote/cozy: Use cozy-stack-client methods #2258

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

core/remote/cozy: Use cozy-stack-client methods #2258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ae1b7f
deps: Upgrade cozy-client to v32.7.0
taratatach Aug 16, 2022
40eaa10
deps: Upgrade cozy-client's dependencies
taratatach Aug 16, 2022
f5a4375
core/remote/cozy: Use cozy-stack-client methods
taratatach Aug 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/remote/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ module.exports = {
// Doctypes
FILES_DOCTYPE: 'io.cozy.files',
OAUTH_CLIENTS_DOCTYPE: 'io.cozy.oauth.clients',
SETTINGS_DOCTYPE: 'io.cozy.settings',
VERSIONS_DOCTYPE: 'io.cozy.files.versions',

// Files document type
Expand Down
8 changes: 5 additions & 3 deletions core/remote/cozy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ const {
DIR_TYPE,
INITIAL_SEQ,
MAX_FILE_SIZE,
OAUTH_CLIENTS_DOCTYPE
OAUTH_CLIENTS_DOCTYPE,
SETTINGS_DOCTYPE
} = require('./constants')
const { DirectoryNotFound } = require('./errors')
const {
Expand Down Expand Up @@ -450,7 +451,7 @@ class RemoteCozy {
.sortBy([{ dir_id: 'asc' }, { name: 'asc' }])
.limitBy(batchSize)

const data = await client.queryAll(queryDef)
const data = await client.findAll(queryDef)

const remoteDocs = []
for (const j of data) {
Expand Down Expand Up @@ -541,11 +542,12 @@ class RemoteCozy {

async capabilities() /*: Promise<{ flatSubdomains: boolean }> */ {
const client = await this.newClient()
const settings = client.collection(SETTINGS_DOCTYPE)
const {
data: {
attributes: { flat_subdomains: flatSubdomains }
}
} = await client.query(Q('io.cozy.settings').getById('capabilities'))
} = await settings.get('capabilities')
return { flatSubdomains }
}

Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@
"btoa": "^1.1.2",
"bunyan": "2.0.5",
"chokidar": "^3.5.0",
"cozy-client": "^27.22.0",
"cozy-client": "^32.7.0",
"cozy-client-js": "^0.20.0",
"cozy-flags": "^2.8.3",
"cozy-stack-client": "^24.0.0",
"cozy-stack-client": "^32.7.0",
"deep-diff": "^1.0.2",
"dtrace-provider": "^0.8.8",
"electron-fetch": "1.7.4",
Expand Down
Loading