Preserve account name on relogin
This commit is contained in:
@@ -79,11 +79,14 @@ const Home = () => {
|
|||||||
window.history.replaceState(null, "", "/");
|
window.history.replaceState(null, "", "/");
|
||||||
const res = await fetch(`api/token?code=${code}`);
|
const res = await fetch(`api/token?code=${code}`);
|
||||||
const newCharacter: AccessToken = await res.json();
|
const newCharacter: AccessToken = await res.json();
|
||||||
|
const oldCharacter = characters.find(
|
||||||
|
(c) => c.character.characterId === newCharacter.character.characterId,
|
||||||
|
);
|
||||||
return [
|
return [
|
||||||
...characters.filter(
|
...characters.filter(
|
||||||
(c) => c.character.characterId !== newCharacter.character.characterId,
|
(c) => c.character.characterId !== newCharacter.character.characterId,
|
||||||
),
|
),
|
||||||
newCharacter,
|
{ ...newCharacter, account: oldCharacter?.account ?? "-" },
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
return Promise.resolve(characters);
|
return Promise.resolve(characters);
|
||||||
@@ -149,8 +152,11 @@ const Home = () => {
|
|||||||
if (c.character.characterId === config.characterId) {
|
if (c.character.characterId === config.characterId) {
|
||||||
return {
|
return {
|
||||||
...c,
|
...c,
|
||||||
planetConfig: [...c.planetConfig.filter(p => p.planetId !== config.planetId), config]
|
planetConfig: [
|
||||||
}
|
...c.planetConfig.filter((p) => p.planetId !== config.planetId),
|
||||||
|
config,
|
||||||
|
],
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
return c;
|
return c;
|
||||||
@@ -168,7 +174,11 @@ const Home = () => {
|
|||||||
}): PlanetConfig => {
|
}): PlanetConfig => {
|
||||||
const defaultConfig = { planetId, characterId, excludeFromTotals: false };
|
const defaultConfig = { planetId, characterId, excludeFromTotals: false };
|
||||||
|
|
||||||
return characters.find(c => c.character.characterId === characterId)?.planetConfig.find(p => p.planetId === planetId) ?? defaultConfig
|
return (
|
||||||
|
characters
|
||||||
|
.find((c) => c.character.characterId === characterId)
|
||||||
|
?.planetConfig.find((p) => p.planetId === planetId) ?? defaultConfig
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
Reference in New Issue
Block a user