screwdriver-api 7.0.143 → 7.0.144

package/package.json

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

package/plugins/events/index.js

@@ -27,10 +27,10 @@ const eventsPlugin = {
          * @return {Promise}                Updates the pipeline admins and throws an error if not an admin
          */
         server.expose('updateAdmins', ({ permissions, pipeline, username }) => {
-            const newAdmins = pipeline.admins;
-
             // Delete user from admin list if bad permissions
             if (!permissions.push) {
+                const newAdmins = pipeline.admins;
+
                 delete newAdmins[username];
                 // This is needed to make admins dirty and update db
                 pipeline.admins = newAdmins;
@@ -40,16 +40,18 @@ const eventsPlugin = {
                 });
             }
 
-            // Add user as admin if permissions good and does not already exist
-            if (!pipeline.admins[username]) {
-                newAdmins[username] = true;
-                // This is needed to make admins dirty and update db
-                pipeline.admins = newAdmins;
+            // Put current user at the head of admins to use its SCM token after this
+            // SCM token is got from the first pipeline admin
+            const newAdminNames = [username, ...Object.keys(pipeline.admins)];
+            const newAdmins = {};
 
-                return pipeline.update();
-            }
+            newAdminNames.forEach(name => {
+                newAdmins[name] = true;
+            });
+
+            pipeline.admins = newAdmins;
 
-            return Promise.resolve();
+            return pipeline.update();
         });
 
         server.route([

package/plugins/webhooks/helper.js

@@ -88,24 +88,30 @@ async function updateAdmins(userFactory, username, scmContext, pipeline, pipelin
     try {
         const user = await userFactory.get({ username, scmContext });
         const userPermissions = await user.getPermissions(pipeline.scmUri);
-        const newAdmins = pipeline.admins;
 
         // Delete user from admin list if bad permissions
         if (!userPermissions.push) {
+            const newAdmins = pipeline.admins;
+
             delete newAdmins[username];
             // This is needed to make admins dirty and update db
             pipeline.admins = newAdmins;
 
             return pipeline.update();
         }
-        // Add user as admin if permissions good and does not already exist
-        if (!pipeline.admins[username]) {
-            newAdmins[username] = true;
-            // This is needed to make admins dirty and update db
-            pipeline.admins = newAdmins;
 
-            return pipeline.update();
-        }
+        // Put current user at the head of admins to use its SCM token after this
+        // SCM token is got from the first pipeline admin
+        const newAdminNames = [username, ...Object.keys(pipeline.admins)];
+        const newAdmins = {};
+
+        newAdminNames.forEach(name => {
+            newAdmins[name] = true;
+        });
+
+        pipeline.admins = newAdmins;
+
+        return pipeline.update();
     } catch (err) {
         logger.info(err.message);
     }