Adrienne / Merge UAT OIDC changes to staging Deriv.app (#17969)

* Adrienne / Enable OIDC back for SSO/SLO (#17926) * chore: enable back oidc sso * chore: attempt to move hook further up * fix: failing test pr to master (#17925) (#17927) Co-authored-by: nada-deriv <[email protected]> * fix: failing test pr to master (#17925) (#17930) Co-authored-by: nada-deriv <[email protected]> --------- Co-authored-by: amam-deriv <[email protected]> Co-authored-by: nada-deriv <[email protected]>
deriv-com · Jan 14, 2025 · 28943c8 · 28943c8
1 parent 1ece743
commit 28943c8
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/packages/core/src/App/AppContent.tsx b/packages/core/src/App/AppContent.tsx
@@ -58,7 +58,7 @@ const AppContent: React.FC<{ passthrough: unknown }> = observer(({ passthrough }
     const { isMobile } = useDevice();
     const { switchLanguage } = useTranslations();
 
-    const { isOAuth2Enabled } = useOauth2({
+    const { isOAuth2Enabled, oAuthLogout } = useOauth2({
         handleLogout: async () => {
             await logout();
         },
@@ -68,6 +68,12 @@ const AppContent: React.FC<{ passthrough: unknown }> = observer(({ passthrough }
     const is_app_id_set = localStorage.getItem('config.app_id');
     const is_change_login_app_id_set = localStorage.getItem('change_login_app_id');
 
+    useSilentLoginAndLogout({
+        is_client_store_initialized,
+        isOAuth2Enabled,
+        oAuthLogout,
+    });
+
     const [isWebPasskeysFFEnabled, isGBLoaded] = useGrowthbookIsOn({
         featureFlag: 'web_passkeys',
     });
@@ -81,16 +87,6 @@ const AppContent: React.FC<{ passthrough: unknown }> = observer(({ passthrough }
         featureFlag: 'enable_country_code_dropdown',
     });
 
-    // NOTE: Commented this out for now due to single logout causing Deriv.app to be logged out continously
-    // There is a case where if logged_state is false coming from other platforms, Deriv app will SLO the user out
-    // TODO: Revert this once OIDC is enabled back for Deriv.app
-    // useSilentLoginAndLogout({
-    //     is_client_store_initialized,
-    //     isOAuth2Enabled,
-    //     oAuthLogout,
-    //     isGBLoaded,
-    // });
-
     const { data } = useRemoteConfig(true);
     const { tracking_datadog } = data;
     const is_passkeys_supported = browserSupportsWebAuthn();