Skip to content

Commit a73b0be

Browse files
committed
Update based on PR review
1 parent 0f1e9d9 commit a73b0be

File tree

4 files changed

+6
-11
lines changed

4 files changed

+6
-11
lines changed

recipe/session/accessToken.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ package session
1717

1818
import (
1919
"errors"
20+
"fmt"
2021
"github.com/MicahParks/keyfunc"
2122
"github.com/golang-jwt/jwt/v4"
2223
sterrors "github.com/supertokens/supertokens-golang/recipe/session/errors"
@@ -42,7 +43,7 @@ func GetInfoFromAccessToken(jwtInfo sessmodels.ParsedJWTInfo, jwks keyfunc.JWKS,
4243
if jwtInfo.Version >= 3 {
4344
parsedToken, parseError := jwt.Parse(jwtInfo.RawTokenString, jwks.Keyfunc)
4445
if parseError != nil {
45-
supertokens.LogDebugMessage("GetInfoFromAccessToken: Returning TryRefreshTokenError because access token parsing failed")
46+
supertokens.LogDebugMessage(fmt.Sprintf("GetInfoFromAccessToken: Returning TryRefreshTokenError because access token parsing failed - %s", parseError))
4647
return nil, sterrors.TryRefreshTokenError{
4748
Msg: parseError.Error(),
4849
}

recipe/session/recipeImplementation.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ func MakeRecipeImplementation(querier supertokens.Querier, config sessmodels.Typ
176176

177177
refreshSession := func(refreshToken string, antiCsrfToken *string, disableAntiCsrf bool, userContext supertokens.UserContext) (sessmodels.SessionContainer, error) {
178178
if disableAntiCsrf != true && config.AntiCsrf == AntiCSRF_VIA_CUSTOM_HEADER {
179-
supertokens.LogDebugMessage("refreshSession: Since the anti-csrf mode is VIA_CUSTOM_HEADER getSession can't check the CSRF token. Please either use VIA_TOKEN or set antiCsrfCheck to false")
180179
return nil, defaultErrors.New("Since the anti-csrf mode is VIA_CUSTOM_HEADER getSession can't check the CSRF token. Please either use VIA_TOKEN or set antiCsrfCheck to false")
181180
}
182181

@@ -190,7 +189,6 @@ func MakeRecipeImplementation(querier supertokens.Querier, config sessmodels.Typ
190189

191190
responseToken, parseErr := ParseJWTWithoutSignatureVerification(response.AccessToken.Token)
192191
if parseErr != nil {
193-
supertokens.LogDebugMessage("refreshSession: Failed to parse access token")
194192
return nil, err
195193
}
196194

recipe/session/session.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package session
1717

1818
import (
19+
"fmt"
1920
"reflect"
2021

2122
"github.com/supertokens/supertokens-golang/recipe/session/claims"
@@ -164,7 +165,7 @@ func newSessionContainer(config sessmodels.TypeNormalisedInput, session *Session
164165
response, err := regenerateAccessTokenHelper(*querier, &accessTokenPayload, sessionContainer.GetAccessToken())
165166

166167
if err != nil {
167-
supertokens.LogDebugMessage("MergeIntoAccessTokenPayloadWithContext: Returning UnauthorizedError because regenerateAccessTokenHelper returned an error")
168+
supertokens.LogDebugMessage(fmt.Sprintf("MergeIntoAccessTokenPayloadWithContext: Returning UnauthorizedError because we could not regenerate the session - %s", err))
168169
return errors.UnauthorizedError{
169170
Msg: errors.UnauthorizedErrorStr,
170171
}

recipe/session/sessionFunctions.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package session
1818
import (
1919
"encoding/json"
2020
defaultErrors "errors"
21+
"fmt"
2122
"strings"
2223

2324
"github.com/supertokens/supertokens-golang/recipe/session/errors"
@@ -63,7 +64,7 @@ func getSessionHelper(config sessmodels.TypeNormalisedInput, querier supertokens
6364
var err error = nil
6465
combinedJwks, jwksError := sessmodels.GetCombinedJWKS()
6566
if jwksError != nil {
66-
supertokens.LogDebugMessage("getSessionHelper: Returning TryRefreshTokenError because there was an error fetching JWKs")
67+
supertokens.LogDebugMessage(fmt.Sprintf("getSessionHelper: Returning TryRefreshTokenError because there was an error fetching JWKs - %s", jwksError))
6768
if !defaultErrors.As(jwksError, &errors.TryRefreshTokenError{}) {
6869
return sessmodels.GetSessionResponse{}, jwksError
6970
}
@@ -236,20 +237,17 @@ func refreshSessionHelper(config sessmodels.TypeNormalisedInput, querier superto
236237

237238
response, err := querier.SendPostRequest("/recipe/session/refresh", requestBody)
238239
if err != nil {
239-
supertokens.LogDebugMessage("refreshSessionHelper: Call to /recipe/session/refresh API failed")
240240
return sessmodels.CreateOrRefreshAPIResponse{}, err
241241
}
242242
if response["status"] == "OK" {
243243
delete(response, "status")
244244
responseByte, err := json.Marshal(response)
245245
if err != nil {
246-
supertokens.LogDebugMessage("refreshSessionHelper: Could not parse response from /recipe/session/refresh API")
247246
return sessmodels.CreateOrRefreshAPIResponse{}, err
248247
}
249248
var result sessmodels.CreateOrRefreshAPIResponse
250249
err = json.Unmarshal(responseByte, &result)
251250
if err != nil {
252-
supertokens.LogDebugMessage("refreshSessionHelper: Could not decode response from /recipe/session/refresh API")
253251
return sessmodels.CreateOrRefreshAPIResponse{}, err
254252
}
255253
return result, nil
@@ -382,21 +380,18 @@ func regenerateAccessTokenHelper(querier supertokens.Querier, newAccessTokenPayl
382380
"userDataInJWT": newAccessTokenPayload,
383381
})
384382
if err != nil {
385-
supertokens.LogDebugMessage("regenerateAccessTokenHelper: Call to /recipe/session/regenerate failed")
386383
return nil, err
387384
}
388385
if response["status"].(string) == errors.UnauthorizedErrorStr {
389386
return nil, nil
390387
}
391388
responseByte, err := json.Marshal(response)
392389
if err != nil {
393-
supertokens.LogDebugMessage("regenerateAccessTokenHelper: Failed to parse response from core")
394390
return nil, err
395391
}
396392
var resp sessmodels.RegenerateAccessTokenResponse
397393
err = json.Unmarshal(responseByte, &resp)
398394
if err != nil {
399-
supertokens.LogDebugMessage("regenerateAccessTokenHelper: Failed to decode response from core")
400395
return nil, err
401396
}
402397
return &resp, nil

0 commit comments

Comments
 (0)