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.

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

fix remmeber me #2184

Merged
merged 4 commits into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,14 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
http.rememberMe(
rememberMeConfigurer ->
rememberMeConfigurer // Use the configurator directly
.key("uniqueAndSecret")
.tokenRepository(persistentTokenRepository())
.tokenValiditySeconds(1209600) // 2 weeks
);
.tokenValiditySeconds(14 * 24 * 60 * 60) // 14 days
.userDetailsService(
userDetailsService) // Your existing UserDetailsService
.useSecureCookie(true) // Enable secure cookie
.rememberMeParameter("remember-me") // Form parameter name
.rememberMeCookieName("remember-me") // Cookie name
.alwaysRemember(false));
http.authorizeHttpRequests(
authz ->
authz.requestMatchers(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.web.authentication.rememberme.PersistentRememberMeToken;
import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository;
import org.springframework.transaction.annotation.Transactional;

import stirling.software.SPDF.model.PersistentLogin;

Expand All @@ -13,6 +14,7 @@ public class JPATokenRepositoryImpl implements PersistentTokenRepository {
@Autowired private PersistentLoginRepository persistentLoginRepository;

@Override
@Transactional
public void createNewToken(PersistentRememberMeToken token) {
PersistentLogin newToken = new PersistentLogin();
newToken.setSeries(token.getSeries());
Expand All @@ -23,6 +25,7 @@ public void createNewToken(PersistentRememberMeToken token) {
}

@Override
@Transactional
public void updateToken(String series, String tokenValue, Date lastUsed) {
PersistentLogin existingToken = persistentLoginRepository.findById(series).orElse(null);
if (existingToken != null) {
Expand All @@ -43,11 +46,11 @@ public PersistentRememberMeToken getTokenForSeries(String seriesId) {
}

@Override
@Transactional
public void removeUserTokens(String username) {
for (PersistentLogin token : persistentLoginRepository.findAll()) {
if (token.getUsername().equals(username)) {
persistentLoginRepository.delete(token);
}
try {
persistentLoginRepository.deleteByUsername(username);
} catch (Exception e) {
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@
import stirling.software.SPDF.model.PersistentLogin;

@Repository
public interface PersistentLoginRepository extends JpaRepository<PersistentLogin, String> {}
public interface PersistentLoginRepository extends JpaRepository<PersistentLogin, String> {
void deleteByUsername(String username);
}
2 changes: 1 addition & 1 deletion src/main/resources/messages_cs_CZ.properties
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ replace-color.selectText.8=Zlutý text na černém pozadí
replace-color.selectText.9=Zelený text na černém pozadí
replace-color.selectText.10=Vyberte barvu textu
replace-color.selectText.11=Vyberte barvu pozadí
replace-color.submit= Nahradit
replace-color.submit=Nahradit



Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/messages_da_DK.properties
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ pipelineOptions.validateButton=Validér
enterpriseEdition.button=Opgrader til Pro
enterpriseEdition.warning=Denne funktion er kun tilgængelig for Pro-brugere.
enterpriseEdition.yamlAdvert=Stirling PDF Pro understøtter YAML-konfigurationsfiler og andre SSO-funktioner.
enterpriseEdition.ssoAdvert= søger du flere funktioner til brugerstyring? Prøv Stirling PDF Pro
enterpriseEdition.ssoAdvert=søger du flere funktioner til brugerstyring? Prøv Stirling PDF Pro


#################
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/messages_pt_PT.properties
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ pipeline.configureButton=Configurar
pipeline.defaultOption=Personalizar
pipeline.submitButton=Submeter
pipeline.help=Pipeline Help
pipeline.scanHelp= Ajuda ao Escaneamento de Pastas
pipeline.scanHelp=Ajuda ao Escaneamento de Pastas
pipeline.deletePrompt=Tem a certeza que quer eliminar o pipeline?

######################
Expand Down Expand Up @@ -191,7 +191,7 @@ account.changePassword=Alterar a Senha
account.confirmNewPassword=Confirmar Nova Senha
account.signOut=Sair do Sistema
account.yourApiKey=Sua Chave API
account.syncTitle= sincronizar definições do navegador com a conta
account.syncTitle=sincronizar definições do navegador com a conta
account.settingsCompare=Comparação das Definições:
account.property=Propriedade
account.webBrowserSettings=Configurações do Navegador Web
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/messages_ru_RU.properties
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ PDFToHTML.tags=web content,browser friendly

home.PDFToXML.title=PDF в XML
home.PDFToXML.desc=Преобразование PDF в формат XML
PDFToXML.tags= extraksi data,структурированный контент,interop,преобразование,конвертация
PDFToXML.tags=extraksi data,структурированный контент,interop,преобразование,конвертация

home.ScannerImageSplit.title=Обнаружение/разделение отсканированных фотографий
home.ScannerImageSplit.desc=Разделяет несколько фотографий из фото/PDF
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ <h2 class="h5 mb-3 fw-normal" th:text="#{login.signinTitle}">Please sign in</h2>
</div>

<div class="form-check m-2 mb-3">
<input type="checkbox" id="remember" value="remember-me">
<label for="remember" th:text="#{login.rememberme}"></label>
<input type="checkbox" name="remember-me" id="remember-me">
<label for="remember-me" th:text="#{login.rememberme}"></label>
</div>
<button class="w-100 btn btn-lg btn-primary" type="submit" th:text="#{login.signin}">Sign in</button>
</form>
Expand Down