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

Set prefix, delimiter params even when empty #748

Merged
merged 1 commit into from
Jan 24, 2019
Merged

Set prefix, delimiter params even when empty #748

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 14 additions & 24 deletions src/main/minio.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,20 +1144,17 @@ export class Client {
if (!isNumber(maxKeys)) {
throw new TypeError('maxKeys should be of type "number"')
}

var queries = []
// escape every value in query string, except maxKeys
if (prefix) {
prefix = uriEscape(prefix)
queries.push(`prefix=${prefix}`)
}
queries.push(`prefix=${uriEscape(prefix)}`)
queries.push(`delimiter=${uriEscape(delimiter)}`)

if (marker) {
marker = uriEscape(marker)
queries.push(`marker=${marker}`)
}
if (delimiter) {
delimiter = uriEscape(delimiter)
queries.push(`delimiter=${delimiter}`)
}

// no need to escape maxKeys
if (maxKeys) {
if (maxKeys >= 1000) {
Expand Down Expand Up @@ -1273,18 +1270,13 @@ export class Client {
queries.push(`list-type=2`)

// escape every value in query string, except maxKeys
if (prefix) {
prefix = uriEscape(prefix)
queries.push(`prefix=${prefix}`)
}
queries.push(`prefix=${uriEscape(prefix)}`)
queries.push(`delimiter=${uriEscape(delimiter)}`)

if (continuationToken) {
continuationToken = uriEscape(continuationToken)
queries.push(`continuation-token=${continuationToken}`)
}
if (delimiter) {
delimiter = uriEscape(delimiter)
queries.push(`delimiter=${delimiter}`)
}
// Set start-after
if (startAfter) {
startAfter = uriEscape(startAfter)
Expand All @@ -1296,7 +1288,7 @@ export class Client {
maxKeys = 1000
}
queries.push(`max-keys=${maxKeys}`)
}
}
queries.sort()
var query = ''
if (queries.length > 0) {
Expand Down Expand Up @@ -1491,7 +1483,7 @@ export class Client {
})
}, cb)
}


// Get the policy on a bucket or an object prefix.
//
Expand Down Expand Up @@ -1878,19 +1870,17 @@ export class Client {
throw new TypeError('delimiter should be of type "string"')
}
var queries = []
if (prefix) {
queries.push(`prefix=${uriEscape(prefix)}`)
}
queries.push(`prefix=${uriEscape(prefix)}`)
queries.push(`delimiter=${uriEscape(delimiter)}`)

if (keyMarker) {
keyMarker = uriEscape(keyMarker)
queries.push(`key-marker=${keyMarker}`)
}
if (uploadIdMarker) {
queries.push(`upload-id-marker=${uploadIdMarker}`)
}
if (delimiter) {
queries.push(`delimiter=${uriEscape(delimiter)}`)
}

var maxUploads = 1000
queries.push(`max-uploads=${maxUploads}`)
queries.sort()
Expand Down