Changeset 0f5aa27 for src/main/java/com/tourMate/config/UserSecurity.java

Timestamp:

02/04/24 16:57:49 (10 months ago)

Author:

darsov2 <62809499+darsov2@…>

Branches:

master

Children:

efaa053

Parents:

07f4e8b

Message:

ouath, mailing impl

File:

• src/main/java/com/tourMate/config/UserSecurity.java (modified) (2 diffs)

src/main/java/com/tourMate/config/UserSecurity.java

@@ -1 +1 @@
 package com.tourMate.config;
 
+import com.tourMate.config.oauth2.CustomOAuth2UserDetailService;
+import com.tourMate.config.oauth2.OAuth2UserDetailsCustom;
 import com.tourMate.entities.Hotels;
 import com.tourMate.entities.User;
@@ -25 +27 @@
     public boolean hasUserId(Authentication authentication, Long userId) {
         System.out.println(userId);
-        User user = (User) authentication.getPrincipal();
-        System.out.println(user.getUserID());
-        System.out.println(authentication.getPrincipal());
-        return userId == user.getUserID();
+        Long id;
+        if(authentication.getPrincipal() instanceof OAuth2UserDetailsCustom oAuth2UserDetailsCustom)
+        {
+            id = oAuth2UserDetailsCustom.getId();
+        }
+        else
+        {
+            User user = (User) authentication.getPrincipal();
+            id = user.getUserID();
+        }
+        return userId == id;
     }