Merged in release/dev (pull request #49)

src/main/java/com/artandscience/security/common/base/model/RequestHeader.java

@@ -21,7 +21,7 @@ public class RequestHeader {
     private String customerNumber;
     private String chanel;
     private String email;
-    private String deviceAppId;
+    private String deviceId;
     private String flowRequestId;
 
 }

src/main/java/com/artandscience/security/common/constants/HeaderConstant.java

@@ -20,7 +20,7 @@ public class HeaderConstant {
     public static String HEADER_CUSTOMER_NUMBER = "x-customer-number";
     public static String HEADER_CHANEL = "x-customer-chanel";
     public static String HEADER_EMAIL = "x-email";
-    public static String HEADER_DEVICE_APP_ID = "x-device-app-id";
+    public static String HEADER_DEVICE_ID = "x-device-id";
     public static String HEADER_REQUEST_FLOW_ID = "x-request-flow-id";
 
 }

src/main/java/com/artandscience/security/common/interceptor/TransactionFilter.java

@@ -29,7 +29,7 @@ import static com.artandscience.security.common.constants.HeaderConstant.HEADER_
 import static com.artandscience.security.common.constants.HeaderConstant.HEADER_CUSTOMER_NUMBER;
 import static com.artandscience.security.common.constants.HeaderConstant.HEADER_CHANEL;
 import static com.artandscience.security.common.constants.HeaderConstant.HEADER_EMAIL;
-import static com.artandscience.security.common.constants.HeaderConstant.HEADER_DEVICE_APP_ID;
+import static com.artandscience.security.common.constants.HeaderConstant.HEADER_DEVICE_ID;
 import static com.artandscience.security.common.constants.HeaderConstant.HEADER_REQUEST_FLOW_ID;
 
 
@@ -72,7 +72,7 @@ public class TransactionFilter extends OncePerRequestFilter {
                 .customerNumber(request.getHeader(HEADER_CUSTOMER_NUMBER))
                 .chanel(request.getHeader(HEADER_CHANEL))
                 .email(request.getHeader(HEADER_EMAIL))
-                .deviceAppId(request.getHeader(HEADER_DEVICE_APP_ID))
+                .deviceId(request.getHeader(HEADER_DEVICE_ID))
                 .flowRequestId(request.getHeader(HEADER_REQUEST_FLOW_ID))
                 .build();
     }

src/main/java/com/artandscience/security/common/service/SessionService.java

@@ -4,6 +4,8 @@ import java.util.concurrent.TimeUnit;
 
 public interface SessionService {
 
+    <T> void setSessionByDeviceId(T object);
+
     <T> void setSession(String sessionKey, String exTime, T object);
 
     <T> void setSessionByKey(String key, T object, boolean withoutSession);
@@ -14,4 +16,6 @@ public interface SessionService {
 
     void removeSession(String sessionKey, boolean isKey, boolean withoutSession );
 
+    void removeSessionByDeviceId();
+
 }

src/main/java/com/artandscience/security/common/service/impl/SessionServiceImpl.java

@@ -26,6 +26,12 @@ public class SessionServiceImpl implements SessionService {
     @Value("${spring.data.redis.session-expire-time}")
     private String sessionExpireTime;
 
+    @Override
+    public <T> void setSessionByDeviceId(T object) {
+        redisUtil.putValue(requestHeaderScope.getRequestHeader().getDeviceId(),
+                object,Integer.parseInt(sessionExpireTime), TimeUnit.MINUTES);
+    }
+
     @Override
     public <T> void setSession(String sessionKey, String exTime, T object) {
         String key = !Objects.isNull(sessionKey) ? sessionKey : requestHeaderScope.getRequestHeader().getSessionId();
@@ -94,4 +100,16 @@ public class SessionServiceImpl implements SessionService {
             throw new SessionException(SessionErrorType.SESSION_NOT_FOUND);
         }
     }
+
+    @Override
+    public void removeSessionByDeviceId() {
+        String deviceId = requestHeaderScope.getRequestHeader().getDeviceId();
+
+        try {
+            redisUtil.removeValue(deviceId);
+        } catch (Exception e) {
+            log.error("SessionService remove object is null for key: " + deviceId);
+            throw new SessionException(SessionErrorType.SESSION_NOT_FOUND);
+        }
+    }
 }

src/main/java/com/artandscience/security/common/utils/DateUtil.java

@@ -0,0 +1,27 @@
+package com.artandscience.security.common.utils;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+public abstract class DateUtil {
+
+    private static final DateTimeFormatter FORMATTER = DateTimeFormatter
+            .ofPattern("dd.MM.yyyy");
+
+    public static String localDateToString(LocalDate date) {
+        if (date == null) {
+            return null;
+        }
+
+        return date.format(FORMATTER);
+    }
+
+    public static LocalDate stringToLocalDate(String date) {
+        if (date == null || date.isBlank()) {
+            return null;
+        }
+
+        return LocalDate.parse(date, FORMATTER);
+    }
+
+}

src/main/java/com/artandscience/security/configuration/SecurityConfig.java

@@ -2,6 +2,8 @@ package com.artandscience.security.configuration;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
@@ -13,11 +15,35 @@ public class SecurityConfig {
 
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-        http.csrf(AbstractHttpConfigurer::disable)
+        http
+                .cors(Customizer.withDefaults())
+                .csrf(AbstractHttpConfigurer::disable)
                 .authorizeHttpRequests(auth -> auth
-                        .requestMatchers("/api/v1/auth/register", "api/v1/auth/login", "/api/v1/auth/validate", "/api/v1/auth/logout","/api/v1/provider/validate-provider", "/api/v1/users/details","/api/v1/users/get-online-status", "/api/v1/otp/register/**","/api/v1/otp/validate/**","/api/v1/internal/page-auth/**", "/api/v1/db-security/**", "/api/v1/permission/**","/api/v1/fcm/**","/v3/api-docs/**","/swagger-ui/**","/swagger-ui/index.html").permitAll()
+
+                        // Tarayıcının CORS preflight istekleri
+                        .requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
+
+                        .requestMatchers(
+                                "/api/v1/auth/register",
+                                "/api/v1/auth/login",
+                                "/api/v1/auth/validate",
+                                "/api/v1/auth/logout",
+                                "/api/v1/provider/validate-provider",
+                                "/api/v1/users/details",
+                                "/api/v1/otp/register/**",
+                                "/api/v1/otp/validate/**",
+                                "/api/v1/internal/page-auth/**",
+                                "/api/v1/db-security/**",
+                                "/api/v1/permission/**",
+                                "/api/v1/fcm/**",
+                                "/v3/api-docs/**",
+                                "/swagger-ui/**",
+                                "/swagger-ui/index.html"
+                        ).permitAll()
+
                         .anyRequest().authenticated()
                 );
+
         return http.build();
     }
 

src/main/java/com/artandscience/security/controller/FcmTokenController.java

@@ -3,9 +3,7 @@ package com.artandscience.security.controller;
 import com.artandscience.security.common.base.controller.BaseController;
 import com.artandscience.security.common.base.response.MessageResponse;
 import com.artandscience.security.domain.request.SetFcmTokenRequest;
-import com.artandscience.security.domain.request.GetOnlineStatusRequest;
 import com.artandscience.security.domain.response.GetFcmTokenResponse;
-import com.artandscience.security.domain.response.GetOnlineStatusResponse;
 import com.artandscience.security.domain.service.FcmTokenService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
@@ -28,12 +26,4 @@ public class FcmTokenController extends BaseController {
         var output = fcmTokenService.getFcmToken();
         return responseSuccess(output.toResponse());
     }
-
-    @PostMapping("/get-online-status")
-    public MessageResponse<GetOnlineStatusResponse> getOnlineStatus(@RequestBody GetOnlineStatusRequest request) {
-        var output = fcmTokenService.getOnlineStatus(request.toInput());
-        return responseSuccess(output.toResponse());
-    }
-
-
 }

src/main/java/com/artandscience/security/controller/OnlineStatusController.java

@@ -0,0 +1,28 @@
+package com.artandscience.security.controller;
+
+import com.artandscience.security.common.base.controller.BaseController;
+import com.artandscience.security.common.base.response.MessageResponse;
+import com.artandscience.security.domain.request.OnlineStatusRequest;
+import com.artandscience.security.domain.response.OnlineStatusResponse;
+import com.artandscience.security.domain.service.OnlineStatusService;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/v1/online")
+@RequiredArgsConstructor
+public class OnlineStatusController extends BaseController {
+
+    private final OnlineStatusService onlineStatusService;
+
+    @PostMapping("/status")
+    public MessageResponse<OnlineStatusResponse> isOnline(@RequestBody OnlineStatusRequest request) {
+        var output = onlineStatusService.isOnline(request.toInput());
+        return responseSuccess(output.toResponse());
+    }
+
+
+}

src/main/java/com/artandscience/security/dao/entity/CustomerFcm.java

@@ -20,5 +20,4 @@ public class CustomerFcm {
     private String customerNo;
     private String fcmToken;
     private String chanel;
-    private Boolean isOnline;
 }

src/main/java/com/artandscience/security/dao/entity/CustomerOnlineStatus.java

@@ -0,0 +1,22 @@
+package com.artandscience.security.dao.entity;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Data
+public class CustomerOnlineStatus {
+
+    @Id
+    private String uid;
+    private String customerNumber;
+    private Boolean isOnline;
+
+}

src/main/java/com/artandscience/security/dao/entity/Users.java

@@ -7,6 +7,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @AllArgsConstructor
@@ -23,13 +24,14 @@ public class Users {
     private String email;
     private LocalDateTime registeredDate;
     private String customerNo;
-    private Boolean isOnline;
+    private LocalDate birthday;
+    private Boolean isFirstLogin;
 
     public Users toEntity(UserInput input,String customerNumber) {
         return new Users(input.getLocalId(),input.getName(),
                 input.getSurname(),input.getPhoneNumber(),
                 input.getEmail(),
-                LocalDateTime.now(), customerNumber, Boolean.FALSE);
+                LocalDateTime.now(), customerNumber, birthday, Boolean.TRUE);
     }
 
 }

