screwdriver-api 8.0.119 → 8.0.121

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/plugins/events/stopBuilds.js +3 -2
  3. package/plugins/jobs/update.js +3 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "screwdriver-api",
3
- "version": "8.0.119",
3
+ "version": "8.0.121",
4
4
  "description": "API server for the Screwdriver.cd service",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/plugins/events/stopBuilds.js CHANGED
@@ -23,7 +23,7 @@ module.exports = () => ({
23
23
  },
24
24
 
25
25
  handler: async (request, h) => {
26
- const { eventFactory, pipelineFactory, userFactory } = request.server.app;
26
+ const { eventFactory, pipelineFactory, userFactory, bannerFactory } = request.server.app;
27
27
  const { username, scmContext, scmUserId } = request.auth.credentials;
28
28
  const { isValidToken } = request.server.plugins.pipelines;
29
29
  const eventId = request.params.id;
@@ -49,9 +49,10 @@ module.exports = () => ({
49
49
 
50
50
  // Check permissions
51
51
  let permissions;
52
+ const scmDisplayName = bannerFactory.scm.getDisplayName({ scmContext });
52
53
  const adminDetails = request.server.plugins.banners.screwdriverAdminDetails(
53
54
  username,
54
- scmContext,
55
+ scmDisplayName,
55
56
  scmUserId
56
57
  );
57
58
 
package/plugins/jobs/update.js CHANGED
@@ -19,7 +19,7 @@ module.exports = () => ({
19
19
  },
20
20
 
21
21
  handler: async (request, h) => {
22
- const { jobFactory, pipelineFactory, userFactory } = request.server.app;
22
+ const { jobFactory, pipelineFactory, userFactory, bannerFactory } = request.server.app;
23
23
  const { id } = request.params;
24
24
  const { username, scmContext, scmUserId } = request.auth.credentials;
25
25
  const { isValidToken } = request.server.plugins.pipelines;
@@ -51,9 +51,10 @@ module.exports = () => ({
51
51
  const scmUri = await getScmUri({ pipeline, pipelineFactory });
52
52
 
53
53
  // Check the user's permission
54
+ const scmDisplayName = bannerFactory.scm.getDisplayName({ scmContext });
54
55
  const adminDetails = request.server.plugins.banners.screwdriverAdminDetails(
55
56
  username,
56
- scmContext,
57
+ scmDisplayName,
57
58
  scmUserId
58
59
  );
59
60