Fixed oauth2 for Android client, build authentication-service

Author: rodrigorodrigues

authentication-service/src/main/java/com/microservice/authentication/controller/AndroidOAuth2Controller.java

@@ -1,17 +1,31 @@
 package com.microservice.authentication.controller;
 
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 
+@Slf4j
 @Controller
 public class AndroidOAuth2Controller {
 
     @GetMapping("/android/oauth2/callback")
-    public String androidOAuth2Callback() {
+    public String androidOAuth2Callback(HttpServletRequest request, Model model) {
         // After successful OAuth2 authentication with Google,
         // Spring Security redirects here with authenticated session
         // Android app will intercept this URL via intent-filter
         // and handle the authentication
+
+        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+        if (auth != null && auth.isAuthenticated()) {
+            log.info("Android OAuth2 callback - User authenticated: {}", auth.getName());
+            model.addAttribute("username", auth.getName());
+            model.addAttribute("sessionId", request.getSession().getId());
+        }
+
         return "oauth2-android-success";
     }
 }

authentication-service/src/main/resources/application.yml

@@ -78,6 +78,11 @@ spring:
                     google:
                         client-id: ${CLIENT_ID}
                         client-secret: ${CLIENT_SECRET}
+                        scope:
+                            - openid
+                            - profile
+                            - email
+                        redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}"
             authorizationserver:
                 client:
                     google:
@@ -138,6 +143,11 @@ spring:
                     google:
                         client-id: ${CLIENT_ID}
                         client-secret: ${CLIENT_SECRET}
+                        scope:
+                            - openid
+                            - profile
+                            - email
+                        redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}"
             authorizationserver:
                 client:
                     google: