Skip to content

[Improvement-17874][ApiServer] Remove the default value of expireTime and let the user choose the time #17907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
njnu-seafish wants to merge 11 commits into
base: dev
Choose a base branch
from
+31 −7
Open

[Improvement-17874][ApiServer] Remove the default value of expireTime and let the user choose the time #17907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8ae8863
remove expireTime default value
Jan 27, 2026
942910a
update expireTime type
Jan 28, 2026
8bfdb4d
set expireTime default value = null
Jan 28, 2026
33f6b50
Merge branch 'dev' into Improvement-17874
njnu-seafish Jan 30, 2026
b4f9a60
Merge branch 'dev' into Improvement-17874
njnu-seafish Feb 3, 2026
b512cad
Merge branch 'dev' into Improvement-17874
njnu-seafish Feb 27, 2026
549bacc
Merge branch 'apache:dev' into Improvement-17874
njnu-seafish Feb 27, 2026
e56b551
unify number type
Feb 28, 2026
0a303bd
Merge branch 'dev' into Improvement-17874
njnu-seafish Feb 28, 2026
d513edc
Merge branch 'dev' into Improvement-17874
SbloodyS Mar 2, 2026
c8a2fc0
setExpireTime in E2E
Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions ...uler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/security/TokenPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ public TokenPage create(String userName) {

WebDriverWaitFactory.createWebDriverWait(driver)
.until(ExpectedConditions.elementToBeClickable(createTokenForm().selectUserNameDropdown()));
setExpireTime(30);
createTokenForm().selectUserNameDropdown().click();
WebDriverWaitFactory.createWebDriverWait(driver)
.until(ExpectedConditions.visibilityOfElementLocated(new By.ByClassName(
Expand Down Expand Up @@ -161,4 +162,27 @@ public class TokenForm {
private WebElement buttonCancel;

}

private void setExpireTime(int daysAfter) {
try {
WebElement datePickerInput = driver.findElement(By.cssSelector(".n-date-picker input"));
Copy link
Member

@SbloodyS SbloodyS Mar 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you want to use css selectors, please use a more rigorous writing, which will lead to an flaky exception in getting elements.


LocalDateTime futureDate = LocalDateTime.now().plusDays(daysAfter);
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
String futureDateStr = futureDate.format(formatter);

datePickerInput.clear();
datePickerInput.sendKeys(futureDateStr.substring(0, 10));
Copy link
Member

@SbloodyS SbloodyS Mar 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's better not to use truncated strings to get dates.


Thread.sleep(100);
Copy link
Member

@SbloodyS SbloodyS Mar 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't use thread.sleep in e2e tests.

WebElement timeInput = driver.findElement(By.cssSelector(".n-time-picker input"));
timeInput.clear();
timeInput.sendKeys(futureDateStr.substring(11));
Copy link
Member

@SbloodyS SbloodyS Mar 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

timeInput.sendKeys(Keys.ENTER);

Thread.sleep(100);
Copy link
Member

@SbloodyS SbloodyS Mar 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

} catch (Exception e) {
throw new RuntimeException("Failed to set expire time", e);
}
}
}
4 changes: 2 additions & 2 deletions dolphinscheduler-ui/src/views/security/token-manage/components/token-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const TokenModal = defineComponent({
(userStore.getUserInfo as UserInfoRes).userType === 'GENERAL_USER'
? (userStore.getUserInfo as UserInfoRes).id
: null
variables.model.expireTime = Date.now()
variables.model.expireTime = null
variables.model.token = ''
} else {
variables.model.userId = props.row.userId
Expand Down Expand Up @@ -110,7 +110,7 @@ const TokenModal = defineComponent({
(userStore.getUserInfo as UserInfoRes).userType === 'GENERAL_USER'
? (userStore.getUserInfo as UserInfoRes).id
: null
variables.model.expireTime = Date.now()
variables.model.expireTime = null
variables.model.token = ''
} else {
variables.model.id = props.row.id
Expand Down
10 changes: 5 additions & 5 deletions dolphinscheduler-ui/src/views/security/token-manage/components/use-modal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export function useModal(
? (userStore.getUserInfo as UserInfoRes).id
: null
),
expireTime: ref(Date.now()),
expireTime: null as number | null,
token: ref(''),
generalOptions: []
},
Expand Down Expand Up @@ -101,7 +101,7 @@ export function useModal(
const getToken = () => {
const data = {
userId: (userStore.getUserInfo as UserInfoRes).id,
expireTime: format(variables.model.expireTime, 'yyyy-MM-dd HH:mm:ss')
expireTime: format(variables.model.expireTime!, 'yyyy-MM-dd HH:mm:ss')
}

useAsyncState(
Expand Down Expand Up @@ -129,7 +129,7 @@ export function useModal(
const submitTokenModal = () => {
const data = {
userId: Number(variables.model.userId),
expireTime: format(variables.model.expireTime, 'yyyy-MM-dd HH:mm:ss'),
expireTime: format(variables.model.expireTime!, 'yyyy-MM-dd HH:mm:ss'),
token: variables.model.token
}

Expand All @@ -138,7 +138,7 @@ export function useModal(
(userStore.getUserInfo as UserInfoRes).userType === 'GENERAL_USER'
? (userStore.getUserInfo as UserInfoRes).id
: null
variables.model.expireTime = Date.now()
variables.model.expireTime = null
variables.model.token = ''
ctx.emit('confirmModal', props.showModalRef)
})
Expand All @@ -148,7 +148,7 @@ export function useModal(
const data = {
id: variables.model.id,
userId: Number(variables.model.userId),
expireTime: format(variables.model.expireTime, 'yyyy-MM-dd HH:mm:ss'),
expireTime: format(variables.model.expireTime!, 'yyyy-MM-dd HH:mm:ss'),
token: variables.model.token
}

Expand Down