screwdriver-api 8.0.109 → 8.0.111

package/package.json

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

package/plugins/pipelines/batchUpdateAdmins.js

@@ -36,7 +36,7 @@ module.exports = () => ({
                     joi.object({
                         id: idSchema.required(),
                         scmContext: scmContextSchema.required(),
-                        usernames: joi.array().items(usernameSchema).min(1).max(50).required()
+                        usernames: joi.array().items(usernameSchema).min(1).max(200).required()
                     })
                 )
                 .min(1)

package/plugins/users/get.js

@@ -0,0 +1,61 @@
+'use strict';
+
+const boom = require('@hapi/boom');
+const joi = require('joi');
+const schema = require('screwdriver-data-schema');
+const getSchema = schema.models.user.base.get;
+const usernameSchema = schema.models.user.base.extract('username');
+const scmContextSchema = schema.models.pipeline.base.extract('scmContext');
+
+module.exports = () => ({
+    method: 'GET',
+    path: '/users/{username}',
+    options: {
+        description: 'Get an user by SCM username and SCM context',
+        notes: 'Returns an user by SCM username and SCM context',
+        tags: ['api', 'users'],
+        auth: {
+            strategies: ['token'],
+            scope: ['admin', '!guest']
+        },
+
+        handler: async (request, h) => {
+            const { username } = request.params;
+            const { userFactory } = request.server.app;
+            const { scmContext, includeUserToken } = request.query;
+
+            const user = await userFactory.get({
+                username,
+                scmContext
+            });
+
+            if (!user) {
+                throw boom.notFound(`User ${username} does not exist for the scmContext ${scmContext}`);
+            }
+
+            if (includeUserToken) {
+                const profile = request.server.plugins.auth.generateProfile({
+                    username: user.username,
+                    scmContext: user.scmContext,
+                    scope: ['user']
+                });
+
+                user.userToken = request.server.plugins.auth.generateToken(profile);
+            }
+
+            return h.response(user);
+        },
+        response: {
+            schema: getSchema
+        },
+        validate: {
+            params: joi.object({
+                username: usernameSchema
+            }),
+            query: joi.object({
+                scmContext: scmContextSchema.required(),
+                includeUserToken: joi.boolean().optional()
+            })
+        }
+    }
+});

package/plugins/users/index.js

@@ -3,6 +3,7 @@
 const getSettingsRoute = require('./settings/get');
 const updateSettingsRoute = require('./settings/update');
 const removeSettingsRoute = require('./settings/delete');
+const getUserRoute = require('./get');
 
 /**
  * Users API Plugin
@@ -12,7 +13,7 @@ const removeSettingsRoute = require('./settings/delete');
 const usersPlugin = {
     name: 'users',
     async register(server) {
-        server.route([getSettingsRoute(), updateSettingsRoute(), removeSettingsRoute()]);
+        server.route([getSettingsRoute(), updateSettingsRoute(), removeSettingsRoute(), getUserRoute()]);
     }
 };
 

package/plugins/webhooks/helper.js

@@ -1421,7 +1421,7 @@ async function startHookEvent(request, h, webhookConfig) {
         }
 
         // if skip ci then don't return
-        if (ignoreUser && ignoreUser.length !== 0 && !skipMessage) {
+        if (action !== 'tag' && action !== 'release' && ignoreUser && ignoreUser.length !== 0 && !skipMessage) {
             const commitAuthors =
                 Array.isArray(webhookConfig.commitAuthors) && webhookConfig.commitAuthors.length !== 0
                     ? webhookConfig.commitAuthors