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.

Sign up for GitHub

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

Jump to bottom

fix: don't refresh session if autoRefreshToken setting is set to false #925

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

fix: don't refresh session if autoRefreshToken setting is set to false #925

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8fc0802
fix: make refresh token optional for a session
thomasconner Jun 17, 2024
804fcba
fix: update tests to check for no refresh token provided to setSession()
thomasconner Jun 17, 2024
d8a35f0
Merge pull request #1 from thomasconner/fix/refresh-token-optional
thomasconner Jun 17, 2024
119bc66
fix: make refresh_token required
thomasconner Jun 18, 2024
3b8e668
Merge branch 'fix/refresh-token-optional'
thomasconner Jun 18, 2024
78bf103
fix: check that refresh_token is provided
thomasconner Jun 18, 2024
ede3dea
fix: restore comment
thomasconner Jun 18, 2024
5242b8f
fix: rename param to currentSession
thomasconner Jun 18, 2024
5f79e53
fix: check that valid session has refresh_token
thomasconner Jun 18, 2024
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
8 changes: 8 additions & 0 deletions src/GoTrueClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1112,6 +1112,7 @@ export default class GoTrueClient {
}

const { session, error } = await this._callRefreshToken(currentSession.refresh_token)

if (error) {
return { data: { session: null }, error }
}
Expand Down Expand Up @@ -1293,6 +1294,10 @@ export default class GoTrueClient {
}

if (hasExpired) {
if (!this.autoRefreshToken) {
return { data: { user: null, session: null }, error: null }
}

const { session: refreshedSession, error } = await this._callRefreshToken(
currentSession.refresh_token
)
Expand All @@ -1303,12 +1308,15 @@ export default class GoTrueClient {
if (!refreshedSession) {
return { data: { user: null, session: null }, error: null }
}

session = refreshedSession
} else {
const { data, error } = await this._getUser(currentSession.access_token)

if (error) {
throw error
}

session = {
access_token: currentSession.access_token,
refresh_token: currentSession.refresh_token,
Expand Down