screwdriver-api 8.0.70 → 8.0.72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "8.0.70",
+  "version": "8.0.72",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {

package/plugins/auth/index.js

@@ -230,6 +230,17 @@ const authPlugin = {
                             scmContext: user.scmContext,
                             scope: ['user']
                         };
+
+                        const scmDisplayName = scm.getDisplayName({ scmContext: profile.scmContext });
+                        const userDisplayName = pluginOptions.authCheckById
+                            ? `${scmDisplayName}:${profile.username}:${profile.scmUserId}`
+                            : `${scmDisplayName}:${profile.username}`;
+                        const admins = pluginOptions.authCheckById ? pluginOptions.sdAdmins : pluginOptions.admins;
+
+                        // Check admin
+                        if (admins.length > 0 && admins.includes(userDisplayName)) {
+                            profile.scope.push('admin');
+                        }
                     }
                     if (token.pipelineId) {
                         // if token has pipelineId then the token is for pipeline

package/plugins/builds/helper/updateBuild.js

@@ -400,18 +400,19 @@ async function updateBuildAndTriggerDownstreamJobs(config, build, server, userna
         jobName: job.name,
         pipelineId: pipeline.id
     });
+    let stageBuild;
     const isStageTeardown = STAGE_TEARDOWN_PATTERN.test(job.name);
     let stageBuildHasFailure = false;
 
     if (stage) {
-        const stageBuild = await stageBuildFactory.get({
+        stageBuild = await stageBuildFactory.get({
             stageId: stage.id,
             eventId: newEvent.id
         });
 
-        const newStageBuild = await updateStageBuildStatus({ stageBuild, newStatus: newBuild.status, job });
+        stageBuild = await updateStageBuildStatus({ stageBuild, newStatus: newBuild.status, job });
 
-        stageBuildHasFailure = TERMINAL_STATUSES.includes(newStageBuild.status);
+        stageBuildHasFailure = TERMINAL_STATUSES.includes(stageBuild.status);
     }
 
     // Guard against triggering non-successful or unstable builds
@@ -461,6 +462,7 @@ async function updateBuildAndTriggerDownstreamJobs(config, build, server, userna
 
                 if (teardownNode && teardownNode.virtual) {
                     await updateVirtualBuildSuccess(stageTeardownBuild);
+                    await updateStageBuildStatus({ stageBuild, newStatus: 'SUCCESS', job: stageTeardownJob });
                 } else {
                     stageTeardownBuild.status = 'QUEUED';