Fix expense/income creation
This commit is contained in:
@@ -43,34 +43,7 @@ public class SecurityConfiguration {
|
|||||||
.sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
|
.sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
|
||||||
.authenticationProvider(authenticationProvider)
|
.authenticationProvider(authenticationProvider)
|
||||||
.addFilterBefore(jwtAuthFilter, UsernamePasswordAuthenticationFilter.class); // will be executed before UsernamePasswordAuthenticationFilter
|
.addFilterBefore(jwtAuthFilter, UsernamePasswordAuthenticationFilter.class); // will be executed before UsernamePasswordAuthenticationFilter
|
||||||
// .oauth2Login(Customizer.withDefaults());
|
|
||||||
|
|
||||||
return http.build();
|
return http.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Bean
|
|
||||||
public ClientRegistrationRepository clientRegistrationRepository(
|
|
||||||
@Value("${spring.security.oauth2.client.registration.google.client-id}") String clientId,
|
|
||||||
@Value("${spring.security.oauth2.client.registration.google.client-secret}") String clientSecret) {
|
|
||||||
|
|
||||||
ClientRegistration registration = ClientRegistration.withRegistrationId("google")
|
|
||||||
.clientId(clientId)
|
|
||||||
.clientSecret(clientSecret)
|
|
||||||
.clientName("Google")
|
|
||||||
.authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
|
|
||||||
.redirectUri("http://localhost:8081/login/oauth2/code/{registrationId}")
|
|
||||||
.scope("openid", "profile", "email")
|
|
||||||
.authorizationUri("https://accounts.google.com/o/oauth2/auth")
|
|
||||||
.tokenUri("https://accounts.google.com/o/oauth2/token")
|
|
||||||
.userInfoUri("https://www.googleapis.com/oauth2/v3/userinfo")
|
|
||||||
.userNameAttributeName(IdTokenClaimNames.SUB)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
return new InMemoryClientRegistrationRepository(registration);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public OAuth2UserService<OAuth2UserRequest, OAuth2User> oAuth2UserService() {
|
|
||||||
return new DefaultOAuth2UserService();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,8 @@
|
|||||||
package com.faf223.expensetrackerfaf.model;
|
package com.faf223.expensetrackerfaf.model;
|
||||||
|
import com.faf223.expensetrackerfaf.util.IMoneyTransaction;
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.*;
|
||||||
import lombok.Data;
|
|
||||||
import lombok.ToString;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
@@ -13,10 +11,11 @@ import java.time.LocalDate;
|
|||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@Entity(name = "expenses")
|
@Entity(name = "expenses")
|
||||||
public class Expense {
|
public class Expense implements IMoneyTransaction {
|
||||||
@Id
|
@Id
|
||||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
private Long expenseId;
|
@Column(name = "expense_id")
|
||||||
|
private Long id;
|
||||||
|
|
||||||
@ManyToOne()
|
@ManyToOne()
|
||||||
@JoinColumn(name = "user_uuid")
|
@JoinColumn(name = "user_uuid")
|
||||||
@@ -30,5 +29,13 @@ public class Expense {
|
|||||||
|
|
||||||
private LocalDate date;
|
private LocalDate date;
|
||||||
private BigDecimal amount;
|
private BigDecimal amount;
|
||||||
|
|
||||||
|
public Expense(LocalDate date, BigDecimal amount) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Expense(ExpenseCategory expenseCategory, LocalDate date, BigDecimal amount) {
|
||||||
|
this.category = expenseCategory;
|
||||||
|
this.date = date;
|
||||||
|
this.amount = amount;
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user