Skip to content
This repository was archived by the owner on May 4, 2023. It is now read-only.

fix: cache and check on login #13

Merged
merged 1 commit into from
Jan 21, 2023
Merged

fix: cache and check on login #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"coding-assistant",
"codiga"
],
"version": "0.0.17",
"version": "0.0.18",
"homepage": "https://www.codiga.io/",
"bugs": {
"url": "https://github.com/codiga/code-snippets-manager/issues"
Expand Down
2 changes: 1 addition & 1 deletion release/app/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion release/app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "codiga",
"version": "0.0.17",
"version": "0.0.18",
"description": "Codiga Code Snippets Manager",
"license": "MIT",
"author": {
Expand Down
2 changes: 2 additions & 0 deletions src/renderer/components/Layout/SideMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ export default function SideMenu({ openLoginModal }: SideMenuProps) {
localStorage.removeItem(TOKEN);
setUser({});
navigate('/');
await apolloClient.clearStore();
await apolloClient.cache.reset();
await apolloClient.resetStore();
} catch (err) {
// eslint-disable-next-line no-console
Expand Down
7 changes: 5 additions & 2 deletions src/renderer/components/Login/Login.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,12 @@ export default function Login({ isOpen, closeModal }: LoginProps) {
// set the token in localStorarge, which the apollo client will grab
localStorage.setItem(TOKEN, formData.token);
// check if a user is returned now
const { data } = await validateToken();
const { data, error } = await validateToken({
fetchPolicy: 'network-only',
nextFetchPolicy: 'network-only',
});
// valid token, close/reset modal, otherwise remove token and show an error to the user
if (data?.user) {
if (data?.user && !error) {
setUser(data.user);
closeAndReset();
} else {
Expand Down
3 changes: 2 additions & 1 deletion src/renderer/components/UserContext/UserContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ export const UserProvider = ({ children }: { children: ReactNode }) => {

useQuery<{ user: Partial<User> }>(CHECK_USER, {
pollInterval: POLL_USER_FOR_LOGOUT_MSEC,
fetchPolicy: 'no-cache',
fetchPolicy: 'network-only',
nextFetchPolicy: 'network-only',
onCompleted: (respData) => {
if (respData?.user) {
setUser(respData?.user);
Expand Down