src/main/java/com/artandscience/security/dao/repository/CustomerFcmRepository.java

@@ -13,10 +13,9 @@ import java.util.Optional;
 public interface CustomerFcmRepository extends JpaRepository<CustomerFcm,String> {
     Optional<CustomerFcm> findByCustomerNoEqualsAndChanelEquals(String customerNo,String chanel);
 
-    boolean existsByCustomerNoAndIsOnlineTrue(String customerNo);
 
     @Query("select c from CustomerFcm c where " +
-            "c.customerNo =:customerNo and c.isOnline = true")
-    List<CustomerFcm> getCustomerNoAndOnlineIsTrue(@Param("customerNo")String customerNo);
+            "c.customerNo =:customerNo")
+    List<CustomerFcm> getCustomerNo(@Param("customerNo")String customerNo);
 
 }

src/main/java/com/artandscience/security/dao/repository/CustomerOnlineStatusRepository.java

@@ -0,0 +1,17 @@
+package com.artandscience.security.dao.repository;
+
+import com.artandscience.security.dao.entity.CustomerOnlineStatus;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.Optional;
+
+@Repository
+public interface CustomerOnlineStatusRepository extends JpaRepository<CustomerOnlineStatus,String> {
+    @Query("select c.isOnline from CustomerOnlineStatus c where c.customerNumber =:customerNo")
+    Boolean isOnlineForCustomerNo(@Param("customerNo") String customerNo);
+
+    Optional<CustomerOnlineStatus> findAllByCustomerNumberEquals(String customerNo);
+}

