Merge pull request #11 from adizafri2000/dev

Updated domain and endpoints

.github/workflows/azure-static-web-apps-jolly-island-033ee1d00.yml

@@ -25,7 +25,7 @@ jobs:
         with:
           azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_JOLLY_ISLAND_033EE1D00 }}
           repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
-          VITE_VIM_IP: ${{ secrets.VITE_VM_IP }}
+          API_URL: ${{ secrets.API_URL }}
           action: "upload"
           ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
           # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
@@ -45,5 +45,5 @@ jobs:
         uses: Azure/static-web-apps-deploy@v1
         with:
           azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_JOLLY_ISLAND_033EE1D00 }}
-          VITE_VIM_IP: ${{ secrets.VITE_VM_IP }}
+          API_URL: ${{ secrets.API_URL }}
           action: "close"

spring-boot-backend/pom.xml

@@ -105,6 +105,11 @@
 			<artifactId>jjwt</artifactId>
 			<version>0.9.1</version>
 		</dependency>
+		<dependency>
+			<groupId>io.sentry</groupId>
+			<artifactId>sentry-spring-boot-starter-jakarta</artifactId>
+			<version>7.6.0</version>
+		</dependency>
 	</dependencies>
 	<dependencyManagement>
 		<dependencies>

spring-boot-backend/src/main/java/com/example/springbootbackend/config/SecurityConfig.java

@@ -23,7 +23,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .csrf(csrf -> csrf.disable())
                 .authorizeHttpRequests((auth) -> auth
                         .requestMatchers("/actuator/**").permitAll()
-                        .requestMatchers("/api/**").permitAll()
+                        .requestMatchers("/**").permitAll()
                         .anyRequest().authenticated()
                 );
         return http.build();

spring-boot-backend/src/main/java/com/example/springbootbackend/config/WebConfig.java

@@ -0,0 +1,15 @@
+package com.example.springbootbackend.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+    public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+        configurer.favorParameter(false).
+                ignoreAcceptHeader(true).
+                defaultContentType(MediaType.APPLICATION_JSON);
+    }
+}

spring-boot-backend/src/main/java/com/example/springbootbackend/controller/AccountController.java

@@ -7,6 +7,7 @@
 import com.example.springbootbackend.model.Account;
 import com.example.springbootbackend.service.AccountService;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -16,11 +17,9 @@
 import java.util.logging.Logger;
 
 @RestController
-@RequestMapping("/api/accounts")
+@RequestMapping(path = "/accounts")
 public class AccountController {
 
-    public static final String ACCOUNTS = "/api/accounts";
-
     private static final Logger log = Logger.getLogger(AccountController.class.getName());
     private final AccountService accountService;
     private final AccountMapper accountMapper = AccountMapper.INSTANCE;
@@ -30,15 +29,17 @@ public AccountController(AccountService accountService) {
     }
 
     @GetMapping("")
-    public ResponseEntity<List<AccountGetDTO>> getAccounts() {
+    public ResponseEntity<?> getAccounts() {
         log.info("Handling GET /api/accounts request");
         List<AccountGetDTO> dtoList = accountService.getAccounts().stream()
                 .map(accountMapper::toGetDTO)
                 .toList();
-        return new ResponseEntity<>(dtoList, HttpStatus.OK);
+        Map<String, List<AccountGetDTO>> listResponse = new HashMap<>();
+        listResponse.put("accounts", dtoList);
+        return new ResponseEntity<>(listResponse, HttpStatus.OK);
     }
 
-    @GetMapping("/{id}")
+    @GetMapping(path = "/{id}")
     public ResponseEntity<?> getAccountById(@PathVariable Integer id) {
         log.info("Handling GET /api/accounts/" + id + " request");
         Account account = accountService.getAccountById(id);

spring-boot-backend/src/main/java/com/example/springbootbackend/service/AccountServiceImpl.java

@@ -8,6 +8,7 @@
 import com.example.springbootbackend.repository.AccountRepository;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
+import io.sentry.Sentry;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
@@ -91,6 +92,7 @@ public String loginAccount(AccountLoginDTO accountLoginDTO) {
                 return generateToken(account);
             }
         }
+        Sentry.captureMessage("Invalid email or password");
         throw new InvalidCredentialsException("Invalid email or password");
     }
 

web/src/services/accounts.jsx

@@ -1,6 +1,6 @@
 import axios from 'axios'
-const host = import.meta.env.VITE_VM_IP
-const baseUrl = `http://${host}/api/accounts`
+const host = import.meta.env.API_URL
+const baseUrl = `${host}/accounts`
 
 let token = null
 
@@ -34,4 +34,4 @@ const remove = async id => {
     const response = await axios.delete(`${baseUrl}/${id}`, config)
 }
 
-export default { getAll, setToken, create, update, remove }
+export default { getAll, setToken, create, update, remove }

web/src/services/login.jsx

@@ -1,11 +1,11 @@
 import axios from 'axios'
-const host = import.meta.env.VITE_VM_IP
-// const baseUrl = `http://${host}/api/accounts/login`
-const baseUrl = '/api/accounts/login'
+const host = import.meta.env.API_URL
+const baseUrl = `${host}/accounts/login`
+//const baseUrl = '/accounts/login'
 
 const login = async credentials => {
     const response = await axios.post(baseUrl, credentials)
     return response.data
 }
 
-export default { login }
+export default { login }

web/vite.config.js

@@ -4,16 +4,17 @@ import dotenv from 'dotenv'
 
 dotenv.config()
 
-const IP = process.env.VITE_VM_IP;
+//const IP = process.env.VM_IP;
+const API_URL = process.env.API_URL
 
 export default defineConfig({
   plugins: [react()],
   server: {
     proxy: {
-      '/api': {
-        target: `http://${IP}`,
+      '/': {
+        target: `${API_URL}`,
         changeOrigin: true,
       },
     }
   },
-})
+})