🚚 : split configuration of oauth providers

split the configuration of Github & Gitlab providers to simplify usage and configuration for users
gaia-app · Sep 17, 2021 · bcee58c · bcee58c
1 parent 7cf3b4d
commit bcee58c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/src/main/resources/application-github.properties b/src/main/resources/application-github.properties
@@ -0,0 +1,6 @@
+spring.security.oauth2.client.registration.github.client-id=<CLIENT_ID>
+spring.security.oauth2.client.registration.github.client-secret=<CLIENT_SECRET>
+spring.security.oauth2.client.registration.github.authorization-grant-type=authorization_code
+spring.security.oauth2.client.registration.github.redirect-uri={baseUrl}/auth/oauth2/{registrationId}/callback
+spring.security.oauth2.client.registration.github.scope=user:read,public_repo
+spring.security.oauth2.client.provider.github.user-name-attribute=login
diff --git a/...n/resources/application-oauth2.properties → ...n/resources/application-gitlab.properties b/...n/resources/application-oauth2.properties → ...n/resources/application-gitlab.properties
@@ -1,17 +1,8 @@
-## oauth2 for gitlab
-spring.security.oauth2.client.registration.gitlab.client-id=<CLIENT_ID/>
-spring.security.oauth2.client.registration.gitlab.client-secret=<CLIENT_SECRET/>
+spring.security.oauth2.client.registration.gitlab.client-id=<CLIENT_ID>
+spring.security.oauth2.client.registration.gitlab.client-secret=<CLIENT_SECRET>
 spring.security.oauth2.client.registration.gitlab.authorization-grant-type=authorization_code
 spring.security.oauth2.client.registration.gitlab.redirect-uri={baseUrl}/auth/oauth2/{registrationId}/callback
 spring.security.oauth2.client.provider.gitlab.authorization-uri=https://gitlab.com/oauth/authorize
 spring.security.oauth2.client.provider.gitlab.token-uri=https://gitlab.com/oauth/token
 spring.security.oauth2.client.provider.gitlab.user-info-uri=https://gitlab.com/api/v4/user
 spring.security.oauth2.client.provider.gitlab.user-name-attribute=username
-
-## oauth2 for github
-spring.security.oauth2.client.registration.github.client-id=<CLIENT_ID/>
-spring.security.oauth2.client.registration.github.client-secret=<CLIENT_SECRET/>
-spring.security.oauth2.client.registration.github.authorization-grant-type=authorization_code
-spring.security.oauth2.client.registration.github.redirect-uri={baseUrl}/auth/oauth2/{registrationId}/callback
-spring.security.oauth2.client.registration.github.scope=user:read,public_repo
-spring.security.oauth2.client.provider.github.user-name-attribute=login
diff --git a/src/test/java/io/gaia_app/config/security/oauth2/OAuth2ClientSecurityConfigIT.kt b/src/test/java/io/gaia_app/config/security/oauth2/OAuth2ClientSecurityConfigIT.kt
@@ -36,7 +36,7 @@ class OAuth2ClientSecurityConfigIT {
 
     @Nested
     @SpringBootTest
-    @ActiveProfiles("oauth2")
+    @ActiveProfiles("github")
     inner class OAuth2ClientSecurityConfigLoadedTest: SharedMongoContainerTest() {
 
         @Test