From 30d7a0fbcb4b371918b44a790fb8cdcc92668873 Mon Sep 17 00:00:00 2001
From: adrienne-deriv <103016120+adrienne-deriv@users.noreply.github.com>
Date: Wed, 26 Feb 2025 13:16:17 +0800
Subject: [PATCH] Adrienne / Fix self exclusion not logging out with OIDC
 (#18078)

* feat: store redirect metadata for traders hub from os-redirect

* Merge branch 'master' of github.com:deriv-com/deriv-app

* chore: fix self exclusion not logging out

* chore: fix self exclusion not logging out

* chore: remove unrelated changes caused by linter

* chore: remove unrelated changes caused by linter

* chore: fix linting issue with formatting
---
 packages/core/src/Services/socket-general.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/Services/socket-general.js b/packages/core/src/Services/socket-general.js
index 6d8a3cdb4d93..7b0c1e263fc2 100644
--- a/packages/core/src/Services/socket-general.js
+++ b/packages/core/src/Services/socket-general.js
@@ -13,6 +13,7 @@ import { localize } from '@deriv/translations';
 import ServerTime from '_common/base/server_time';
 import BinarySocket from '_common/base/socket_base';
 import WS from './ws-methods';
+import { OAuth2Logout } from '@deriv-com/auth-client';
 
 let client_store, common_store, gtm_store;
 let reconnectionCounter = 1;
@@ -142,8 +143,14 @@ const BinarySocketGeneral = (() => {
             const remaining_session_time = duration * 60 * 1000 - current_session_duration;
             clearTimeout(session_timeout);
             session_timeout = setTimeout(() => {
-                client_store.logout();
-                sessionStorage.removeItem('session_start_time');
+                OAuth2Logout({
+                    WSLogoutAndRedirect: () => {
+                        client_store.logout();
+                        sessionStorage.removeItem('session_start_time');
+                    },
+                    redirectCallbackUri: `${window.location.origin}/callback`,
+                    postLogoutRedirectUri: `${window.location.origin}/`
+                });
             }, remaining_session_time);
         } else if (!duration) {
             clearTimeout(session_timeout);