소스 검색

Fix login authentication

Blazej 3 년 전
부모
커밋
f1373e7576

+ 2 - 4
src/main/java/com/example/plantsforyou/appuser/LoginCredentials.java

@@ -3,15 +3,13 @@ package com.example.plantsforyou.appuser;
 public class LoginCredentials {
     private String username;
     private String password;
-    private Boolean oAuth;
+    private String oauth;
 
     public String getUsername() {
         return username;
     }
-
     public String getPassword() {
         return password;
     }
-
-    public Boolean getOAuth() { return oAuth;  }
+    public String getOAuth() { return oauth;  }
 }

+ 2 - 2
src/main/java/com/example/plantsforyou/filter/CustomAuthenticationFilter.java

@@ -55,11 +55,11 @@ public class CustomAuthenticationFilter extends UsernamePasswordAuthenticationFi
 
             String email = credentials.getUsername();
             String password = credentials.getPassword();
-            Boolean oAuth = credentials.getOAuth();
+            String oAuth = credentials.getOAuth();
             log.info("Email is: {}", email);
             log.info("Password is: {}", password);
             UsernamePasswordAuthenticationToken authenticationToken = null;
-            if(oAuth){
+            if(oAuth.equals("true")){
                 GoogleIdToken idToken = authService.validate(password);
                 if(idToken != null) {
                     GoogleIdToken.Payload payload =  idToken.getPayload();