[Improvement-18383][API] Disable create user, reset password, and username edit in non-PASSWORD auth modes #18384
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.dolphinscheduler.api.controller; | ||
|
|
||
| import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; | ||
|
|
||
| import org.apache.dolphinscheduler.api.enums.Status; | ||
| import org.apache.dolphinscheduler.api.service.UsersService; | ||
| import org.apache.dolphinscheduler.api.utils.Result; | ||
| import org.apache.dolphinscheduler.common.utils.JSONUtils; | ||
| import org.apache.dolphinscheduler.dao.entity.User; | ||
|
|
||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.http.MediaType; | ||
| import org.springframework.test.context.TestPropertySource; | ||
| import org.springframework.test.web.servlet.MvcResult; | ||
| import org.springframework.util.LinkedMultiValueMap; | ||
| import org.springframework.util.MultiValueMap; | ||
|
|
||
| @TestPropertySource(properties = { | ||
| "security.authentication.type=PASSWORD", | ||
| "security.authentication.oauth2.enable=false" | ||
| }) | ||
| public class UsersControllerPasswordModeTest extends AbstractControllerTest { | ||
|
|
||
| @Autowired | ||
| private UsersService usersService; | ||
|
|
||
| @Test | ||
| public void testCreateUserSuccess() throws Exception { | ||
| String userName = uniqueUserName("create_success"); | ||
|
|
||
| MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>(); | ||
| paramsMap.add("userName", userName); | ||
| paramsMap.add("userPassword", "123456qwe?"); | ||
| paramsMap.add("tenantId", "-1"); | ||
| paramsMap.add("queue", ""); | ||
| paramsMap.add("email", userName + "@example.com"); | ||
| paramsMap.add("phone", "15800000000"); | ||
| paramsMap.add("state", "1"); | ||
|
|
||
| MvcResult mvcResult = mockMvc.perform(post("/users/create") | ||
| .header(SESSION_ID, sessionId) | ||
| .params(paramsMap)) | ||
| .andExpect(status().isCreated()) | ||
| .andExpect(content().contentType(MediaType.APPLICATION_JSON)) | ||
| .andReturn(); | ||
|
|
||
| Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class); | ||
| Assertions.assertEquals(Status.SUCCESS.getCode(), result.getCode().intValue()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testUpdateUserSuccess() throws Exception { | ||
| String userName = uniqueUserName("update_success"); | ||
| createUser(userName); | ||
| User user = usersService.getUserByUserName(userName); | ||
|
|
||
| MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>(); | ||
| paramsMap.add("id", String.valueOf(user.getId())); | ||
| paramsMap.add("userName", userName + "_new"); | ||
| paramsMap.add("userPassword", ""); | ||
| paramsMap.add("tenantId", "-1"); | ||
| paramsMap.add("queue", ""); | ||
| paramsMap.add("email", "updated-" + userName + "@example.com"); | ||
| paramsMap.add("phone", "15800000001"); | ||
| paramsMap.add("state", "1"); | ||
| paramsMap.add("timeZone", "Asia/Shanghai"); | ||
|
|
||
| MvcResult mvcResult = mockMvc.perform(post("/users/update") | ||
| .header(SESSION_ID, sessionId) | ||
| .params(paramsMap)) | ||
| .andExpect(status().isOk()) | ||
| .andExpect(content().contentType(MediaType.APPLICATION_JSON)) | ||
| .andReturn(); | ||
|
|
||
| Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class); | ||
| Assertions.assertEquals(Status.SUCCESS.getCode(), result.getCode().intValue()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testUpdateUserPasswordSuccess() throws Exception { | ||
| String userName = uniqueUserName("password_success"); | ||
| createUser(userName); | ||
| User user = usersService.getUserByUserName(userName); | ||
|
|
||
| MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>(); | ||
| paramsMap.add("id", String.valueOf(user.getId())); | ||
| paramsMap.add("userName", userName); | ||
| paramsMap.add("userPassword", "updated123?"); | ||
| paramsMap.add("tenantId", "-1"); | ||
| paramsMap.add("queue", ""); | ||
| paramsMap.add("email", userName + "@example.com"); | ||
| paramsMap.add("phone", "15800000002"); | ||
| paramsMap.add("state", "1"); | ||
| paramsMap.add("timeZone", "Asia/Shanghai"); | ||
|
|
||
| MvcResult mvcResult = mockMvc.perform(post("/users/update") | ||
| .header(SESSION_ID, sessionId) | ||
| .params(paramsMap)) | ||
| .andExpect(status().isOk()) | ||
| .andExpect(content().contentType(MediaType.APPLICATION_JSON)) | ||
| .andReturn(); | ||
|
|
||
| Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class); | ||
| Assertions.assertEquals(Status.SUCCESS.getCode(), result.getCode().intValue()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testRegisterUserSuccess() throws Exception { | ||
| MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>(); | ||
| String userName = uniqueUserName("register_success"); | ||
| paramsMap.add("userName", userName); | ||
| paramsMap.add("userPassword", "123456qwe?"); | ||
| paramsMap.add("repeatPassword", "123456qwe?"); | ||
| paramsMap.add("email", userName + "@example.com"); | ||
|
|
||
| MvcResult mvcResult = mockMvc.perform(post("/users/register") | ||
| .params(paramsMap)) | ||
| .andExpect(status().isOk()) | ||
| .andExpect(content().contentType(MediaType.APPLICATION_JSON)) | ||
| .andReturn(); | ||
|
|
||
| Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class); | ||
| Assertions.assertEquals(Status.SUCCESS.getCode(), result.getCode().intValue()); | ||
| } | ||
|
|
||
| private User createUser(String userName) { | ||
| return usersService.createUser(userName, "123456qwe?", userName + "@example.com", -1, "15800000000", "", 1); | ||
| } | ||
|
|
||
| private String uniqueUserName(String prefix) { | ||
| return prefix + "_" + System.nanoTime(); | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is an incompatible modification and needs to be added to the document.
docs/docs/en/guide/upgrade/incompatible.mddocs/docs/zh/guide/upgrade/incompatible.mdWhen
security.authentication.type = passwordandoauth2.enable=trueat the same time, it will lead to confusion for users, so we should add a unified type for users to choose.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is actually a separate issue. I plan to create a new issue to handle it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the same kind of thing. For users, it is an incompatible changes. Please submit it in the current PR.