Skip to content

Commit

Permalink
chore(openchallenges): remove projects related to auth and Keycloak (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
tschaffter authored Oct 7, 2024
1 parent 8f8194c commit 04758ab
Show file tree
Hide file tree
Showing 202 changed files with 33 additions and 12,821 deletions.
19 changes: 1 addition & 18 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@
},
"forwardPorts": [
2432, 3000, 3306, 3333, 4200, 4211, 5200, 5432, 5601, 7010, 7443, 7200, 7888, 8010, 8071, 8000,
8080, 8081, 8082, 8083, 8084, 8085, 8086, 8090, 8091, 8092, 8200, 8787, 8888, 8889, 9090, 9104,
9200, 9411, 27017
8080, 8081, 8082, 8084, 8085, 8086, 8090, 8200, 8787, 8888, 8889, 9090, 9104, 9200, 9411, 27017
],
"portsAttributes": {
"2432": {
Expand Down Expand Up @@ -140,10 +139,6 @@
"label": "openchallenges-schema-registry",
"onAutoForward": "silent"
},
"8080": {
"label": "openchallenges-keycloak",
"onAutoForward": "silent"
},
"8081": {
"label": "openchallenges-service-registry",
"onAutoForward": "silent"
Expand All @@ -152,10 +147,6 @@
"label": "openchallenges-api-gateway",
"onAutoForward": "silent"
},
"8083": {
"label": "openchallenges-user-service",
"onAutoForward": "silent"
},
"8084": {
"label": "openchallenges-organization-service",
"onAutoForward": "silent"
Expand All @@ -172,14 +163,6 @@
"label": "openchallenges-config-server",
"onAutoForward": "silent"
},
"8091": {
"label": "openchallenges-auth-service",
"onAutoForward": "silent"
},
"8092": {
"label": "openchallenges-core-service",
"onAutoForward": "silent"
},
"8787": {
"label": "openchallenges-rstudio",
"onAutoForward": "silent"
Expand Down
1 change: 0 additions & 1 deletion apps/openchallenges/api-gateway/.env.example
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
SERVER_PORT=8082
KEYCLOAK_URL=http://openchallenges-keycloak:8080
SERVICE_REGISTRY_URL=http://openchallenges-service-registry:8081/eureka
2 changes: 0 additions & 2 deletions apps/openchallenges/api-gateway/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ dependencies {
implementation "org.sagebionetworks.openchallenges:openchallenges-app-config-data:${openchallengesVersion}"
implementation "org.springframework.boot:spring-boot-devtools:${springBootVersion}"
implementation "org.springframework.boot:spring-boot-starter-actuator:${springBootVersion}"
implementation "org.springframework.boot:spring-boot-starter-oauth2-client:${springBootVersion}"
implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server:${springBootVersion}"
implementation "org.springframework.boot:spring-boot-starter-security:${springBootVersion}"
implementation "org.springframework.cloud:spring-cloud-sleuth-zipkin:${springCloudVersion}"
implementation "org.springframework.cloud:spring-cloud-starter-config:${springCloudVersion}"
Expand Down
48 changes: 2 additions & 46 deletions apps/openchallenges/api-gateway/requests.http
Original file line number Diff line number Diff line change
@@ -1,55 +1,11 @@
@serviceRegistryHost = http://openchallenges-service-registry:8081
@apiGatewayHost = http://openchallenges-api-gateway:8082
@userServiceHost = http://openchallenges-user-service:8083
@keycloakHost = http://localhost:8080

### Check API gateway actuator (expected to redirect to Keycloak login page)
### Check API gateway actuator

GET {{apiGatewayHost}}/actuator

### Check service registry info

GET {{serviceRegistryHost}}/actuator/info

### Check user service info

GET {{userServiceHost}}/actuator/info

### Check user service info via the API gateway (expected to redirect to
### Keycloak login page)

GET {{apiGatewayHost}}/user/actuator/info

### Get access token from Keycloak

@clientId = challenge-core-client
@clientSecret = O0cNRMWg3LHsdHW8BNPlY96qKooDPhPX
@username = luke
@password = changeme

# @name login

POST {{keycloakHost}}/realms/test/protocol/openid-connect/token
Content-Type: application/x-www-form-urlencoded

grant_type=password
&scope=email
&client_id={{clientId}}
&client_secret={{clientSecret}}
&username={{username}}
&password={{password}}

### Check user service info

GET {{apiGatewayHost}}/user/actuator/info
Authorization: Bearer {{login.response.body.$.access_token}}

### Check API gateway info

GET {{apiGatewayHost}}/actuator/info
Authorization: Bearer {{login.response.body.$.access_token}}

### Check API gateway routes

GET {{apiGatewayHost}}/actuator/gateway/routes
Authorization: Bearer {{login.response.body.$.access_token}}
GET {{serviceRegistryHost}}/actuator/info
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,7 @@ SecurityWebFilterChain securityWebFilterChain(ServerHttpSecurity http) {
.authenticated()
.and()
.csrf()
.disable()
.oauth2Login()
.and()
.oauth2ResourceServer()
.jwt();
.disable();
return http.build();
}
}
35 changes: 0 additions & 35 deletions apps/openchallenges/app/src/app/initialize-keycloak.factory.ts

This file was deleted.

2 changes: 0 additions & 2 deletions apps/openchallenges/auth-service/.env.example

This file was deleted.

32 changes: 0 additions & 32 deletions apps/openchallenges/auth-service/.gitignore

This file was deleted.

49 changes: 0 additions & 49 deletions apps/openchallenges/auth-service/build.gradle

This file was deleted.

18 changes: 0 additions & 18 deletions apps/openchallenges/auth-service/docker-compose.yml

This file was deleted.

6 changes: 0 additions & 6 deletions apps/openchallenges/auth-service/gradle.properties

This file was deleted.

Binary file not shown.

This file was deleted.

Loading

0 comments on commit 04758ab

Please sign in to comment.