-
Notifications
You must be signed in to change notification settings - Fork 3
Artyom / Refresh Token Bugs and a Login Redirect #162
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
Open
Artyom-G
wants to merge
8
commits into
main
Choose a base branch
from
artyom/refresh-bug
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
c2498cb
refresh token spelling bug
Artyom-G 19bc81d
comments
Artyom-G e79cc16
fixed the softlocking bug with the refresh tokens
Artyom-G 164f38e
fixed linter errors
Artyom-G 8196c5b
fixed linter errors, theres now an AuthUtils on the frontend
Artyom-G ebe3cde
comment
Artyom-G cd7dc04
removed a bit of redundancy
Artyom-G 9e477e5
Added redirection if the refresh token expires
Artyom-G File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| import axios from "axios"; | ||
| import { DecodedJWT } from "../types/AuthTypes"; | ||
| import { | ||
| getLocalStorageObjProperty, | ||
| setLocalStorageObjProperty, | ||
| clearLocalStorageKey, | ||
| } from "./LocalStorageUtils"; | ||
| import AUTHENTICATED_USER_KEY from "../constants/AuthConstants"; | ||
|
|
||
| const API_BASE = process.env.REACT_APP_BACKEND_URL || ""; | ||
|
|
||
| // Refreshes the access token | ||
| // The reason its here and not in AuthAPIClient is because it creates a cyclic dependanyc with BaseAPIClient | ||
| export const refreshAccessToken = async (): Promise<boolean> => { | ||
| try { | ||
| const { data } = await axios.post( | ||
| `${API_BASE}/auth/refresh`, | ||
| {}, | ||
| { withCredentials: true }, | ||
| ); | ||
|
|
||
| // update stored access token | ||
| setLocalStorageObjProperty( | ||
| AUTHENTICATED_USER_KEY, | ||
| "accessToken", | ||
| data.accessToken, | ||
| ); | ||
|
|
||
| return true; | ||
| } catch (error) { | ||
| // Clear the access token cookie | ||
| clearLocalStorageKey(AUTHENTICATED_USER_KEY); | ||
| return false; | ||
| } | ||
| }; | ||
|
|
||
| // Gets your access token from the cookies | ||
| export const getAccessToken = (): string | null => { | ||
| try { | ||
| const accessToken = String( | ||
| getLocalStorageObjProperty(AUTHENTICATED_USER_KEY, "accessToken"), | ||
| ); | ||
| return accessToken; | ||
| } catch (error) { | ||
| return null; | ||
| } | ||
| }; | ||
|
|
||
| // Checks if the access token has expired or not | ||
| export const validateAccessToken = (decodedToken: DecodedJWT): boolean => { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is the logic backwards? |
||
| // Check if expired | ||
| const result = | ||
| decodedToken && | ||
| // If it a string (and not an object) then something went wrong | ||
| (typeof decodedToken === "string" || | ||
| // Checks the time of expiration in seconds (division by 1000 because its in ms) | ||
| decodedToken.exp <= Math.round(new Date().getTime() / 1000)); | ||
| return !result; | ||
| }; | ||
|
|
||
| // Removes the access token | ||
| export const clearAccessToken = (): void => { | ||
| clearLocalStorageKey(AUTHENTICATED_USER_KEY); | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah we will replace this in production. It is localhost for now because firebase requires a valid url for email link sign in