Skip to content

Commit

Permalink
catalog-backend: pass token to locationService in location routes
Browse files Browse the repository at this point in the history 
Signed-off-by: MT Lewis <mtlewis@users.noreply.github.com>
  • Loading branch information
@mtlewis
mtlewis committed Jan 27, 2022
1 parent 601ccdb commit 5bbffa6
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 13 deletions.
5 changes: 5 additions & 0 deletions .changeset/thirty-houses-juggle.md
View file
@@ -0,0 +1,5 @@
---
'@backstage/plugin-catalog-backend': patch
---

Pass authorization token to location service inside location api routes
46 changes: 38 additions & 8 deletions plugins/catalog-backend/src/service/createRouter.test.ts
View file
Expand Up @@ -250,8 +250,14 @@ describe('createRouter readonly disabled', () => {
];
locationService.listLocations.mockResolvedValueOnce(locations);

const response = await request(app).get('/locations');
const response = await request(app)
.get('/locations')
.set('authorization', 'Bearer someauthtoken');

expect(locationService.listLocations).toHaveBeenCalledTimes(1);
expect(locationService.listLocations).toHaveBeenCalledWith({
authorizationToken: 'someauthtoken',
});
expect(response.status).toEqual(200);
expect(response.body).toEqual([
{ data: { id: 'foo', target: 'example.com', type: 'url' } },
Expand All @@ -266,7 +272,10 @@ describe('createRouter readonly disabled', () => {
target: 'c',
} as unknown as LocationSpec;

const response = await request(app).post('/locations').send(spec);
const response = await request(app)
.post('/locations')
.set('authorization', 'Bearer someauthtoken')
.send(spec);

expect(locationService.createLocation).not.toHaveBeenCalled();
expect(response.status).toEqual(400);
Expand All @@ -283,10 +292,15 @@ describe('createRouter readonly disabled', () => {
entities: [],
});

const response = await request(app).post('/locations').send(spec);
const response = await request(app)
.post('/locations')
.set('authorization', 'Bearer someauthtoken')
.send(spec);

expect(locationService.createLocation).toHaveBeenCalledTimes(1);
expect(locationService.createLocation).toHaveBeenCalledWith(spec, false);
expect(locationService.createLocation).toHaveBeenCalledWith(spec, false, {
authorizationToken: 'someauthtoken',
});
expect(response.status).toEqual(201);
expect(response.body).toEqual(
expect.objectContaining({
Expand All @@ -308,10 +322,13 @@ describe('createRouter readonly disabled', () => {

const response = await request(app)
.post('/locations?dryRun=true')
.set('authorization', 'Bearer someauthtoken')
.send(spec);

expect(locationService.createLocation).toHaveBeenCalledTimes(1);
expect(locationService.createLocation).toHaveBeenCalledWith(spec, true);
expect(locationService.createLocation).toHaveBeenCalledWith(spec, true, {
authorizationToken: 'someauthtoken',
});
expect(response.status).toEqual(201);
expect(response.body).toEqual(
expect.objectContaining({
Expand Down Expand Up @@ -397,7 +414,14 @@ describe('createRouter readonly enabled', () => {
];
locationService.listLocations.mockResolvedValueOnce(locations);

const response = await request(app).get('/locations');
const response = await request(app)
.get('/locations')
.set('authorization', 'Bearer someauthtoken');

expect(locationService.listLocations).toHaveBeenCalledTimes(1);
expect(locationService.listLocations).toHaveBeenCalledWith({
authorizationToken: 'someauthtoken',
});

expect(response.status).toEqual(200);
expect(response.body).toEqual([
Expand All @@ -413,7 +437,10 @@ describe('createRouter readonly enabled', () => {
target: 'c',
};

const response = await request(app).post('/locations').send(spec);
const response = await request(app)
.post('/locations')
.set('authorization', 'Bearer someauthtoken')
.send(spec);

expect(locationService.createLocation).not.toHaveBeenCalled();
expect(response.status).toEqual(403);
Expand All @@ -433,10 +460,13 @@ describe('createRouter readonly enabled', () => {

const response = await request(app)
.post('/locations?dryRun=true')
.set('authorization', 'Bearer someauthtoken')
.send(spec);

expect(locationService.createLocation).toHaveBeenCalledTimes(1);
expect(locationService.createLocation).toHaveBeenCalledWith(spec, true);
expect(locationService.createLocation).toHaveBeenCalledWith(spec, true, {
authorizationToken: 'someauthtoken',
});
expect(response.status).toEqual(201);
expect(response.body).toEqual(
expect.objectContaining({
Expand Down
18 changes: 13 additions & 5 deletions plugins/catalog-backend/src/service/createRouter.ts
View file
Expand Up @@ -174,24 +174,32 @@ export async function createRouter(
disallowReadonlyMode(readonlyEnabled);
}

const output = await locationService.createLocation(input, dryRun);
const output = await locationService.createLocation(input, dryRun, {
authorizationToken: getBearerToken(req.header('authorization')),
});
res.status(201).json(output);
})
.get('/locations', async (_req, res) => {
const locations = await locationService.listLocations();
.get('/locations', async (req, res) => {
const locations = await locationService.listLocations({
authorizationToken: getBearerToken(req.header('authorization')),
});
res.status(200).json(locations.map(l => ({ data: l })));
})

.get('/locations/:id', async (req, res) => {
const { id } = req.params;
const output = await locationService.getLocation(id);
const output = await locationService.getLocation(id, {
authorizationToken: getBearerToken(req.header('authorization')),
});
res.status(200).json(output);
})
.delete('/locations/:id', async (req, res) => {
disallowReadonlyMode(readonlyEnabled);

const { id } = req.params;
await locationService.deleteLocation(id);
await locationService.deleteLocation(id, {
authorizationToken: getBearerToken(req.header('authorization')),
});
res.status(204).end();
});
}
Expand Down

0 comments on commit 5bbffa6

Please sign in to comment.