Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: added cookies to fix silent login #249

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/app/App.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { initSurvicate } from '../public-path';
import { lazy, Suspense } from 'react';
import React from 'react';
import Cookies from 'js-cookie';
import { createBrowserRouter, createRoutesFromElements, Route, RouterProvider } from 'react-router-dom';
import ChunkLoader from '@/components/loader/chunk-loader';
import RoutePromptDialog from '@/components/route-prompt-dialog';
Expand Down Expand Up @@ -71,7 +72,14 @@ function App() {
React.useEffect(() => {
const accounts_list = localStorage.getItem('accountsList');
const client_accounts = localStorage.getItem('clientAccounts');
const active_loginid = localStorage.getItem('active_loginid');
const active_loginid =
JSON.parse(Cookies.get('active_loginid') || '') || localStorage.getItem('active_loginid');
console.log('test from app', {
active_loginid,
active_login_id_encrypted: JSON.parse(Cookies.get('active_login_id_unencrypted') || ''),
active_loginid_cookie: Cookies.get('active_loginid') || '',
active_loginid_local_storage: localStorage.getItem('active_loginid'),
});
const url_params = new URLSearchParams(window.location.search);
const account_currency = url_params.get('account');

Expand Down
7 changes: 7 additions & 0 deletions src/pages/callback/callback-page.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Cookies from 'js-cookie';
import { generateDerivApiInstance } from '@/external/bot-skeleton/services/api/appId';
import { Callback } from '@deriv-com/auth-client';
import { Button } from '@deriv-com/ui';
Expand Down Expand Up @@ -49,6 +50,12 @@ const CallbackPage = () => {
}
}
if (!is_token_set) {
const active_loginid =
JSON.parse(Cookies.get('active_loginid') || '') || localStorage.getItem('active_loginid');
console.log('test from callback', {
tokens,
active_loginid,
});
localStorage.setItem('authToken', tokens.token1);
localStorage.setItem('active_loginid', tokens.acct1);
}
Expand Down
Loading