src/main/java/com/artandscience/security/dao/repository/UserRepository.java

@@ -6,10 +6,13 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.Optional;
+
 @Repository
 public interface UserRepository extends JpaRepository<Users,String> {
 
     @Query("select u.customerNo from Users u where u.email =:mail")
     String getCustomerNoByMail(@Param("mail")String mail);
 
+    Optional<Users> findAllByCustomerNoEquals(String customerNo);
 }

src/main/java/com/artandscience/security/domain/model/input/{GetOnlineStatusInput.java → OnlineStatusInput.java}

@@ -1,10 +1,14 @@
 package com.artandscience.security.domain.model.input;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 @Builder
-public class GetOnlineStatusInput {
+public class OnlineStatusInput {
     private String customerNumber;
 }

src/main/java/com/artandscience/security/domain/model/input/RegisterInput.java

@@ -5,6 +5,7 @@ import com.artandscience.security.integration.service.request.SignUpNewUserReque
 import lombok.Builder;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.util.List;
 
 @Data
@@ -17,6 +18,7 @@ public class RegisterInput {
     private String name;
     private String surname;
     private Role role;
+    private LocalDate birthday;
     private List<String> permissionUids;
 
     public SignUpNewUserRequest toRequest() {

src/main/java/com/artandscience/security/domain/model/input/{UpdateOnlineStatusInput.java → SaveOnlineStatusInput.java}

@@ -1,11 +1,15 @@
 package com.artandscience.security.domain.model.input;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
 @Builder
-public class UpdateOnlineStatusInput {
+@AllArgsConstructor
+@NoArgsConstructor
+public class SaveOnlineStatusInput {
     private Boolean isOnline;
-    private String localId;
+    private String customerNumber;
 }

src/main/java/com/artandscience/security/domain/model/input/SetFcmTokenInput.java

@@ -7,5 +7,4 @@ import lombok.Data;
 @Builder
 public class SetFcmTokenInput {
     private String fcmToken;
-    private Boolean isOnline;
 }

src/main/java/com/artandscience/security/domain/model/input/UserInput.java

@@ -5,6 +5,7 @@ import com.artandscience.security.domain.enums.Role;
 import lombok.Builder;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.util.List;
 
 @Data
@@ -18,5 +19,7 @@ public class UserInput {
     private String email;
     private List<BackofficePermission> backofficePermissions;
     private Role role;
+    private LocalDate birthday;
+    private Boolean isFirstLogin;
 
 }

src/main/java/com/artandscience/security/domain/model/output/GetUserOutput.java

@@ -4,6 +4,7 @@ import com.artandscience.security.domain.response.GetUserResponse;
 import lombok.Builder;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.util.List;
 
 @Data
@@ -16,6 +17,8 @@ public class GetUserOutput {
     private String email;
     private String customerNumber;
     private List<String> permissions;
+    private String birthday;
+    private Boolean isLogin;
 
     public GetUserResponse toResponse() {
         return GetUserResponse.builder()
@@ -25,6 +28,8 @@ public class GetUserOutput {
                 .phoneNumber(phoneNumber)
                 .customerNumber(customerNumber)
                 .permissions(permissions)
+                .birthday(birthday)
+                .isFirstLogin(isLogin ? "1" : "0")
                 .build();
     }
 

src/main/java/com/artandscience/security/domain/model/output/{GetOnlineStatusOutput.java → OnlineStatusOutput.java}

@@ -1,6 +1,6 @@
 package com.artandscience.security.domain.model.output;
 
-import com.artandscience.security.domain.response.GetOnlineStatusResponse;
+import com.artandscience.security.domain.response.OnlineStatusResponse;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -10,13 +10,12 @@ import lombok.NoArgsConstructor;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-public class GetOnlineStatusOutput {
+public class OnlineStatusOutput {
+    private Boolean isOnline;
 
-    private Boolean online;
-
-    public GetOnlineStatusResponse toResponse() {
-        return GetOnlineStatusResponse.builder()
-                .online(online)
+    public OnlineStatusResponse toResponse() {
+        return OnlineStatusResponse.builder()
+                .isOnline(isOnline)
                 .build();
     }
 

src/main/java/com/artandscience/security/domain/request/{GetOnlineStatusRequest.java → OnlineStatusRequest.java}

@@ -1,6 +1,6 @@
 package com.artandscience.security.domain.request;
 
-import com.artandscience.security.domain.model.input.GetOnlineStatusInput;
+import com.artandscience.security.domain.model.input.OnlineStatusInput;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -10,11 +10,11 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-public class GetOnlineStatusRequest {
+public class OnlineStatusRequest {
     private String customerNumber;
 
-    public GetOnlineStatusInput toInput() {
-        return GetOnlineStatusInput.builder()
+    public OnlineStatusInput toInput() {
+        return OnlineStatusInput.builder()
                 .customerNumber(customerNumber)
                 .build();
     }

src/main/java/com/artandscience/security/domain/request/SaveOnlineStatusRequest.java

@@ -0,0 +1,15 @@
+package com.artandscience.security.domain.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class SaveOnlineStatusRequest {
+    private Boolean isOnline;
+    private String customerNumber;
+}

src/main/java/com/artandscience/security/domain/request/SetFcmTokenRequest.java

@@ -12,12 +12,10 @@ import lombok.NoArgsConstructor;
 @Builder
 public class SetFcmTokenRequest {
     private String fcmToken;
-    private Boolean isOnline;
 
     public SetFcmTokenInput toInput() {
         return SetFcmTokenInput.builder()
                 .fcmToken(fcmToken)
-                .isOnline(isOnline)
                 .build();
     }
 

src/main/java/com/artandscience/security/domain/response/GetUserResponse.java

@@ -20,5 +20,7 @@ public class GetUserResponse implements Serializable {
     private String email;
     private String customerNumber;
     private List<String> permissions;
+    private String birthday;
+    private String isFirstLogin;
 
 }

src/main/java/com/artandscience/security/domain/response/{GetOnlineStatusResponse.java → OnlineStatusResponse.java}

@@ -9,8 +9,6 @@ import lombok.NoArgsConstructor;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-public class GetOnlineStatusResponse {
-
-    private Boolean online;
-
+public class OnlineStatusResponse {
+    private Boolean isOnline;
 }

src/main/java/com/artandscience/security/domain/service/FcmTokenService.java

@@ -1,9 +1,7 @@
 package com.artandscience.security.domain.service;
 
 import com.artandscience.security.domain.model.input.SetFcmTokenInput;
-import com.artandscience.security.domain.model.input.GetOnlineStatusInput;
 import com.artandscience.security.domain.model.output.GetFcmTokenOutput;
-import com.artandscience.security.domain.model.output.GetOnlineStatusOutput;
 
 public interface FcmTokenService {
 
@@ -11,6 +9,4 @@ public interface FcmTokenService {
 
     GetFcmTokenOutput getFcmToken();
 
-    GetOnlineStatusOutput getOnlineStatus(GetOnlineStatusInput input);
-
 }

src/main/java/com/artandscience/security/domain/service/OnlineStatusService.java

@@ -0,0 +1,13 @@
+package com.artandscience.security.domain.service;
+
+import com.artandscience.security.domain.model.input.OnlineStatusInput;
+import com.artandscience.security.domain.model.input.SaveOnlineStatusInput;
+import com.artandscience.security.domain.model.output.OnlineStatusOutput;
+
+public interface OnlineStatusService {
+
+    OnlineStatusOutput isOnline(OnlineStatusInput input);
+
+    void saveOnlineStatus(SaveOnlineStatusInput input);
+
+}

src/main/java/com/artandscience/security/domain/service/base/UserService.java

@@ -8,10 +8,12 @@ import com.artandscience.security.domain.model.output.GetUserOutput;
 
 public interface UserService {
 
-    void addUser(UserInput input);
+    String addUser(UserInput input);
 
     GetUserOutput getUserDetail(GetUserInput input);
 
     GetCustomerNoByMailOutput getCustomerNumberByUsers(GetCustomerNoByMailInput input);
 
+    void updateLoginStatus();
+
 }

src/main/java/com/artandscience/security/domain/service/impl/ArtAndScienceAuthServiceImpl.java

@@ -9,6 +9,7 @@ import com.artandscience.security.domain.model.LoginSession;
 import com.artandscience.security.domain.model.provider.Provider;
 import com.artandscience.security.domain.model.input.*;
 import com.artandscience.security.domain.model.output.*;
+//import com.artandscience.security.domain.publish.KafkaNotificationPublisher;
 import com.artandscience.security.domain.request.ArtAndScienceAuthServiceRequest;
 import com.artandscience.security.domain.service.ArtAndScienceAuthService;
 import com.artandscience.security.domain.util.*;
@@ -26,9 +27,12 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 
 import static com.artandscience.security.common.constants.AuthServiceContant.*;
 import static com.artandscience.security.common.constants.GeneralConstant.ARTANDSCIENCE_PROFILE;
@@ -41,9 +45,8 @@ import static com.artandscience.security.common.constants.GeneralConstant.ARTAND
 public class ArtAndScienceAuthServiceImpl implements ArtAndScienceAuthService {
 
     private final ArtAndScienceAuthServiceRequest serviceRequest;
+    //private final KafkaNotificationPublisher publisher;
 
-    @Value("${cookie.name}")
-    private String cookieName;
 
     @Override
     public RegisterOutput register(RegisterInput input) {
@@ -56,14 +59,31 @@ public class ArtAndScienceAuthServiceImpl implements ArtAndScienceAuthService {
 
             serviceRequest.getFirebaseClaimUtil().setUserRoleClaim(clientResponse.getLocalId(),input.getRole().name());
 
-            serviceRequest.getUserService().addUser(UserInput.builder()
+            String customerNo = serviceRequest.getUserService().addUser(UserInput.builder()
                     .name(input.getName())
                     .surname(input.getSurname())
                     .phoneNumber(input.getPhoneNumber())
                     .email(input.getEmail())
                     .localId(clientResponse.getLocalId())
+                    .birthday(input.getBirthday())
                     .build());
 
+            /*UserPayload payload = UserPayload.builder()
+                    .customerNo(customerNo)
+                    .email(input.getEmail())
+                    .fullName(input.getName() + " " + input.getSurname())
+                    .build();
+
+            UserEventPayload eventPayload = UserEventPayload.builder()
+                    .eventId(UUID.randomUUID().toString())
+                    .eventType("USER_REGISTERED")
+                    .source("auth-service")
+                    .occurredAt(ZonedDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME))
+                    .payload(payload)
+                    .build();
+
+            publisher.publish(eventPayload);*/
+
             return RegisterOutput.builder()
                     .sessionId(sessionId)
                     .messageBoxes(List.of(serviceRequest.getExternalAttributeService()
@@ -94,7 +114,7 @@ public class ArtAndScienceAuthServiceImpl implements ArtAndScienceAuthService {
                 throw new RuntimeException(e);
             }
 
-            CookieUtil.addCookie(cookieName,sessionId,loginSession.getExpireIn());
+            serviceRequest.getSessionService().setSessionByDeviceId(sessionId);
 
             AuthLogHelper.successLoginLog(serviceRequest.getAuthLogService(), input.getEmail());
 
@@ -159,11 +179,9 @@ public class ArtAndScienceAuthServiceImpl implements ArtAndScienceAuthService {
 
     @Override
     public LogoutOutput logout() {
+        serviceRequest.getUserService().updateLoginStatus();
         serviceRequest.getSessionService().removeSession(null,false,false);
-        CookieUtil.removeCookie(cookieName);
-        serviceRequest.getFcmTokenService().setFcmToken(SetFcmTokenInput.builder()
-                        .isOnline(false)
-                        .build());
+        serviceRequest.getSessionService().removeSessionByDeviceId();
         AuthLogHelper.successLogoutLog(serviceRequest.getAuthLogService(),null);
         return LogoutOutput.builder()
                 .messageBoxes(List.of(serviceRequest.getExternalAttributeService()

src/main/java/com/artandscience/security/domain/service/impl/ArtAndScienceUserServiceImpl.java

@@ -1,6 +1,9 @@
 package com.artandscience.security.domain.service.impl;
 
+import com.artandscience.security.common.helper.RequestScopeHelper;
+import com.artandscience.security.common.scope.RequestHeaderScope;
 import com.artandscience.security.common.utils.CustomerGenerator;
+import com.artandscience.security.common.utils.DateUtil;
 import com.artandscience.security.dao.entity.Users;
 import com.artandscience.security.dao.repository.UserRepository;
 import com.artandscience.security.domain.model.input.GetCustomerNoByMailInput;
@@ -28,9 +31,10 @@ public class ArtAndScienceUserServiceImpl implements ArtAndScienceUserService {
 
     private final UserRepository userRepository;
     private final LoginSecurityService loginSecurityService;
+    private final RequestHeaderScope requestHeaderScope;
 
     @Override
-    public void addUser(UserInput input) {
+    public String addUser(UserInput input) {
 
         Users users = new Users();
         String customerNo = CustomerGenerator.generateCustomerNumber();
@@ -39,7 +43,7 @@ public class ArtAndScienceUserServiceImpl implements ArtAndScienceUserService {
         loginSecurityService.addLoginSecurity(LoginSecurityByCustomerNoInput.builder()
                         .customerNo(customerNo)
                         .build());
-
+        return customerNo;
     }
 
     @Override
@@ -56,6 +60,8 @@ public class ArtAndScienceUserServiceImpl implements ArtAndScienceUserService {
                     .email(users.getEmail())
                     .phoneNumber(users.getPhoneNumber())
                     .customerNumber(users.getCustomerNo())
+                    .birthday(DateUtil.localDateToString(users.getBirthday()))
+                    .isLogin(users.getIsFirstLogin())
                     .build();
         } else {
             throw new RuntimeException();
@@ -70,4 +76,18 @@ public class ArtAndScienceUserServiceImpl implements ArtAndScienceUserService {
                 .customerNo(customerNo)
                 .build();
     }
+
+    /*ilk login olan kullanıcı logout olduğunda first login statüsü false olarak güncellenir.*/
+    @Override
+    public void updateLoginStatus() {
+        var customerNo = RequestScopeHelper.getCustomerNumber(requestHeaderScope);
+        Optional<Users> optUser = userRepository.findAllByCustomerNoEquals(customerNo);
+        if (optUser.isPresent()) {
+            Users users = optUser.get();
+            if (users.getIsFirstLogin()) {
+                users.setIsFirstLogin(Boolean.FALSE);
+                userRepository.save(users);
+            }
+        }
+    }
 }

src/main/java/com/artandscience/security/domain/service/impl/BackOfficeUserServiceImpl.java

@@ -38,9 +38,10 @@ public class BackOfficeUserServiceImpl implements BackOfficeUserService {
     private final SessionService sessionService;
 
     @Override
-    public void addUser(UserInput input) {
+    public String addUser(UserInput input) {
         BackofficeUser backofficeUser = BackofficeUser.toEntity(input);
         userRepository.save(backofficeUser);
+        return "";
     }
 
     @Override
@@ -113,6 +114,11 @@ public class BackOfficeUserServiceImpl implements BackOfficeUserService {
         return null;
     }
 
+    @Override
+    public void updateLoginStatus() {
+
+    }
+
     private void setSessionUser(BackofficeUser backofficeUser) {
         UserSession userSession = UserSession.builder()
                 .name(backofficeUser.getName())

src/main/java/com/artandscience/security/domain/service/impl/FcmTokenServiceImpl.java

@@ -7,10 +7,8 @@ import com.artandscience.security.common.scope.RequestHeaderScope;
 import com.artandscience.security.dao.entity.CustomerFcm;
 import com.artandscience.security.dao.repository.CustomerFcmRepository;
 import com.artandscience.security.domain.model.input.SetFcmTokenInput;
-import com.artandscience.security.domain.model.input.GetOnlineStatusInput;
 import com.artandscience.security.domain.model.mapper.GetFcmTokenMapper;
 import com.artandscience.security.domain.model.output.GetFcmTokenOutput;
-import com.artandscience.security.domain.model.output.GetOnlineStatusOutput;
 import com.artandscience.security.domain.service.FcmTokenService;
 import com.artandscience.security.domain.util.GenerateUtil;
 import lombok.RequiredArgsConstructor;
@@ -32,7 +30,6 @@ public class FcmTokenServiceImpl implements FcmTokenService {
     public void setFcmToken(SetFcmTokenInput input) {
 
         // customerno ile kayıt varmı bakılır.
-        // inputtaki isonline false ise sadece isonline güncelle
 
         String customerNo = RequestScopeHelper.getCustomerNumber(requestHeaderScope);
         String chanel = RequestScopeHelper.getChanel(requestHeaderScope);
@@ -40,9 +37,9 @@ public class FcmTokenServiceImpl implements FcmTokenService {
         var customerFcm = getCustomerFcmByCustomerNo(customerNo, chanel);
 
         if (!Objects.isNull(customerFcm)) {
-            updateCustomerFcm(customerFcm,input.getFcmToken(),input.getIsOnline());
+            updateCustomerFcm(customerFcm,input.getFcmToken());
         } else {
-            saveCustomerFcm(customerNo,chanel,input.getIsOnline(),input.getFcmToken());
+            saveCustomerFcm(customerNo,chanel,input.getFcmToken());
         }
 
     }
@@ -54,30 +51,19 @@ public class FcmTokenServiceImpl implements FcmTokenService {
         return GetFcmTokenMapper.toModelList(fcmCustomer);
     }
 
-    @Override
-    public GetOnlineStatusOutput getOnlineStatus(GetOnlineStatusInput input) {
-        Boolean isOnline = customerFcmRepository.existsByCustomerNoAndIsOnlineTrue(input.getCustomerNumber());
-        return new GetOnlineStatusOutput(isOnline);
-    }
 
-    private void updateCustomerFcm(CustomerFcm customerFcm, String fcmToken,Boolean isOnline) {
-        // login oluyorsa hem flag hemde fcm token güncellenir.
-        if (Boolean.TRUE.equals(isOnline)) {
-            customerFcm.setFcmToken(fcmToken);
-            customerFcm.setIsOnline(true);
-        } else {
-            customerFcm.setIsOnline(isOnline);
-        }
+    private void updateCustomerFcm(CustomerFcm customerFcm, String fcmToken) {
+        // login oluyorsa fcm token güncellenir.
+        customerFcm.setFcmToken(fcmToken);
         customerFcmRepository.save(customerFcm);
     }
 
-    private void saveCustomerFcm(String customerNo,String chanel, Boolean isOnline, String fcmToken) {
+    private void saveCustomerFcm(String customerNo,String chanel, String fcmToken) {
         var customerFcm = CustomerFcm.builder()
                 .uid(GenerateUtil.generateSession())
                 .customerNo(customerNo)
                 .fcmToken(fcmToken)
                 .chanel(chanel)
-                .isOnline(isOnline)
                 .build();
         customerFcmRepository.save(customerFcm);
     }
@@ -87,7 +73,7 @@ public class FcmTokenServiceImpl implements FcmTokenService {
     }
 
     private List<CustomerFcm> getCustomerFcmListByCustomerNo(String customerNo) {
-        var customerFcmList = customerFcmRepository.getCustomerNoAndOnlineIsTrue(customerNo);
+        var customerFcmList = customerFcmRepository.getCustomerNo(customerNo);
         if (!customerFcmList.isEmpty()) {
             return customerFcmList;
         }

src/main/java/com/artandscience/security/domain/service/impl/OnlineStatusServiceImpl.java

@@ -0,0 +1,58 @@
+package com.artandscience.security.domain.service.impl;
+
+import com.artandscience.security.dao.entity.CustomerOnlineStatus;
+import com.artandscience.security.dao.repository.CustomerOnlineStatusRepository;
+import com.artandscience.security.domain.model.input.OnlineStatusInput;
+import com.artandscience.security.domain.model.input.SaveOnlineStatusInput;
+import com.artandscience.security.domain.model.output.OnlineStatusOutput;
+import com.artandscience.security.domain.service.OnlineStatusService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+import java.util.UUID;
+
+@Service
+@RequiredArgsConstructor
+public class OnlineStatusServiceImpl implements OnlineStatusService {
+
+    private final CustomerOnlineStatusRepository customerOnlineStatusRepository;
+
+    @Override
+    public OnlineStatusOutput isOnline(OnlineStatusInput input) {
+        var isOnline = customerOnlineStatusRepository.isOnlineForCustomerNo(input.getCustomerNumber());
+        return OnlineStatusOutput.builder()
+                .isOnline(isOnline)
+                .build();
+    }
+
+    @Override
+    public void saveOnlineStatus(SaveOnlineStatusInput input) {
+        var entity = getEntityByCustomerNo(input.getCustomerNumber());
+        if (Objects.isNull(entity)) {
+            saveOnlineStatus(input.getCustomerNumber());
+        } else {
+            updateOnlineStatus(input.getIsOnline(), entity);
+        }
+    }
+
+    private void updateOnlineStatus(Boolean isOnline, CustomerOnlineStatus customerOnlineStatus) {
+        customerOnlineStatus.setIsOnline(isOnline);
+        customerOnlineStatusRepository.save(customerOnlineStatus);
+    }
+
+    private void saveOnlineStatus(String customerNo) {
+        var entity = CustomerOnlineStatus.builder()
+                .uid(UUID.randomUUID().toString())
+                .isOnline(true)
+                .customerNumber(customerNo)
+                .build();
+        customerOnlineStatusRepository.save(entity);
+    }
+
+    private CustomerOnlineStatus getEntityByCustomerNo(String customerNo) {
+         return customerOnlineStatusRepository
+                .findAllByCustomerNumberEquals(customerNo).orElse(null);
+    }
+
+}

src/main/java/com/artandscience/security/domain/util/CookieUtil.java

@@ -1,41 +0,0 @@
-package com.artandscience.security.domain.util;
-
-import jakarta.servlet.http.Cookie;
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-public class CookieUtil {
-
-    private CookieUtil() {}
-
-    public static void addCookie(String cookieName, String sessionId, String expireIn) {
-        HttpServletResponse resp =
-                ((ServletRequestAttributes) RequestContextHolder
-                        .currentRequestAttributes()).getResponse();
-
-        Cookie cookie = new Cookie(cookieName, sessionId);
-        cookie.setHttpOnly(true);
-        cookie.setSecure(true);
-        cookie.setPath("/");
-        cookie.setMaxAge(Integer.parseInt(expireIn));
-        assert resp != null;
-        resp.addCookie(cookie);
-    }
-
-    public static void removeCookie(String cookieName) {
-        HttpServletResponse resp =
-                ((ServletRequestAttributes) RequestContextHolder
-                        .currentRequestAttributes()).getResponse();
-
-        Cookie cookie = new Cookie(cookieName, null);
-        cookie.setHttpOnly(true);
-        cookie.setSecure(true);
-        cookie.setPath("/");
-        cookie.setMaxAge(0);
-
-        assert resp != null;
-        resp.addCookie(cookie);
-    }
-
-}