Mdybek/redirect uri fix (#32)

* management-service: redirect uri fix * management-service: redirect uri fix * management-service: redirect uri fix * client: Login page redesign * client: Login page redesign * .env.sample: fix in sample env
Magpie-Monitor · Oct 15, 2024 · 4f770c9 · 4f770c9
1 parent 36292b3
commit 4f770c9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.env.sample b/.env.sample
@@ -21,6 +21,7 @@ SPRING_PROFILES_ACTIVE=dev
 MANAGEMENT_PGADMIN_MAIL=[email protected]
 MANAGEMENT_PGADMIN_PASSWORD=password
 MANAGEMENT_PGADMIN_PRODUCTION_HOST=pgadmin.test.com
+MANAGEMENT_SERVER_REDIRECT_URI=http://localhost:8080
 
 
 

diff --git a/client/src/pages/Login/components/Panel/Panel.scss b/client/src/pages/Login/components/Panel/Panel.scss
@@ -43,6 +43,7 @@
     height: 250px;
     margin-top: 2rem;
     margin-bottom: 7rem;
+    border-radius: 100px;
   }
 
   &__subheader--green {

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -154,6 +154,7 @@ services:
       - MANAGEMENT_EMAIL_HOST=${MANAGEMENT_EMAIL_HOST}
       - MANAGEMENT_CIPHER_ENCRYPTION_KEY=${MANAGEMENT_CIPHER_ENCRYPTION_KEY}
       - MANAGEMENT_SERVER_DOMAINNAME=${MANAGEMENT_SERVER_DOMAINNAME}
+      - MANAGEMENT_SERVER_REDIRECT_URI=${MANAGEMENT_SERVER_REDIRECT_URI}
       - VIRTUAL_HOST=${MANAGEMENT_PRODUCTION_HOST}
       - LETSENCRYPT_HOST=${MANAGEMENT_PRODUCTION_HOST}
       - VIRTUAL_PORT=8080

diff --git a/management-service/src/main/resources/application.properties b/management-service/src/main/resources/application.properties
@@ -14,15 +14,13 @@ spring.security.oauth2.client.registration.google.client-secret=${GOOGLE_CLIENT_
 spring.security.oauth2.client.registration.google.scope=openid,email,profile
 
 oauth2.google.redirect-uri=${REDIRECT_URI_AFTER_OAUTH}
-spring.security.oauth2.client.registration.google.redirect-uri={baseUrl}/login/oauth2/code/{registrationId}
+spring.security.oauth2.client.registration.google.redirect-uri=${MANAGEMENT_SERVER_REDIRECT_URI}/login/oauth2/code/{registrationId}
 spring.security.oauth2.client.registration.google.authorization-grant-type=authorization_code
 spring.security.oauth2.client.provider.google.authorization-uri=https://accounts.google.com/o/oauth2/v2/auth?access_type=offline&prompt=consent
 # Customize the login page URL to include access_type=offline
 spring.security.oauth2.client.registration.google.authorization-uri-template=https://accounts.google.com/o/oauth2/auth?access_type=offline&prompt=consent&response_type=code&client_id={clientId}&scope={scopes}&state={state}&redirect_uri={redirectUri}
 google.oauth.cookie.exp-time=3600
 
-app.base-url=http://localhost:8080/
-
 encoding.cipher.secret.key=${MANAGEMENT_CIPHER_ENCRYPTION_KEY}
 encoding.cipher.algorithm=AES