Skip to content

Commit

Permalink
server: rename authenticationOriginsAction, #TASK-5979
Browse files Browse the repository at this point in the history
  • Loading branch information
pfurio committed Jun 25, 2024
1 parent 9c256bb commit f708e18
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ private RestResponse<OrganizationConfiguration> updateConfiguration() throws Exc
queryParams.putIfNotEmpty("include", commandOptions.include);
queryParams.putIfNotEmpty("exclude", commandOptions.exclude);
queryParams.putIfNotNull("includeResult", commandOptions.includeResult);
queryParams.putIfNotNull("authenticationOrigins", commandOptions.authenticationOrigins);
queryParams.putIfNotNull("authenticationOriginsAction", commandOptions.authenticationOriginsAction);


OrganizationConfiguration organizationConfiguration = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,8 @@ public class UpdateConfigurationCommandOptions {
@Parameter(names = {"--include-result"}, description = "Flag indicating to include the created or updated document result in the response", required = false, help = true, arity = 0)
public boolean includeResult = false;

@Parameter(names = {"--authentication-origins"}, description = "Action to be performed if the array of authenticationOrigins is being updated.", required = false, arity = 1)
public String authenticationOrigins = "ADD";
@Parameter(names = {"--authentication-origins-action"}, description = "Action to be performed if the array of authenticationOrigins is being updated.", required = false, arity = 1)
public String authenticationOriginsAction = "ADD";

@Parameter(names = {"--optimizations-simplify-permissions"}, description = "The body web service simplifyPermissions parameter", required = false, help = true, arity = 0)
public boolean optimizationsSimplifyPermissions = false;
Expand Down
4 changes: 2 additions & 2 deletions opencga-client/src/main/R/R/Organization-methods.R
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#' | searchNotes | /{apiVersion}/organizations/notes/search | include, exclude, creationDate, modificationDate, id, scope, visibility, uuid, userId, tags, version |
#' | deleteNotes | /{apiVersion}/organizations/notes/{id}/delete | id[*], includeResult |
#' | updateNotes | /{apiVersion}/organizations/notes/{id}/update | include, exclude, id[*], includeResult, body[*] |
#' | updateConfiguration | /{apiVersion}/organizations/{organization}/configuration/update | include, exclude, organization[*], includeResult, authenticationOrigins, body[*] |
#' | updateConfiguration | /{apiVersion}/organizations/{organization}/configuration/update | include, exclude, organization[*], includeResult, authenticationOriginsAction, body[*] |
#' | info | /{apiVersion}/organizations/{organization}/info | include, exclude, organization[*] |
#' | update | /{apiVersion}/organizations/{organization}/update | include, exclude, organization[*], includeResult, adminsAction, body[*] |
#'
Expand Down Expand Up @@ -94,7 +94,7 @@ setMethod("organizationClient", "OpencgaR", function(OpencgaR, id, organization,
#' @param exclude Fields excluded in the response, whole JSON path must be provided.
#' @param organization Organization id.
#' @param includeResult Flag indicating to include the created or updated document result in the response.
#' @param authenticationOrigins Action to be performed if the array of authenticationOrigins is being updated. Allowed values: ['ADD SET REMOVE REPLACE']
#' @param authenticationOriginsAction Action to be performed if the array of authenticationOrigins is being updated. Allowed values: ['ADD SET REMOVE REPLACE']
#' @param data JSON containing the params to be updated.
updateConfiguration=fetchOpenCGA(object=OpencgaR, category="organizations", categoryId=organization,
subcategory="configuration", subcategoryId=NULL, action="update", params=params, httpMethod="POST",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public RestResponse<Note> updateNotes(String id, NoteUpdateParams data, ObjectMa
* include: Fields included in the response, whole JSON path must be provided.
* exclude: Fields excluded in the response, whole JSON path must be provided.
* includeResult: Flag indicating to include the created or updated document result in the response.
* authenticationOrigins: Action to be performed if the array of authenticationOrigins is being updated.
* authenticationOriginsAction: Action to be performed if the array of authenticationOrigins is being updated.
* @return a RestResponse object.
* @throws ClientException ClientException if there is any server error.
*/
Expand Down
2 changes: 1 addition & 1 deletion opencga-client/src/main/javascript/Organization.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export default class Organization extends OpenCGAParentClass {
* @param {String} [params.exclude] - Fields excluded in the response, whole JSON path must be provided.
* @param {Boolean} [params.includeResult = "false"] - Flag indicating to include the created or updated document result in the response.
* The default value is false.
* @param {"ADD SET REMOVE REPLACE"} [params.authenticationOrigins = "ADD"] - Action to be performed if the array of
* @param {"ADD SET REMOVE REPLACE"} [params.authenticationOriginsAction = "ADD"] - Action to be performed if the array of
* authenticationOrigins is being updated. The default value is ADD.
* @returns {Promise} Promise object in the form of RestResponse instance.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ def update_configuration(self, organization, data=None, **options):
must be provided.
:param bool include_result: Flag indicating to include the created or
updated document result in the response.
:param str authentication_origins: Action to be performed if the array
of authenticationOrigins is being updated. Allowed values: ['ADD
SET REMOVE REPLACE']
:param str authentication_origins_action: Action to be performed if
the array of authenticationOrigins is being updated. Allowed
values: ['ADD SET REMOVE REPLACE']
"""

return self._post(category='organizations', resource='update', query_id=organization, subcategory='configuration', data=data, **options)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public Response updateConfiguration(
@ApiParam(value = ParamConstants.ORGANIZATION_DESCRIPTION, required = true) @PathParam(ParamConstants.ORGANIZATION) String organizationId,
@ApiParam(value = ParamConstants.INCLUDE_RESULT_DESCRIPTION, defaultValue = "false") @QueryParam(ParamConstants.INCLUDE_RESULT_PARAM) boolean includeResult,
@ApiParam(value = "Action to be performed if the array of authenticationOrigins is being updated.",
allowableValues = "ADD,REMOVE,SET,REPLACE", defaultValue = "ADD") @QueryParam("authenticationOrigins") ParamUtils.UpdateAction authOriginsAction,
allowableValues = "ADD,REMOVE,SET,REPLACE", defaultValue = "ADD") @QueryParam("authenticationOriginsAction") ParamUtils.UpdateAction authOriginsAction,
@ApiParam(value = "JSON containing the params to be updated.", required = true) OrganizationConfiguration parameters) {
try {
if (authOriginsAction == null) {
Expand Down

0 comments on commit f708e18

Please sign in to comment.