From ae12ae769c8224a75b829d864e633c703e6745c6 Mon Sep 17 00:00:00 2001 From: renjie <1354334940@qq.com> Date: Thu, 7 Jun 2018 12:26:28 +0800 Subject: [PATCH 1/2] fix update user bug. skip_confirmation -> skip_reconfirmation --- src/main/java/org/gitlab4j/api/UserApi.java | 31 ++++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gitlab4j/api/UserApi.java b/src/main/java/org/gitlab4j/api/UserApi.java index e0ebcac6d..2683a24bc 100644 --- a/src/main/java/org/gitlab4j/api/UserApi.java +++ b/src/main/java/org/gitlab4j/api/UserApi.java @@ -843,12 +843,13 @@ Form userToForm(User user, Integer projectsLimit, CharSequence password, Boolean } projectsLimit = (projectsLimit == null) ? user.getProjectsLimit() : projectsLimit; - return (new GitLabApiForm() - .withParam("email", user.getEmail(), create) + if(create){ + return (new GitLabApiForm() + .withParam("email", user.getEmail(), true) .withParam("password", password, false) .withParam("reset_password", resetPassword, false) - .withParam("username", user.getUsername(), create) - .withParam("name", user.getName(), create) + .withParam("username", user.getUsername(), true) + .withParam("name", user.getName(), true) .withParam("skype", user.getSkype(), false) .withParam("linkedin", user.getLinkedin(), false) .withParam("twitter", user.getTwitter(), false) @@ -864,5 +865,27 @@ Form userToForm(User user, Integer projectsLimit, CharSequence password, Boolean .withParam("skip_confirmation", user.getSkipConfirmation(), false) .withParam("external", user.getExternal(), false) .withParam("shared_runners_minutes_limit", user.getSharedRunnersMinutesLimit(),false)); + } + return (new GitLabApiForm() + .withParam("email", user.getEmail(), false) + .withParam("password", password, false) + .withParam("reset_password", resetPassword, false) + .withParam("username", user.getUsername(), false) + .withParam("name", user.getName(), false) + .withParam("skype", user.getSkype(), false) + .withParam("linkedin", user.getLinkedin(), false) + .withParam("twitter", user.getTwitter(), false) + .withParam("website_url", user.getWebsiteUrl(), false) + .withParam("organization", user.getOrganization(), false) + .withParam("projects_limit", projectsLimit, false) + .withParam("extern_uid", user.getExternUid(), false) + .withParam("provider", user.getProvider(), false) + .withParam("bio", user.getBio(), false) + .withParam("location", user.getLocation(), false) + .withParam("admin", user.getIsAdmin(), false) + .withParam("can_create_group", user.getCanCreateGroup(), false) + .withParam("skip_reconfirmation", user.getSkipConfirmation(), false) + .withParam("external", user.getExternal(), false) + .withParam("shared_runners_minutes_limit", user.getSharedRunnersMinutesLimit(),false)); } } From 01b46eaa50885e81ba731241324c5223c1e90f40 Mon Sep 17 00:00:00 2001 From: renjie <1354334940@qq.com> Date: Thu, 7 Jun 2018 12:32:40 +0800 Subject: [PATCH 2/2] fix update user bug. skip_confirmation -> skip_reconfirmation --- src/main/java/org/gitlab4j/api/UserApi.java | 32 ++++----------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/src/main/java/org/gitlab4j/api/UserApi.java b/src/main/java/org/gitlab4j/api/UserApi.java index 2683a24bc..4bed4d721 100644 --- a/src/main/java/org/gitlab4j/api/UserApi.java +++ b/src/main/java/org/gitlab4j/api/UserApi.java @@ -842,36 +842,14 @@ Form userToForm(User user, Integer projectsLimit, CharSequence password, Boolean } } projectsLimit = (projectsLimit == null) ? user.getProjectsLimit() : projectsLimit; + String skipConfirmationFeildName = create ? "skip_confirmation" : "skip_reconfirmation"; - if(create){ - return (new GitLabApiForm() - .withParam("email", user.getEmail(), true) - .withParam("password", password, false) - .withParam("reset_password", resetPassword, false) - .withParam("username", user.getUsername(), true) - .withParam("name", user.getName(), true) - .withParam("skype", user.getSkype(), false) - .withParam("linkedin", user.getLinkedin(), false) - .withParam("twitter", user.getTwitter(), false) - .withParam("website_url", user.getWebsiteUrl(), false) - .withParam("organization", user.getOrganization(), false) - .withParam("projects_limit", projectsLimit, false) - .withParam("extern_uid", user.getExternUid(), false) - .withParam("provider", user.getProvider(), false) - .withParam("bio", user.getBio(), false) - .withParam("location", user.getLocation(), false) - .withParam("admin", user.getIsAdmin(), false) - .withParam("can_create_group", user.getCanCreateGroup(), false) - .withParam("skip_confirmation", user.getSkipConfirmation(), false) - .withParam("external", user.getExternal(), false) - .withParam("shared_runners_minutes_limit", user.getSharedRunnersMinutesLimit(),false)); - } return (new GitLabApiForm() - .withParam("email", user.getEmail(), false) + .withParam("email", user.getEmail(), create) .withParam("password", password, false) .withParam("reset_password", resetPassword, false) - .withParam("username", user.getUsername(), false) - .withParam("name", user.getName(), false) + .withParam("username", user.getUsername(), create) + .withParam("name", user.getName(), create) .withParam("skype", user.getSkype(), false) .withParam("linkedin", user.getLinkedin(), false) .withParam("twitter", user.getTwitter(), false) @@ -884,7 +862,7 @@ Form userToForm(User user, Integer projectsLimit, CharSequence password, Boolean .withParam("location", user.getLocation(), false) .withParam("admin", user.getIsAdmin(), false) .withParam("can_create_group", user.getCanCreateGroup(), false) - .withParam("skip_reconfirmation", user.getSkipConfirmation(), false) + .withParam(skipConfirmationFeildName, user.getSkipConfirmation(), false) .withParam("external", user.getExternal(), false) .withParam("shared_runners_minutes_limit", user.getSharedRunnersMinutesLimit(),false)); }