Merge remote-tracking branch 'origin/1.4.x' into chore-1.4.x-upgrade
# Conflicts: # app/config/specs/open-api3-latest-client.json # app/config/specs/open-api3-latest-console.json # app/config/specs/open-api3-latest-server.json # app/config/specs/swagger2-latest-client.json # app/config/specs/swagger2-latest-console.json # app/config/specs/swagger2-latest-server.json
This commit is contained in:
commit
a77ff0a9b0
16 changed files with 22 additions and 22 deletions
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -739,7 +739,7 @@ App::get('/v1/teams/:teamId/memberships/:membershipId')
|
|||
});
|
||||
|
||||
App::patch('/v1/teams/:teamId/memberships/:membershipId')
|
||||
->desc('Update Membership Roles')
|
||||
->desc('Update Membership')
|
||||
->groups(['api', 'teams'])
|
||||
->label('event', 'teams.[teamId].memberships.[membershipId].update')
|
||||
->label('scope', 'teams.write')
|
||||
|
@ -747,8 +747,8 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
|
|||
->label('audits.resource', 'team/{request.teamId}')
|
||||
->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
|
||||
->label('sdk.namespace', 'teams')
|
||||
->label('sdk.method', 'updateMembershipRoles')
|
||||
->label('sdk.description', '/docs/references/teams/update-team-membership-roles.md')
|
||||
->label('sdk.method', 'updateMembership')
|
||||
->label('sdk.description', '/docs/references/teams/update-team-membership.md')
|
||||
->label('sdk.response.code', Response::STATUS_CODE_OK)
|
||||
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
|
||||
->label('sdk.response.model', Response::MODEL_MEMBERSHIP)
|
||||
|
|
|
@ -120,7 +120,7 @@ trait Base
|
|||
public static string $GET_TEAM_MEMBERSHIP = 'get_team_membership';
|
||||
public static string $GET_TEAM_MEMBERSHIPS = 'list_team_memberships';
|
||||
public static string $CREATE_TEAM_MEMBERSHIP = 'create_team_membership';
|
||||
public static string $UPDATE_TEAM_MEMBERSHIP_ROLES = 'update_team_membership_roles';
|
||||
public static string $UPDATE_TEAM_MEMBERSHIP = 'update_team_membership';
|
||||
public static string $UPDATE_TEAM_MEMBERSHIP_STATUS = 'update_membership_status';
|
||||
public static string $DELETE_TEAM_MEMBERSHIP = 'delete_team_membership';
|
||||
|
||||
|
@ -1296,9 +1296,9 @@ trait Base
|
|||
roles
|
||||
}
|
||||
}';
|
||||
case self::$UPDATE_TEAM_MEMBERSHIP_ROLES:
|
||||
return 'mutation updateTeamMembershipRoles($teamId: String!, $membershipId: String!, $roles: [String!]!){
|
||||
teamsUpdateMembershipRoles(teamId: $teamId, membershipId: $membershipId, roles: $roles) {
|
||||
case self::$UPDATE_TEAM_MEMBERSHIP:
|
||||
return 'mutation updateTeamMembership($teamId: String!, $membershipId: String!, $roles: [String!]!){
|
||||
teamsUpdateMembership(teamId: $teamId, membershipId: $membershipId, roles: $roles) {
|
||||
_id
|
||||
userId
|
||||
teamId
|
||||
|
|
|
@ -251,7 +251,7 @@ class TeamsServerTest extends Scope
|
|||
public function testUpdateTeamMembershipRoles($team, $membership)
|
||||
{
|
||||
$projectId = $this->getProject()['$id'];
|
||||
$query = $this->getQuery(self::$UPDATE_TEAM_MEMBERSHIP_ROLES);
|
||||
$query = $this->getQuery(self::$UPDATE_TEAM_MEMBERSHIP);
|
||||
$graphQLPayload = [
|
||||
'query' => $query,
|
||||
'variables' => [
|
||||
|
@ -268,7 +268,7 @@ class TeamsServerTest extends Scope
|
|||
|
||||
$this->assertIsArray($membership['body']['data']);
|
||||
$this->assertArrayNotHasKey('errors', $membership['body']);
|
||||
$membership = $membership['body']['data']['teamsUpdateMembershipRoles'];
|
||||
$membership = $membership['body']['data']['teamsUpdateMembership'];
|
||||
$this->assertEquals(['developer', 'admin'], $membership['roles']);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue