Skip to content

Commit

Permalink
fix: wrong URL for validating a package upload
Browse files Browse the repository at this point in the history
  • Loading branch information
wdzeng committed Oct 3, 2024
1 parent 1a0121c commit 22e3067
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/lib.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ async function waitUntilPackageValidated(
// https://learn.microsoft.com/en-us/microsoft-edge/extensions-chromium/publish/api/using-addons-api?tabs=v1-1#checking-the-status-of-a-package-upload
// https://learn.microsoft.com/en-us/microsoft-edge/extensions-chromium/publish/api/addons-api-reference?tabs=v1-1#check-the-status-of-a-package-upload
logger.info('Waiting until upload request accepted.')
const url = `https://api.addons.microsoftedge.microsoft.com/v1/products/${productId}/submissions/operations/${operationId}`
const url = `https://api.addons.microsoftedge.microsoft.com/v1/products/${productId}/submissions/draft/package/operations/${operationId}`
const headers = { 'Authorization': `ApiKey ${apiKey}`, 'X-ClientID': clientId }

const endTime = Date.now() + MAX_WAIT_TIME * 1000
Expand Down
15 changes: 8 additions & 7 deletions test/lib.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ const AUTH_HEADERS_MATCHER: { asymmetricMatch: (...args: unknown[]) => boolean }
})

const URL_CREATE_UPLOAD = `https://api.addons.microsoftedge.microsoft.com/v1/products/${TEST_PRODUCT_ID}/submissions/draft/package`
const URL_VALIDATE_UPLOAD = `https://api.addons.microsoftedge.microsoft.com/v1/products/${TEST_PRODUCT_ID}/submissions/draft/package/operations/${TEST_OPERATION_ID}`
const URL_CREATE_PUBLISH = `https://api.addons.microsoftedge.microsoft.com/v1/products/${TEST_PRODUCT_ID}/submissions`
const URL_VALIDATE_OPERATION = `https://api.addons.microsoftedge.microsoft.com/v1/products/${TEST_PRODUCT_ID}/submissions/operations/${TEST_OPERATION_ID}`
const URL_VALIDATE_PUBLISH = `https://api.addons.microsoftedge.microsoft.com/v1/products/${TEST_PRODUCT_ID}/submissions/operations/${TEST_OPERATION_ID}`

describe('uploadPackage', () => {
const TEST_ZIP_PATH = `${tmp.tmpNameSync()}.zip`
Expand Down Expand Up @@ -75,7 +76,7 @@ describe('uploadPackage', () => {
return [204, undefined, { location: TEST_OPERATION_ID }]
})

mockAdapter.onGet(URL_VALIDATE_OPERATION, { headers: AUTH_HEADERS_MATCHER }).replyOnce(_ => {
mockAdapter.onGet(URL_VALIDATE_UPLOAD, { headers: AUTH_HEADERS_MATCHER }).replyOnce(_ => {
assert(uploadCreationTime)

const now = new Date()
Expand Down Expand Up @@ -148,7 +149,7 @@ describe('uploadPackage', () => {
return [204, undefined, { location: TEST_OPERATION_ID }]
})

mockAdapter.onGet(URL_VALIDATE_OPERATION, { headers: AUTH_HEADERS_MATCHER }).replyOnce(_ => {
mockAdapter.onGet(URL_VALIDATE_UPLOAD, { headers: AUTH_HEADERS_MATCHER }).replyOnce(_ => {
assert(uploadCreationTime)
return [
200,
Expand Down Expand Up @@ -191,7 +192,7 @@ describe('uploadPackage', () => {
return [204, undefined, { location: TEST_OPERATION_ID }]
})

mockAdapter.onGet(URL_VALIDATE_OPERATION, { headers: AUTH_HEADERS_MATCHER }).reply(_ => {
mockAdapter.onGet(URL_VALIDATE_UPLOAD, { headers: AUTH_HEADERS_MATCHER }).reply(_ => {
assert(uploadCreationTime)
return [
200,
Expand Down Expand Up @@ -252,7 +253,7 @@ describe('publishPackage', () => {
return [204, undefined, { location: TEST_OPERATION_ID }]
})

mockAdapter.onGet(URL_VALIDATE_OPERATION, { headers: AUTH_HEADERS_MATCHER }).replyOnce(_ => {
mockAdapter.onGet(URL_VALIDATE_PUBLISH, { headers: AUTH_HEADERS_MATCHER }).replyOnce(_ => {
assert(publishCreationTime)

const now = new Date()
Expand Down Expand Up @@ -318,7 +319,7 @@ describe('publishPackage', () => {
return [204, undefined, { location: TEST_OPERATION_ID }]
})

mockAdapter.onGet(URL_VALIDATE_OPERATION, { headers: AUTH_HEADERS_MATCHER }).replyOnce(_ => {
mockAdapter.onGet(URL_VALIDATE_PUBLISH, { headers: AUTH_HEADERS_MATCHER }).replyOnce(_ => {
assert(publishCreationTime)
return [
200,
Expand Down Expand Up @@ -356,7 +357,7 @@ describe('publishPackage', () => {
return [204, undefined, { location: TEST_OPERATION_ID }]
})

mockAdapter.onGet(URL_VALIDATE_OPERATION, { headers: AUTH_HEADERS_MATCHER }).reply(_ => {
mockAdapter.onGet(URL_VALIDATE_PUBLISH, { headers: AUTH_HEADERS_MATCHER }).reply(_ => {
assert(publishCreationTime)
return [
200,
Expand Down

0 comments on commit 22e3067

Please sign in to comment.