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

Request host URL updated, in case of bucket name as com.xyz.app. #62

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

Request host URL updated, in case of bucket name as com.xyz.app. #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9f9da0
Request host URL updated, in case of bucket name as `com.xyz.app`.
Nov 14, 2017
c216915
Test case updated.
Nov 14, 2017
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
12 changes: 6 additions & 6 deletions __test__/RNS3.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ describe('RNS3.put', () => {

const requestCreateMock = Request.create.mock
expect(requestCreateMock.calls.length).toBe(1)
expect(requestCreateMock.calls[0][0]).toBe('https://my-s3-bucket.s3.amazonaws.com')
expect(requestCreateMock.calls[0][0]).toBe('https://s3.amazonaws.com/my-s3-bucket')
expect(requestCreateMock.calls[0][1]).toBe('POST')
expect(requestCreateMock.calls[0][2]).toBe(policy)

Expand Down Expand Up @@ -95,7 +95,7 @@ describe('RNS3.put', () => {

const requestCreateMock = Request.create.mock
expect(requestCreateMock.calls.length).toBe(1)
expect(requestCreateMock.calls[0][0]).toBe('https://my-s3-bucket.s3.amazonaws.com')
expect(requestCreateMock.calls[0][0]).toBe('https://s3.amazonaws.com/my-s3-bucket')
expect(requestCreateMock.calls[0][1]).toBe('POST')
expect(requestCreateMock.calls[0][2]).toBe(policy)

Expand Down Expand Up @@ -134,7 +134,7 @@ describe('RNS3.put', () => {

const requestCreateMock = Request.create.mock
expect(requestCreateMock.calls.length).toBe(1)
expect(requestCreateMock.calls[0][0]).toBe('https://my-s3-bucket.s3.us-east-2.amazonaws.com')
expect(requestCreateMock.calls[0][0]).toBe('https://s3.us-east-2.amazonaws.com/my-s3-bucket')
expect(requestCreateMock.calls[0][1]).toBe('POST')
expect(requestCreateMock.calls[0][2]).toBe(policy)

Expand All @@ -146,7 +146,7 @@ describe('RNS3.put', () => {
})

describe('parsing the XML response', () => {
const XML_RESPONSE = '<?xml version="1.0" encoding="UTF-8"?>\n<PostResponse><Location>https://my-s3-bucket.s3.amazonaws.com/uploads%2Fimage.jpg</Location><Bucket>my-s3-bucket</Bucket><Key>uploads/image.jpg</Key><ETag>"afba579120c3ed942f55c8ca50fe39fc"</ETag></PostResponse>'
const XML_RESPONSE = '<?xml version="1.0" encoding="UTF-8"?>\n<PostResponse><Location>https://s3.amazonaws.com/my-s3-bucket/uploads%2Fimage.jpg</Location><Bucket>my-s3-bucket</Bucket><Key>uploads/image.jpg</Key><ETag>"afba579120c3ed942f55c8ca50fe39fc"</ETag></PostResponse>'
const response = {
status: 201,
text: XML_RESPONSE,
Expand All @@ -173,7 +173,7 @@ describe('RNS3.put', () => {
expect(result).toHaveProperty('body.postResponse.key', 'uploads/image.jpg')
expect(result).toHaveProperty('body.postResponse.etag', 'afba579120c3ed942f55c8ca50fe39fc')
expect(result).toHaveProperty('body.postResponse.bucket', 'my-s3-bucket')
expect(result).toHaveProperty('body.postResponse.location', 'https://my-s3-bucket.s3.amazonaws.com/uploads%2Fimage.jpg')
expect(result).toHaveProperty('body.postResponse.location', 'https://s3.amazonaws.com/my-s3-bucket/uploads%2Fimage.jpg')

const s3PolicyGenerateMock = S3Policy.generate.mock
expect(s3PolicyGenerateMock.calls.length).toBe(1)
Expand All @@ -187,7 +187,7 @@ describe('RNS3.put', () => {

const requestCreateMock = Request.create.mock
expect(requestCreateMock.calls.length).toBe(1)
expect(requestCreateMock.calls[0][0]).toBe('https://my-s3-bucket.s3.amazonaws.com')
expect(requestCreateMock.calls[0][0]).toBe('https://s3.amazonaws.com/my-s3-bucket')
expect(requestCreateMock.calls[0][1]).toBe('POST')
expect(requestCreateMock.calls[0][2]).toBe(policy)

Expand Down
2 changes: 1 addition & 1 deletion src/RNS3.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export class RNS3 {
contentType: file.type
}

const url = `https://${options.bucket}.${options.awsUrl || AWS_DEFAULT_S3_HOST}`
const url = `https://${options.awsUrl || AWS_DEFAULT_S3_HOST}/${options.bucket}`
const method = "POST"
const policy = S3Policy.generate(options)

Expand Down