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

fix: building Client.apiUrl so /api/v5/ isn't stripped off #2531

Merged
merged 1 commit into from
Oct 18, 2022
Merged

fix: building Client.apiUrl so /api/v5/ isn't stripped off #2531

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/util/submit-addon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export default class Client {
downloadDir = process.cwd(),
}: ClientConstructorParams) {
this.apiAuth = apiAuth;
this.apiUrl = new URL('/addons/', baseUrl);
this.apiUrl = new URL('addons/', baseUrl);
this.validationCheckInterval = validationCheckInterval;
this.validationCheckTimeout = validationCheckTimeout;
this.approvalCheckInterval = approvalCheckInterval;
Expand Down Expand Up @@ -302,7 +302,7 @@ export default class Client {
await saveIdToFileFunc(savedIdPath, addonId);
log.info(`Generated extension ID: ${addonId}.`);
log.info('You must add the following to your manifest:');
log.info(`"browser_specific_settings": {"gecko": "${addonId}"}`);
log.info(`"browser_specific_settings": {"gecko": {"id": "${addonId}"}}`);

const fileUrl = new URL(await this.waitForApproval(addonId, newVersionId));

Expand Down
32 changes: 16 additions & 16 deletions tests/unit/test-util/test.submit-addon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ describe('util.submit-addon', () => {
const nodeFetchStub = sinon.stub(client, 'nodeFetch');
mockNodeFetch(
nodeFetchStub,
new URL('/addons/upload/', baseUrl),
new URL('addons/upload/', baseUrl),
'POST',
[
{
Expand Down Expand Up @@ -292,7 +292,7 @@ describe('util.submit-addon', () => {
const uploadUuid = '@some-guid';
mockNodeFetch(
sinon.stub(client, 'nodeFetch'),
new URL(`/addons/upload/${uploadUuid}/`, baseUrl),
new URL(`addons/upload/${uploadUuid}/`, baseUrl),
'GET',
[
{
Expand All @@ -315,7 +315,7 @@ describe('util.submit-addon', () => {
const uploadUuid = '@some-guid';
mockNodeFetch(
sinon.stub(client, 'nodeFetch'),
new URL(`/addons/upload/${uploadUuid}/`, baseUrl),
new URL(`addons/upload/${uploadUuid}/`, baseUrl),
'GET',
[
{ body: {}, status: 200 },
Expand All @@ -338,10 +338,10 @@ describe('util.submit-addon', () => {
validationCheckInterval: 1,
});
const uploadUuid = '@some-guid';
const validationUrl = new URL('/to/validation/report', baseUrl);
const validationUrl = new URL('to/validation/report', baseUrl);
mockNodeFetch(
sinon.stub(client, 'nodeFetch'),
new URL(`/addons/upload/${uploadUuid}/`, baseUrl),
new URL(`addons/upload/${uploadUuid}/`, baseUrl),
'GET',
[
{ body: {}, status: 200 },
Expand All @@ -364,7 +364,7 @@ describe('util.submit-addon', () => {
const client = new Client(clientDefaults);
mockNodeFetch(
sinon.stub(client, 'nodeFetch'),
new URL('/addons/addon/', baseUrl),
new URL('addons/addon/', baseUrl),
'POST',
[
{ body: sampleAddonDetail, status: 202 },
Expand Down Expand Up @@ -405,7 +405,7 @@ describe('util.submit-addon', () => {
const guid = '@some-addon-guid';
mockNodeFetch(
sinon.stub(client, 'nodeFetch'),
new URL(`/addons/addon/${guid}/`, baseUrl),
new URL(`addons/addon/${guid}/`, baseUrl),
'POST',
[
{ body: sampleAddonDetail, status: 202 },
Expand Down Expand Up @@ -451,7 +451,7 @@ describe('util.submit-addon', () => {
const addonId = '@random-addon';
const versionId = 0;
const detailUrl =
new URL(`/addons/addon/${addonId}/versions/${versionId}/`, baseUrl);
new URL(`addons/addon/${addonId}/versions/${versionId}/`, baseUrl);
mockNodeFetch(
sinon.stub(client, 'nodeFetch'),
detailUrl,
Expand All @@ -471,8 +471,8 @@ describe('util.submit-addon', () => {
const addonId = '@random-addon';
const versionId = 0;
const detailUrl =
new URL(`/addons/addon/${addonId}/versions/${versionId}/`, baseUrl);
const url = new URL('/file/download/url', baseUrl);
new URL(`addons/addon/${addonId}/versions/${versionId}/`, baseUrl);
const url = new URL('file/download/url', baseUrl);
mockNodeFetch(
sinon.stub(client, 'nodeFetch'),
detailUrl,
Expand Down Expand Up @@ -585,13 +585,13 @@ describe('util.submit-addon', () => {
const addUploadMocks = () => {
mockNodeFetch(
nodeFetchStub,
new URL('/addons/upload/', baseUrl),
new URL('addons/upload/', baseUrl),
'POST',
[{ body: sampleUploadDetail, status: 200 }]
);
mockNodeFetch(
nodeFetchStub,
new URL(`/addons/upload/${uploadUuid}/`, baseUrl),
new URL(`addons/upload/${uploadUuid}/`, baseUrl),
'GET',
[
{
Expand All @@ -606,7 +606,7 @@ describe('util.submit-addon', () => {
const url = (new URL(downloadPath, baseUrl).toString());
mockNodeFetch(
nodeFetchStub,
new URL(`/addons/addon/${addonId}/versions/${versionId}/`, baseUrl),
new URL(`addons/addon/${addonId}/versions/${versionId}/`, baseUrl),
'GET',
[
{
Expand Down Expand Up @@ -636,7 +636,7 @@ describe('util.submit-addon', () => {
const idFile = 'id.file';
mockNodeFetch(
nodeFetchStub,
new URL('/addons/addon/', baseUrl),
new URL('addons/addon/', baseUrl),
'POST',
[{ body: sampleAddonDetail, status: 200 }]
);
Expand All @@ -654,13 +654,13 @@ describe('util.submit-addon', () => {

mockNodeFetch(
nodeFetchStub,
new URL(`/addons/addon/${addonId}/`, baseUrl),
new URL(`addons/addon/${addonId}/`, baseUrl),
'PUT',
[{ body: sampleAddonDetail, status: 200 }]
);
mockNodeFetch(
nodeFetchStub,
new URL(`/addons/addon/${addonId}/versions/${query}`, baseUrl),
new URL(`addons/addon/${addonId}/versions/${query}`, baseUrl),
'GET',
[
{
Expand Down