fix: user management for team admins (#752)

* fix: improve modify user data functions

* feat: add modify user tests

* feat: update modify user teams endpoint

Author: ferruhcihan

src/api/v1/teams/{teamId}/users.ts

@@ -1,15 +1,15 @@
 import Debug from 'debug'
 import { Operation, OperationHandlerArray } from 'express-openapi'
-import { OpenApiRequestExt, User } from 'src/otomi-models'
+import { OpenApiRequestExt, SessionUser, User } from 'src/otomi-models'
 
 const debug = Debug('otomi:api:v1:teams:users')
 type UserBasicInfo = Pick<User, 'id' | 'email' | 'isPlatformAdmin' | 'isTeamAdmin' | 'teams'>
 
 export default function (): OperationHandlerArray {
   const put: Operation = [
-    async ({ otomi, params: { teamId }, body }: OpenApiRequestExt, res): Promise<void> => {
+    async ({ otomi, params: { teamId }, user, body }: OpenApiRequestExt, res): Promise<void> => {
       debug(`editTeamUsers(${teamId})`)
-      const v = await otomi.editTeamUsers(body as UserBasicInfo[])
+      const v = await otomi.editTeamUsers(body as UserBasicInfo[], user as SessionUser)
       res.json(v)
     },
   ]

src/api/v1/users/{userId}.ts

@@ -1,6 +1,6 @@
 import Debug from 'debug'
 import { Operation, OperationHandlerArray } from 'express-openapi'
-import { OpenApiRequestExt, User } from 'src/otomi-models'
+import { OpenApiRequestExt, SessionUser, User } from 'src/otomi-models'
 
 const debug = Debug('otomi:api:v1:users')
 
@@ -13,9 +13,9 @@ export default function (): OperationHandlerArray {
     },
   ]
   const put: Operation = [
-    async ({ otomi, params: { userId }, body }: OpenApiRequestExt, res): Promise<void> => {
+    async ({ otomi, params: { userId }, user, body }: OpenApiRequestExt, res): Promise<void> => {
       debug(`editUser(${userId})`)
-      const data = await otomi.editUser(decodeURIComponent(userId), body as User)
+      const data = await otomi.editUser(decodeURIComponent(userId), body as User, user as SessionUser)
       res.json(data)
     },
   ]

src/openapi/api.yaml

@@ -1580,12 +1580,6 @@ paths:
                 properties:
                   id:
                     $ref: '#/components/schemas/User/properties/id'
-                  email:
-                    $ref: '#/components/schemas/User/properties/email'
-                  isPlatformAdmin:
-                    $ref: '#/components/schemas/User/properties/isPlatformAdmin'
-                  isTeamAdmin:
-                    $ref: '#/components/schemas/User/properties/isTeamAdmin'
                   teams:
                     $ref: '#/components/schemas/User/properties/teams'
         description: User object that contains updated values
@@ -1599,7 +1593,12 @@ paths:
               schema:
                 type: array
                 items:
-                  $ref: '#/components/schemas/User'
+                  type: object
+                  properties:
+                    id:
+                      $ref: '#/components/schemas/User/properties/id'
+                    teams:
+                      $ref: '#/components/schemas/User/properties/teams'
 
   '/v1/projects':
     get: