Skip to content
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

Jump to bottom

[Backport stable-15.10.x] XWIKI-21571: Change default value of the reset password token lifetime #3024

Merged
merged 1 commit into from
Mar 27, 2024
Merged

[Backport stable-15.10.x] XWIKI-21571: Change default value of the reset password token lifetime #3024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 0 additions & 10 deletions ...tion/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.icegreen</groupId>
<artifactId>greenmail-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-platform-flamingo-skin-test-pageobjects</artifactId>
Expand Down
12 changes: 0 additions & 12 deletions ...atform-administration-test-docker/src/test/it/org/xwiki/administration/test/ui/AllIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@ class NestedAdministrationIT extends AdministrationIT
{
}

@Nested
@DisplayName("Reset Password")
class NestedResetPasswordIT extends ResetPasswordIT
{
}

@Nested
@DisplayName("ConfigurableClass")
class NestedConfigurableClassIT extends ConfigurableClassIT
Expand All @@ -56,12 +50,6 @@ class NestedUsersGroupsRightsManagementIT extends UsersGroupsRightsManagementIT
{
}

@Nested
@DisplayName("Forgot Username")
class NestedForgotUsernameIT extends ForgotUsernameIT
{
}

@Nested
@DisplayName("XAR Import")
class NestedXARImportIT extends XARImportIT
Expand Down
110 changes: 0 additions & 110 deletions ...n/xwiki-platform-administration-ui/src/main/resources/XWiki/ResetPasswordRequestClass.xml
View file
Open in desktop

This file was deleted.

6 changes: 5 additions & 1 deletion ...i-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2530,7 +2530,6 @@ xe.admin.passwordReset.step2.login=Please login to continue \u00BB
xe.admin.passwordReset.step2.backToStep1=Back to the password reset page \u00BB
xe.admin.passwordReset.step2.error.emptyPassword=The password cannot be empty.
xe.admin.passwordReset.step2.error.verificationMismatch=The two passwords do not match.
xe.admin.passwordReset.step2.error.wrongParameters=Wrong parameters! Another link was already sent or this one was already accessed!
xe.admin.passwordReset.step2.error.noProgrammingRights=This page requires programming rights to work, which currently isn't the case. Please notify an administrator of this problem and try again later.
xe.admin.passwordReset.step2.versionComment.passwordReset=Password was reset
xe.admin.passwordReset.step2.versionComment.changeValidationKey=Refreshed password reset token
Expand Down Expand Up @@ -5652,6 +5651,11 @@ core.viewers.diff.previousVersion=Previous version
core.viewers.diff.nextChange=Next change
core.viewers.diff.previousChange=Previous change

#######################################
## until 16.3.0RC1
#######################################
xe.admin.passwordReset.step2.error.wrongParameters=Wrong parameters! Another link was already sent or this one was already accessed!

## Used to indicate where deprecated keys end
#@deprecatedend

Expand Down
8 changes: 8 additions & 0 deletions xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,12 @@
<module>xwiki-platform-security-authentication-script</module>
<module>xwiki-platform-security-authentication-ui</module>
</modules>
<profiles>
<profile>
<id>integration-tests</id>
<modules>
<module>xwiki-platform-security-authentication-test</module>
</modules>
</profile>
</profiles>
</project>
Loading