Skip to content

develop #32

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

Merged
BaharaJr merged 3 commits into from
Mar 29, 2026
Merged

develop #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7863ade
Fix error debiting sms account
BaharaJr Mar 29, 2026
2b824e7
release: Merge branch 'develop' of github.com:flexcodelabs/flextuma i…
BaharaJr Mar 29, 2026
80b4b7f
Release v0.0.33 [skip ci]
github-actions[bot] Mar 29, 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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
}

group = 'com.flexcodelabs'
version = '0.0.32'
version = '0.0.33'
description = 'Flextuma App'

java {
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/flexcodelabs/flextuma/core/security/PasswordChangeRequiredFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
}

private boolean shouldSkipPasswordChangeCheck(String path) {
if (path == null || !path.startsWith("/api/")) {
return true;
}

return path.equals("/api/login") ||
path.equals("/api/changePassword") ||
path.equals("/api/logout") ||
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/flexcodelabs/flextuma/core/security/SecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.util.matcher.RegexRequestMatcher;
import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
import org.springframework.session.web.http.CookieSerializer;
import org.springframework.session.web.http.DefaultCookieSerializer;
Expand Down Expand Up @@ -60,6 +61,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) {
.requestMatchers("/api/register").permitAll()
.requestMatchers("/").permitAll()
.requestMatchers("/assets/**").permitAll()
.requestMatchers(new RegexRequestMatcher("^/(?!api(?:/|$)).*", null)).permitAll()
.anyRequest().authenticated())
.httpBasic(Customizer.withDefaults())
.addFilterBefore(patAuthenticationFilter,
Expand Down
3 changes: 2 additions & 1 deletion ...ain/java/com/flexcodelabs/flextuma/modules/notification/services/NotificationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ private SmsLog processAndSaveSms(User user, SmsConnector connector, String phone
SmsTemplate template, Map<String, String> metadata) {
SmsSegmentResult segmentResult = segmentCalculator.calculate(content);
if (connector.getCode() != null && connector.getCode().equals(connector.getProvider() + "_SYSTEM")) {
BigDecimal cost = pricePerSegment.multiply(BigDecimal.valueOf(segmentResult.segments()));
BigDecimal cost = BigDecimal.valueOf(Math.ceil(BigDecimal.valueOf(segmentResult.segments())
.divide(pricePerSegment).doubleValue()));
walletService.debit(user, cost, "SMS send to " + phoneNumber, null);
}

Expand Down
7 changes: 7 additions & 0 deletions src/test/java/com/flexcodelabs/flextuma/modules/app/controllers/FrontendControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ void serveCatchAll_shouldReturnIndexForNonApiRoutes() throws Exception {
.andExpect(content().string("<html><body>app</body></html>"));
}

@Test
void serveCatchAll_shouldReturnIndexForLoginRoute() throws Exception {
mockMvc.perform(get("/login"))
.andExpect(status().isOk())
.andExpect(content().string("<html><body>app</body></html>"));
}

@Test
void serveCatchAll_shouldReturnIndexForDottedNonApiRoutes() throws Exception {
mockMvc.perform(get("/foo.bar"))
Expand Down