|
@@ -37,8 +37,12 @@
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return authentication.subscribe(async (auth) => {
|
|
return authentication.subscribe(async (auth) => {
|
|
|
|
|
+ if (new Date(auth?.expirationDate) < new Date()) {
|
|
|
|
|
+ await goto('/logout');
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if (!auth || !auth.token) {
|
|
if (!auth || !auth.token) {
|
|
|
- await goto('/login');
|
|
|
|
|
|
|
+ await goto('/logout');
|
|
|
} else {
|
|
} else {
|
|
|
authToken = auth.token;
|
|
authToken = auth.token;
|
|
|
await fetchPortfolio();
|
|
await fetchPortfolio();
|
|
@@ -61,7 +65,6 @@
|
|
|
} else {
|
|
} else {
|
|
|
const error = await response.json();
|
|
const error = await response.json();
|
|
|
console.error('Failed to find portfolio info:', error);
|
|
console.error('Failed to find portfolio info:', error);
|
|
|
- await goto('/login');
|
|
|
|
|
}
|
|
}
|
|
|
} catch (err) {
|
|
} catch (err) {
|
|
|
console.error('Failed to find portfolio info', err);
|
|
console.error('Failed to find portfolio info', err);
|
|
@@ -244,7 +247,7 @@
|
|
|
const country = {
|
|
const country = {
|
|
|
BVMF: 'br',
|
|
BVMF: 'br',
|
|
|
FRA: 'de',
|
|
FRA: 'de',
|
|
|
- ETR: 'eu',
|
|
|
|
|
|
|
+ ETR: 'eu'
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
return country[market] || 'us';
|
|
return country[market] || 'us';
|