Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
30117e2
Update yarn.lock
michelzzw Jan 30, 2026
23daacd
declaration fix
michelzzw Feb 11, 2026
46f30ac
Update docker-compose-local-test.yml
michelzzw Feb 11, 2026
e911083
Fix NPE crashes in testapi RequestController
michelzzw Feb 11, 2026
728cee0
Add DNS configuration for testapi-team2 container
michelzzw Feb 11, 2026
3f655a2
Add Swagger @Schema examples to backend TestApiRequest
michelzzw Feb 11, 2026
d3b8a3c
solve version conflict
michelzzw Feb 11, 2026
f9f8de9
Disable MongoDB auto-index-creation to prevent startup crash
michelzzw Feb 11, 2026
ef64347
Clean up hardcoded IPs, typos, and credentials across config files
michelzzw Feb 11, 2026
5cce93d
Clean up .env variable duplication and stale config
michelzzw Feb 11, 2026
e95eaff
Activate JWT authentication with Swagger UI integration
michelzzw Feb 12, 2026
98368bc
Add Google OAuth2 backend authentication
michelzzw Feb 12, 2026
17d1c2d
Add Google OAuth2 frontend integration
michelzzw Feb 12, 2026
7ebec16
Update Docker configuration for OAuth2 support
michelzzw Feb 12, 2026
e8b3b82
Remove unused imports and dead code across modules
michelzzw Feb 12, 2026
cebe096
Fix update logic bugs in UserService
michelzzw Feb 12, 2026
8c9ce07
docs(testapi): mettre à jour README avec documentation complète des t…
michelzzw Feb 13, 2026
5839077
refactor(backend): ajouter annotations @NonNull pour la robustesse de…
michelzzw Feb 13, 2026
11ad7e3
fix(frontend): corriger l'authentification JWT pour les requêtes API
michelzzw Feb 13, 2026
6e1f2c2
fix(testapi): corriger les bugs de validation et compatibilité Jakart…
michelzzw Feb 13, 2026
16bc5ca
Remove contact section from README
michelzzw Feb 14, 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
14 changes: 14 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"java.configuration.updateBuildConfiguration": "interactive",
"java.compile.nullAnalysis.mode": "automatic",
"java.project.sourcePaths": [],
"java.import.exclusions": [
"**/node_modules/**",
"**/.metadata/**",
"**/archetype-resources/**",
"**/META-INF/maven/**",
"**/frontend/**"
],
"java.project.referencedLibraries": [],
"java.import.maven.enabled": true
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import org.springframework.stereotype.Service;
import ca.etsmtl.taf.auth.model.CustomUserDetails;

import java.util.ArrayList;
import java.util.Optional;
import lombok.extern.log4j.Log4j2;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package ca.etsmtl.taf.auth.services;

import ca.etsmtl.taf.auth.entity.User;
import ca.etsmtl.taf.auth.jwt.JwtUtil;
import ca.etsmtl.taf.auth.model.CustomUserDetails;
import ca.etsmtl.taf.auth.payload.request.LoginRequest;
Expand All @@ -10,12 +9,10 @@
import io.jsonwebtoken.JwtException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.stereotype.Service;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.security.crypto.password.PasswordEncoder;
Expand Down
31 changes: 30 additions & 1 deletion docker-compose-local-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,30 @@ services:
retries: 3
start_period: 90s

# ============================================
# TESTAPI - TEAM 2 (REST-Assured Test Executor)
# ============================================

testapi-team2:
build:
context: ./testapi-Service/testapi
dockerfile: Dockerfile
container_name: taf-testapi-team2
restart: unless-stopped
ports:
- "8086:8082"
dns:
- 8.8.8.8
- 8.8.4.4
networks:
- taf-local
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8082/actuator/health"]
interval: 30s
timeout: 10s
retries: 3
start_period: 90s

# ============================================
# TESTING BACKEND - TEAM 2 (TESTAPI-SERVICE)
# ============================================
Expand All @@ -242,19 +266,24 @@ services:
DB_NAME: taf
JWT_SECRET: tafSecretKeyForJWTTokenGeneration2024
JWT_EXPIRES: 86400000
GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID:-placeholder}
GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET:-placeholder}
OAUTH2_FRONTEND_REDIRECT_URL: http://localhost:4300
EUREKA_HOST: registry
EUREKA_PORT: 8761
EUREKA_USERNAME: eureka
EUREKA_PASSWORD: eureka
SELENIUM_URL: http://selenium-team2
SELENIUM_PORT: 4444
TEST_API_SERVICE_URL: http://testapi-team2
TEST_API_SERVICE_PORT: 8080
TEST_API_SERVICE_PORT: 8082
depends_on:
mongodb:
condition: service_healthy
registry:
condition: service_healthy
testapi-team2:
condition: service_started
networks:
- taf-local
healthcheck:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;

import java.util.List;
import java.util.Map;

@EnableDiscoveryClient
@SpringBootApplication
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ca.etsmtl.taf.registry;
package ca.estmtl.taf.registry;

import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
Expand Down
8 changes: 0 additions & 8 deletions testapi-Service/.docker_config.env.old

This file was deleted.

24 changes: 5 additions & 19 deletions testapi-Service/.env
Original file line number Diff line number Diff line change
@@ -1,27 +1,13 @@
DOKCER_URL=http://198.7.119.0:5000
REGISTRY_BASE=198.7.119.0:5000
DOCKER_URL=http://localhost:5000
REGISTRY_BASE=localhost:5000

DOKCER_USER=admin
DOKCER_PASWORD=registryPass
DOCKER_USER=admin
DOCKER_PASSWORD=registryPass
# Version
BACKEND_VERSION=0.0.1
FRONTEND_VERSION=0.0.1
SELENIUM_VERSION=0.0.1
TEST_API_VERSION=0.0.1
TEST_UI_VERSION=0.0.1
TEST_TEAM4_SERVER_VERSION=0.0.1
TEST_TEAM4_CLIENT_VERSION=0.0.1

EUREKA_HOST=localhost
GATEWAY_HOST=localhost
GATEWAY_PORT=8762
EUREKA_PORT=8761
EUREKA_USERNAME=eureka
EUREKA_PASSWORD=eureka

PERFORMACE_DB_NAME=taf_database
PERFORMACE_DB_URI=mongodb://admin:secret@15.133.251.89:47017/mydb?authSource=admin

DB_URI=mongodb://admin:secret@15.133.251.89:47017/mydb?authSource=admin
DB_NAME=taf_database
DB_AUTH=admin
TEST_TEAM4_CLIENT_VERSION=0.0.1
Loading
Loading