Merge pull request #154 from supertokens/session-error-throwing-fix

rishabhpoddar · web-flow · commit 00c1a31494b7 · 2022-07-08T17:33:09.000+05:30
fix: Session error throwing fix
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+### Breaking change:
+-   Changes session recipe interfaces to not return an `UNAUTHORISED` error when the input is a sessionHandle: https://github.com/supertokens/backend/issues/83
+-   `GetSessionInformation` now returns `nil` is the session does not exist
+-   `UpdateSessionData` now returns `nil` if the input `sessionHandle` does not exist.
+-   `UpdateAccessTokenPayload` now returns `false` if the input `sessionHandle` does not exist.
+-   `RegenerateAccessToken` now returns `nil` if the input access token's `sessionHandle` does not exist.
+-   The session container functions have not changed in behaviour and return errors if `sessionHandle` does not exist. This works on the current session.
+
 ### Fixes
 -   Clears cookies when RevokeSession is called using the session container, even if the session did not exist from before: https://github.com/supertokens/supertokens-node/issues/343
 
diff --git a/recipe/session/main.go b/recipe/session/main.go
@@ -46,10 +46,10 @@ func GetSessionWithContext(req *http.Request, res http.ResponseWriter, options *
 	return (*instance.RecipeImpl.GetSession)(req, res, options, userContext)
 }
 
-func GetSessionInformationWithContext(sessionHandle string, userContext supertokens.UserContext) (sessmodels.SessionInformation, error) {
+func GetSessionInformationWithContext(sessionHandle string, userContext supertokens.UserContext) (*sessmodels.SessionInformation, error) {
 	instance, err := getRecipeInstanceOrThrowError()
 	if err != nil {
-		return sessmodels.SessionInformation{}, err
+		return nil, err
 	}
 	return (*instance.RecipeImpl.GetSessionInformation)(sessionHandle, userContext)
 }
@@ -94,18 +94,18 @@ func RevokeMultipleSessionsWithContext(sessionHandles []string, userContext supe
 	return (*instance.RecipeImpl.RevokeMultipleSessions)(sessionHandles, userContext)
 }
 
-func UpdateSessionDataWithContext(sessionHandle string, newSessionData map[string]interface{}, userContext supertokens.UserContext) error {
+func UpdateSessionDataWithContext(sessionHandle string, newSessionData map[string]interface{}, userContext supertokens.UserContext) (bool, error) {
 	instance, err := getRecipeInstanceOrThrowError()
 	if err != nil {
-		return err
+		return false, err
 	}
 	return (*instance.RecipeImpl.UpdateSessionData)(sessionHandle, newSessionData, userContext)
 }
 
-func UpdateAccessTokenPayloadWithContext(sessionHandle string, newAccessTokenPayload map[string]interface{}, userContext supertokens.UserContext) error {
+func UpdateAccessTokenPayloadWithContext(sessionHandle string, newAccessTokenPayload map[string]interface{}, userContext supertokens.UserContext) (bool, error) {
 	instance, err := getRecipeInstanceOrThrowError()
 	if err != nil {
-		return err
+		return false, err
 	}
 	return (*instance.RecipeImpl.UpdateAccessTokenPayload)(sessionHandle, newAccessTokenPayload, userContext)
 }
@@ -160,10 +160,10 @@ func GetOpenIdDiscoveryConfigurationWithContext(userContext supertokens.UserCont
 	return (*instance.OpenIdRecipe.RecipeImpl.GetOpenIdDiscoveryConfiguration)(userContext)
 }
 
-func RegenerateAccessTokenWithContext(accessToken string, newAccessTokenPayload *map[string]interface{}, sessionHandle string, userContext supertokens.UserContext) (sessmodels.RegenerateAccessTokenResponse, error) {
+func RegenerateAccessTokenWithContext(accessToken string, newAccessTokenPayload *map[string]interface{}, sessionHandle string, userContext supertokens.UserContext) (*sessmodels.RegenerateAccessTokenResponse, error) {
 	instance, err := getRecipeInstanceOrThrowError()
 	if err != nil {
-		return sessmodels.RegenerateAccessTokenResponse{}, err
+		return nil, err
 	}
 	return (*instance.RecipeImpl.RegenerateAccessToken)(accessToken, newAccessTokenPayload, userContext)
 }
@@ -176,7 +176,7 @@ func GetSession(req *http.Request, res http.ResponseWriter, options *sessmodels.
 	return GetSessionWithContext(req, res, options, &map[string]interface{}{})
 }
 
-func GetSessionInformation(sessionHandle string) (sessmodels.SessionInformation, error) {
+func GetSessionInformation(sessionHandle string) (*sessmodels.SessionInformation, error) {
 	return GetSessionInformationWithContext(sessionHandle, &map[string]interface{}{})
 }
 
@@ -200,11 +200,11 @@ func RevokeMultipleSessions(sessionHandles []string) ([]string, error) {
 	return RevokeMultipleSessionsWithContext(sessionHandles, &map[string]interface{}{})
 }
 
-func UpdateSessionData(sessionHandle string, newSessionData map[string]interface{}) error {
+func UpdateSessionData(sessionHandle string, newSessionData map[string]interface{}) (bool, error) {
 	return UpdateSessionDataWithContext(sessionHandle, newSessionData, &map[string]interface{}{})
 }
 
-func UpdateAccessTokenPayload(sessionHandle string, newAccessTokenPayload map[string]interface{}) error {
+func UpdateAccessTokenPayload(sessionHandle string, newAccessTokenPayload map[string]interface{}) (bool, error) {
 	return UpdateAccessTokenPayloadWithContext(sessionHandle, newAccessTokenPayload, &map[string]interface{}{})
 }
 
@@ -220,6 +220,6 @@ func GetOpenIdDiscoveryConfiguration() (openidmodels.GetOpenIdDiscoveryConfigura
 	return GetOpenIdDiscoveryConfigurationWithContext(&map[string]interface{}{})
 }
 
-func RegenerateAccessToken(accessToken string, newAccessTokenPayload *map[string]interface{}, sessionHandle string) (sessmodels.RegenerateAccessTokenResponse, error) {
+func RegenerateAccessToken(accessToken string, newAccessTokenPayload *map[string]interface{}, sessionHandle string) (*sessmodels.RegenerateAccessTokenResponse, error) {
 	return RegenerateAccessTokenWithContext(accessToken, newAccessTokenPayload, sessionHandle, &map[string]interface{}{})
 }
diff --git a/recipe/session/recipeImplementation.go b/recipe/session/recipeImplementation.go
@@ -111,7 +111,7 @@ func makeRecipeImplementation(querier supertokens.Querier, config sessmodels.Typ
 		return &sessionContainer, nil
 	}
 
-	getSessionInformation := func(sessionHandle string, userContext supertokens.UserContext) (sessmodels.SessionInformation, error) {
+	getSessionInformation := func(sessionHandle string, userContext supertokens.UserContext) (*sessmodels.SessionInformation, error) {
 		return getSessionInformationHelper(querier, sessionHandle)
 	}
 
@@ -165,11 +165,11 @@ func makeRecipeImplementation(querier supertokens.Querier, config sessmodels.Typ
 		return revokeMultipleSessionsHelper(querier, sessionHandles)
 	}
 
-	updateSessionData := func(sessionHandle string, newSessionData map[string]interface{}, userContext supertokens.UserContext) error {
+	updateSessionData := func(sessionHandle string, newSessionData map[string]interface{}, userContext supertokens.UserContext) (bool, error) {
 		return updateSessionDataHelper(querier, sessionHandle, newSessionData)
 	}
 
-	updateAccessTokenPayload := func(sessionHandle string, newAccessTokenPayload map[string]interface{}, userContext supertokens.UserContext) error {
+	updateAccessTokenPayload := func(sessionHandle string, newAccessTokenPayload map[string]interface{}, userContext supertokens.UserContext) (bool, error) {
 		return updateAccessTokenPayloadHelper(querier, sessionHandle, newAccessTokenPayload)
 	}
 
@@ -189,7 +189,7 @@ func makeRecipeImplementation(querier supertokens.Querier, config sessmodels.Typ
 		return recipeImplHandshakeInfo.RefreshTokenValidity, nil
 	}
 
-	regenerateAccessToken := func(accessToken string, newAccessTokenPayload *map[string]interface{}, userContext supertokens.UserContext) (sessmodels.RegenerateAccessTokenResponse, error) {
+	regenerateAccessToken := func(accessToken string, newAccessTokenPayload *map[string]interface{}, userContext supertokens.UserContext) (*sessmodels.RegenerateAccessTokenResponse, error) {
 		return regenerateAccessTokenHelper(querier, newAccessTokenPayload, accessToken)
 	}
 
diff --git a/recipe/session/session.go b/recipe/session/session.go
@@ -16,7 +16,6 @@
 package session
 
 import (
-	defaultErrors "errors"
 	"net/http"
 	"reflect"
 
@@ -59,22 +58,24 @@ func newSessionContainer(config sessmodels.TypeNormalisedInput, session *Session
 	getSessionDataWithContext := func(userContext supertokens.UserContext) (map[string]interface{}, error) {
 		sessionInformation, err := (*session.recipeImpl.GetSessionInformation)(session.sessionHandle, userContext)
 		if err != nil {
-			if defaultErrors.As(err, &errors.UnauthorizedError{}) {
-				clearSessionFromCookie(config, session.res)
-			}
 			return nil, err
 		}
+		if sessionInformation == nil {
+			clearSessionFromCookie(config, session.res)
+			return nil, errors.UnauthorizedError{Msg: "session does not exist anymore"}
+		}
 		return sessionInformation.SessionData, nil
 	}
 
 	updateSessionDataWithContext := func(newSessionData map[string]interface{}, userContext supertokens.UserContext) error {
-		err := (*session.recipeImpl.UpdateSessionData)(session.sessionHandle, newSessionData, userContext)
+		updated, err := (*session.recipeImpl.UpdateSessionData)(session.sessionHandle, newSessionData, userContext)
 		if err != nil {
-			if defaultErrors.As(err, &errors.UnauthorizedError{}) {
-				clearSessionFromCookie(config, session.res)
-			}
 			return err
 		}
+		if !updated {
+			clearSessionFromCookie(config, session.res)
+			return errors.UnauthorizedError{Msg: "session does not exist anymore"}
+		}
 		return nil
 	}
 
@@ -89,6 +90,11 @@ func newSessionContainer(config sessmodels.TypeNormalisedInput, session *Session
 			return err
 		}
 
+		if resp == nil {
+			clearSessionFromCookie(config, session.res)
+			return errors.UnauthorizedError{Msg: "session does not exist anymore"}
+		}
+
 		session.userDataInAccessToken = resp.Session.UserDataInAccessToken
 
 		if !reflect.DeepEqual(resp.AccessToken, sessmodels.CreateOrRefreshAPIResponseToken{}) {
@@ -102,22 +108,24 @@ func newSessionContainer(config sessmodels.TypeNormalisedInput, session *Session
 	getTimeCreatedWithContext := func(userContext supertokens.UserContext) (uint64, error) {
 		sessionInformation, err := (*session.recipeImpl.GetSessionInformation)(session.sessionHandle, userContext)
 		if err != nil {
-			if defaultErrors.As(err, &errors.UnauthorizedError{}) {
-				clearSessionFromCookie(config, session.res)
-			}
 			return 0, err
 		}
+		if sessionInformation == nil {
+			clearSessionFromCookie(config, session.res)
+			return 0, errors.UnauthorizedError{Msg: "session does not exist anymore"}
+		}
 		return sessionInformation.TimeCreated, nil
 	}
 
 	getExpiryWithContext := func(userContext supertokens.UserContext) (uint64, error) {
 		sessionInformation, err := (*session.recipeImpl.GetSessionInformation)(session.sessionHandle, userContext)
 		if err != nil {
-			if defaultErrors.As(err, &errors.UnauthorizedError{}) {
-				clearSessionFromCookie(config, session.res)
-			}
 			return 0, err
 		}
+		if sessionInformation == nil {
+			clearSessionFromCookie(config, session.res)
+			return 0, errors.UnauthorizedError{Msg: "session does not exist anymore"}
+		}
 		return sessionInformation.Expiry, nil
 	}
 
diff --git a/recipe/session/sessionFunctions.go b/recipe/session/sessionFunctions.go
@@ -182,16 +182,16 @@ func getSessionHelper(recipeImplHandshakeInfo *sessmodels.HandshakeInfo, config
 	}
 }
 
-func getSessionInformationHelper(querier supertokens.Querier, sessionHandle string) (sessmodels.SessionInformation, error) {
+func getSessionInformationHelper(querier supertokens.Querier, sessionHandle string) (*sessmodels.SessionInformation, error) {
 	response, err := querier.SendGetRequest("/recipe/session",
 		map[string]string{
 			"sessionHandle": sessionHandle,
 		})
 	if err != nil {
-		return sessmodels.SessionInformation{}, err
+		return nil, err
 	}
 	if response["status"] == "OK" {
-		return sessmodels.SessionInformation{
+		return &sessmodels.SessionInformation{
 			SessionHandle:      response["sessionHandle"].(string),
 			UserId:             response["userId"].(string),
 			SessionData:        response["userDataInDatabase"].(map[string]interface{}),
@@ -200,7 +200,7 @@ func getSessionInformationHelper(querier supertokens.Querier, sessionHandle stri
 			AccessTokenPayload: response["userDataInJWT"].(map[string]interface{}),
 		}, nil
 	}
-	return sessmodels.SessionInformation{}, errors.UnauthorizedError{Msg: response["message"].(string)}
+	return nil, nil
 }
 
 func refreshSessionHelper(recipeImplHandshakeInfo *sessmodels.HandshakeInfo, config sessmodels.TypeNormalisedInput, querier supertokens.Querier, refreshToken string, antiCsrfToken *string, containsCustomHeader bool) (sessmodels.CreateOrRefreshAPIResponse, error) {
@@ -328,7 +328,7 @@ func revokeMultipleSessionsHelper(querier supertokens.Querier, sessionHandles []
 	return result, nil
 }
 
-func updateSessionDataHelper(querier supertokens.Querier, sessionHandle string, newSessionData map[string]interface{}) error {
+func updateSessionDataHelper(querier supertokens.Querier, sessionHandle string, newSessionData map[string]interface{}) (bool, error) {
 	if newSessionData == nil {
 		newSessionData = map[string]interface{}{}
 	}
@@ -338,15 +338,15 @@ func updateSessionDataHelper(querier supertokens.Querier, sessionHandle string,
 			"userDataInDatabase": newSessionData,
 		})
 	if err != nil {
-		return err
+		return false, err
 	}
 	if response["status"].(string) == errors.UnauthorizedErrorStr {
-		return errors.UnauthorizedError{Msg: response["message"].(string)}
+		return false, nil
 	}
-	return nil
+	return true, nil
 }
 
-func updateAccessTokenPayloadHelper(querier supertokens.Querier, sessionHandle string, newAccessTokenPayload map[string]interface{}) error {
+func updateAccessTokenPayloadHelper(querier supertokens.Querier, sessionHandle string, newAccessTokenPayload map[string]interface{}) (bool, error) {
 	if newAccessTokenPayload == nil {
 		newAccessTokenPayload = map[string]interface{}{}
 	}
@@ -355,15 +355,15 @@ func updateAccessTokenPayloadHelper(querier supertokens.Querier, sessionHandle s
 		"userDataInJWT": newAccessTokenPayload,
 	})
 	if err != nil {
-		return err
+		return false, err
 	}
 	if response["status"].(string) == errors.UnauthorizedErrorStr {
-		return errors.UnauthorizedError{Msg: response["message"].(string)}
+		return false, nil
 	}
-	return nil
+	return true, nil
 }
 
-func regenerateAccessTokenHelper(querier supertokens.Querier, newAccessTokenPayload *map[string]interface{}, accessToken string) (sessmodels.RegenerateAccessTokenResponse, error) {
+func regenerateAccessTokenHelper(querier supertokens.Querier, newAccessTokenPayload *map[string]interface{}, accessToken string) (*sessmodels.RegenerateAccessTokenResponse, error) {
 	if newAccessTokenPayload == nil {
 		newAccessTokenPayload = &map[string]interface{}{}
 	}
@@ -372,19 +372,19 @@ func regenerateAccessTokenHelper(querier supertokens.Querier, newAccessTokenPayl
 		"userDataInJWT": newAccessTokenPayload,
 	})
 	if err != nil {
-		return sessmodels.RegenerateAccessTokenResponse{}, err
+		return nil, err
 	}
 	if response["status"].(string) == errors.UnauthorizedErrorStr {
-		return sessmodels.RegenerateAccessTokenResponse{}, errors.UnauthorizedError{Msg: response["message"].(string)}
+		return nil, nil
 	}
 	responseByte, err := json.Marshal(response)
 	if err != nil {
-		return sessmodels.RegenerateAccessTokenResponse{}, err
+		return nil, err
 	}
 	var resp sessmodels.RegenerateAccessTokenResponse
 	err = json.Unmarshal(responseByte, &resp)
 	if err != nil {
-		return sessmodels.RegenerateAccessTokenResponse{}, err
+		return nil, err
 	}
-	return resp, nil
+	return &resp, nil
 }
diff --git a/recipe/session/session_test.go b/recipe/session/session_test.go
@@ -470,13 +470,12 @@ func TestManipulatingSessionData(t *testing.T) {
 
 	//update session data with wrong session handle
 
-	err = UpdateSessionData("random", map[string]interface{}{
+	sessionUpdated, err := UpdateSessionData("random", map[string]interface{}{
 		"name": "Ronit",
 	})
 
-	assert.Error(t, err)
-
-	assert.Equal(t, "Session does not exist.", err.Error())
+	assert.NoError(t, err)
+	assert.False(t, sessionUpdated)
 }
 
 func TestNilValuesPassedForSessionData(t *testing.T) {
@@ -613,35 +612,38 @@ func TestManipulatingJWTpayload(t *testing.T) {
 		t.Error(err.Error())
 	}
 
-	err = UpdateAccessTokenPayload(sessionHandles[0], map[string]interface{}{
+	tokenUpdated, err := UpdateAccessTokenPayload(sessionHandles[0], map[string]interface{}{
 		"key": "value",
 	})
 
 	assert.NoError(t, err)
+	assert.True(t, tokenUpdated)
 
 	sessionInfo, err := GetSessionInformation(sessionHandles[0])
 
 	assert.NoError(t, err)
 
 	assert.Equal(t, "value", sessionInfo.AccessTokenPayload["key"])
 
-	err = UpdateAccessTokenPayload(sessionHandles[0], map[string]interface{}{
+	tokenUpdated, err = UpdateAccessTokenPayload(sessionHandles[0], map[string]interface{}{
 		"key": "value2",
 	})
 
 	assert.NoError(t, err)
+	assert.True(t, tokenUpdated)
 
 	sessionInfo1, err := GetSessionInformation(sessionHandles[0])
 
 	assert.NoError(t, err)
 
 	assert.Equal(t, "value2", sessionInfo1.AccessTokenPayload["key"])
 
-	err = UpdateAccessTokenPayload("random", map[string]interface{}{
+	tokenUpdated, err = UpdateAccessTokenPayload("random", map[string]interface{}{
 		"key": "value3",
 	})
 
-	assert.Error(t, err)
+	assert.NoError(t, err)
+	assert.False(t, tokenUpdated)
 }
 
 func TestWhenAntiCsrfIsDisabledFromSTcoreNotHavingThatInInputToVerifySessionIsFine(t *testing.T) {
@@ -950,8 +952,9 @@ func TestRevokedSessionThrowsErrorWhenCallingGetSessionBySessionHandle(t *testin
 	assert.NoError(t, err)
 	_, err = RevokeAllSessionsForUser("ronit")
 	assert.NoError(t, err)
-	_, err = GetSessionInformation(sessionHandlers[0])
-	assert.Error(t, err)
+	sessionInformation, err := GetSessionInformation(sessionHandlers[0])
+	assert.Nil(t, sessionInformation)
+	assert.NoError(t, err)
 }
 
 func TestSignoutWorksAfterSessionDeletedOnBackend(t *testing.T) {
diff --git a/recipe/session/sessionwithjwt/recipeImplementation.go b/recipe/session/sessionwithjwt/recipeImplementation.go
diff --git a/recipe/session/sessmodels/recipeInterface.go b/recipe/session/sessmodels/recipeInterface.go

Original file line number	Diff line number	Diff line change
`@@ -46,10 +46,10 @@ func GetSessionWithContext(req http.Request, res http.ResponseWriter, options `
`46`	`46`	`return (*instance.RecipeImpl.GetSession)(req, res, options, userContext)`
`47`	`47`	`}`
`48`	`48`
`49`		`-func GetSessionInformationWithContext(sessionHandle string, userContext supertokens.UserContext) (sessmodels.SessionInformation, error) {`
	`49`	`+func GetSessionInformationWithContext(sessionHandle string, userContext supertokens.UserContext) (*sessmodels.SessionInformation, error) {`
`50`	`50`	`instance, err := getRecipeInstanceOrThrowError()`
`51`	`51`	`if err != nil {`
`52`		`- return sessmodels.SessionInformation{}, err`
	`52`	`+ return nil, err`
`53`	`53`	`}`
`54`	`54`	`return (*instance.RecipeImpl.GetSessionInformation)(sessionHandle, userContext)`
`55`	`55`	`}`
`@@ -94,18 +94,18 @@ func RevokeMultipleSessionsWithContext(sessionHandles []string, userContext supe`
`94`	`94`	`return (*instance.RecipeImpl.RevokeMultipleSessions)(sessionHandles, userContext)`
`95`	`95`	`}`
`96`	`96`
`97`		`-func UpdateSessionDataWithContext(sessionHandle string, newSessionData map[string]interface{}, userContext supertokens.UserContext) error {`
	`97`	`+func UpdateSessionDataWithContext(sessionHandle string, newSessionData map[string]interface{}, userContext supertokens.UserContext) (bool, error) {`
`98`	`98`	`instance, err := getRecipeInstanceOrThrowError()`
`99`	`99`	`if err != nil {`
`100`		`- return err`
	`100`	`+ return false, err`
`101`	`101`	`}`
`102`	`102`	`return (*instance.RecipeImpl.UpdateSessionData)(sessionHandle, newSessionData, userContext)`
`103`	`103`	`}`
`104`	`104`
`105`		`-func UpdateAccessTokenPayloadWithContext(sessionHandle string, newAccessTokenPayload map[string]interface{}, userContext supertokens.UserContext) error {`
	`105`	`+func UpdateAccessTokenPayloadWithContext(sessionHandle string, newAccessTokenPayload map[string]interface{}, userContext supertokens.UserContext) (bool, error) {`
`106`	`106`	`instance, err := getRecipeInstanceOrThrowError()`
`107`	`107`	`if err != nil {`
`108`		`- return err`
	`108`	`+ return false, err`
`109`	`109`	`}`
`110`	`110`	`return (*instance.RecipeImpl.UpdateAccessTokenPayload)(sessionHandle, newAccessTokenPayload, userContext)`
`111`	`111`	`}`
`@@ -160,10 +160,10 @@ func GetOpenIdDiscoveryConfigurationWithContext(userContext supertokens.UserCont`
`160`	`160`	`return (*instance.OpenIdRecipe.RecipeImpl.GetOpenIdDiscoveryConfiguration)(userContext)`
`161`	`161`	`}`
`162`	`162`
`163`		`-func RegenerateAccessTokenWithContext(accessToken string, newAccessTokenPayload *map[string]interface{}, sessionHandle string, userContext supertokens.UserContext) (sessmodels.RegenerateAccessTokenResponse, error) {`
	`163`	`+func RegenerateAccessTokenWithContext(accessToken string, newAccessTokenPayload map[string]interface{}, sessionHandle string, userContext supertokens.UserContext) (sessmodels.RegenerateAccessTokenResponse, error) {`
`164`	`164`	`instance, err := getRecipeInstanceOrThrowError()`
`165`	`165`	`if err != nil {`
`166`		`- return sessmodels.RegenerateAccessTokenResponse{}, err`
	`166`	`+ return nil, err`
`167`	`167`	`}`
`168`	`168`	`return (*instance.RecipeImpl.RegenerateAccessToken)(accessToken, newAccessTokenPayload, userContext)`
`169`	`169`	`}`
`@@ -176,7 +176,7 @@ func GetSession(req http.Request, res http.ResponseWriter, options sessmodels.`
`176`	`176`	`return GetSessionWithContext(req, res, options, &map[string]interface{}{})`
`177`	`177`	`}`
`178`	`178`
`179`		`-func GetSessionInformation(sessionHandle string) (sessmodels.SessionInformation, error) {`
	`179`	`+func GetSessionInformation(sessionHandle string) (*sessmodels.SessionInformation, error) {`
`180`	`180`	`return GetSessionInformationWithContext(sessionHandle, &map[string]interface{}{})`
`181`	`181`	`}`
`182`	`182`
`@@ -200,11 +200,11 @@ func RevokeMultipleSessions(sessionHandles []string) ([]string, error) {`
`200`	`200`	`return RevokeMultipleSessionsWithContext(sessionHandles, &map[string]interface{}{})`
`201`	`201`	`}`
`202`	`202`
`203`		`-func UpdateSessionData(sessionHandle string, newSessionData map[string]interface{}) error {`
	`203`	`+func UpdateSessionData(sessionHandle string, newSessionData map[string]interface{}) (bool, error) {`
`204`	`204`	`return UpdateSessionDataWithContext(sessionHandle, newSessionData, &map[string]interface{}{})`
`205`	`205`	`}`
`206`	`206`
`207`		`-func UpdateAccessTokenPayload(sessionHandle string, newAccessTokenPayload map[string]interface{}) error {`
	`207`	`+func UpdateAccessTokenPayload(sessionHandle string, newAccessTokenPayload map[string]interface{}) (bool, error) {`
`208`	`208`	`return UpdateAccessTokenPayloadWithContext(sessionHandle, newAccessTokenPayload, &map[string]interface{}{})`
`209`	`209`	`}`
`210`	`210`
`@@ -220,6 +220,6 @@ func GetOpenIdDiscoveryConfiguration() (openidmodels.GetOpenIdDiscoveryConfigura`
`220`	`220`	`return GetOpenIdDiscoveryConfigurationWithContext(&map[string]interface{}{})`
`221`	`221`	`}`
`222`	`222`
`223`		`-func RegenerateAccessToken(accessToken string, newAccessTokenPayload *map[string]interface{}, sessionHandle string) (sessmodels.RegenerateAccessTokenResponse, error) {`
	`223`	`+func RegenerateAccessToken(accessToken string, newAccessTokenPayload map[string]interface{}, sessionHandle string) (sessmodels.RegenerateAccessTokenResponse, error) {`
`224`	`224`	`return RegenerateAccessTokenWithContext(accessToken, newAccessTokenPayload, sessionHandle, &map[string]interface{}{})`
`225`	`225`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ func makeRecipeImplementation(querier supertokens.Querier, config sessmodels.Typ`
`111`	`111`	`return &sessionContainer, nil`
`112`	`112`	`}`
`113`	`113`
`114`		`- getSessionInformation := func(sessionHandle string, userContext supertokens.UserContext) (sessmodels.SessionInformation, error) {`
	`114`	`+ getSessionInformation := func(sessionHandle string, userContext supertokens.UserContext) (*sessmodels.SessionInformation, error) {`
`115`	`115`	`return getSessionInformationHelper(querier, sessionHandle)`
`116`	`116`	`}`
`117`	`117`
`@@ -165,11 +165,11 @@ func makeRecipeImplementation(querier supertokens.Querier, config sessmodels.Typ`
`165`	`165`	`return revokeMultipleSessionsHelper(querier, sessionHandles)`
`166`	`166`	`}`
`167`	`167`
`168`		`- updateSessionData := func(sessionHandle string, newSessionData map[string]interface{}, userContext supertokens.UserContext) error {`
	`168`	`+ updateSessionData := func(sessionHandle string, newSessionData map[string]interface{}, userContext supertokens.UserContext) (bool, error) {`
`169`	`169`	`return updateSessionDataHelper(querier, sessionHandle, newSessionData)`
`170`	`170`	`}`
`171`	`171`
`172`		`- updateAccessTokenPayload := func(sessionHandle string, newAccessTokenPayload map[string]interface{}, userContext supertokens.UserContext) error {`
	`172`	`+ updateAccessTokenPayload := func(sessionHandle string, newAccessTokenPayload map[string]interface{}, userContext supertokens.UserContext) (bool, error) {`
`173`	`173`	`return updateAccessTokenPayloadHelper(querier, sessionHandle, newAccessTokenPayload)`
`174`	`174`	`}`
`175`	`175`
`@@ -189,7 +189,7 @@ func makeRecipeImplementation(querier supertokens.Querier, config sessmodels.Typ`
`189`	`189`	`return recipeImplHandshakeInfo.RefreshTokenValidity, nil`
`190`	`190`	`}`
`191`	`191`
`192`		`- regenerateAccessToken := func(accessToken string, newAccessTokenPayload *map[string]interface{}, userContext supertokens.UserContext) (sessmodels.RegenerateAccessTokenResponse, error) {`
	`192`	`+ regenerateAccessToken := func(accessToken string, newAccessTokenPayload map[string]interface{}, userContext supertokens.UserContext) (sessmodels.RegenerateAccessTokenResponse, error) {`
`193`	`193`	`return regenerateAccessTokenHelper(querier, newAccessTokenPayload, accessToken)`
`194`	`194`	`}`
`195`	`195`
Original file line number	Diff line number	Diff line change
`@@ -182,16 +182,16 @@ func getSessionHelper(recipeImplHandshakeInfo *sessmodels.HandshakeInfo, config`
`182`	`182`	`}`
`183`	`183`	`}`
`184`	`184`
`185`		`-func getSessionInformationHelper(querier supertokens.Querier, sessionHandle string) (sessmodels.SessionInformation, error) {`
	`185`	`+func getSessionInformationHelper(querier supertokens.Querier, sessionHandle string) (*sessmodels.SessionInformation, error) {`
`186`	`186`	`response, err := querier.SendGetRequest("/recipe/session",`
`187`	`187`	`map[string]string{`
`188`	`188`	`"sessionHandle": sessionHandle,`
`189`	`189`	`})`
`190`	`190`	`if err != nil {`
`191`		`- return sessmodels.SessionInformation{}, err`
	`191`	`+ return nil, err`
`192`	`192`	`}`
`193`	`193`	`if response["status"] == "OK" {`
`194`		`- return sessmodels.SessionInformation{`
	`194`	`+ return &sessmodels.SessionInformation{`
`195`	`195`	`SessionHandle: response["sessionHandle"].(string),`
`196`	`196`	`UserId: response["userId"].(string),`
`197`	`197`	`SessionData: response["userDataInDatabase"].(map[string]interface{}),`
`@@ -200,7 +200,7 @@ func getSessionInformationHelper(querier supertokens.Querier, sessionHandle stri`
`200`	`200`	`AccessTokenPayload: response["userDataInJWT"].(map[string]interface{}),`
`201`	`201`	`}, nil`
`202`	`202`	`}`
`203`		`- return sessmodels.SessionInformation{}, errors.UnauthorizedError{Msg: response["message"].(string)}`
	`203`	`+ return nil, nil`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`func refreshSessionHelper(recipeImplHandshakeInfo sessmodels.HandshakeInfo, config sessmodels.TypeNormalisedInput, querier supertokens.Querier, refreshToken string, antiCsrfToken string, containsCustomHeader bool) (sessmodels.CreateOrRefreshAPIResponse, error) {`
`@@ -328,7 +328,7 @@ func revokeMultipleSessionsHelper(querier supertokens.Querier, sessionHandles []`
`328`	`328`	`return result, nil`
`329`	`329`	`}`
`330`	`330`
`331`		`-func updateSessionDataHelper(querier supertokens.Querier, sessionHandle string, newSessionData map[string]interface{}) error {`
	`331`	`+func updateSessionDataHelper(querier supertokens.Querier, sessionHandle string, newSessionData map[string]interface{}) (bool, error) {`
`332`	`332`	`if newSessionData == nil {`
`333`	`333`	`newSessionData = map[string]interface{}{}`
`334`	`334`	`}`
`@@ -338,15 +338,15 @@ func updateSessionDataHelper(querier supertokens.Querier, sessionHandle string,`
`338`	`338`	`"userDataInDatabase": newSessionData,`
`339`	`339`	`})`
`340`	`340`	`if err != nil {`
`341`		`- return err`
	`341`	`+ return false, err`
`342`	`342`	`}`
`343`	`343`	`if response["status"].(string) == errors.UnauthorizedErrorStr {`
`344`		`- return errors.UnauthorizedError{Msg: response["message"].(string)}`
	`344`	`+ return false, nil`
`345`	`345`	`}`
`346`		`- return nil`
	`346`	`+ return true, nil`
`347`	`347`	`}`
`348`	`348`
`349`		`-func updateAccessTokenPayloadHelper(querier supertokens.Querier, sessionHandle string, newAccessTokenPayload map[string]interface{}) error {`
	`349`	`+func updateAccessTokenPayloadHelper(querier supertokens.Querier, sessionHandle string, newAccessTokenPayload map[string]interface{}) (bool, error) {`
`350`	`350`	`if newAccessTokenPayload == nil {`
`351`	`351`	`newAccessTokenPayload = map[string]interface{}{}`
`352`	`352`	`}`
`@@ -355,15 +355,15 @@ func updateAccessTokenPayloadHelper(querier supertokens.Querier, sessionHandle s`
`355`	`355`	`"userDataInJWT": newAccessTokenPayload,`
`356`	`356`	`})`
`357`	`357`	`if err != nil {`
`358`		`- return err`
	`358`	`+ return false, err`
`359`	`359`	`}`
`360`	`360`	`if response["status"].(string) == errors.UnauthorizedErrorStr {`
`361`		`- return errors.UnauthorizedError{Msg: response["message"].(string)}`
	`361`	`+ return false, nil`
`362`	`362`	`}`
`363`		`- return nil`
	`363`	`+ return true, nil`
`364`	`364`	`}`
`365`	`365`
`366`		`-func regenerateAccessTokenHelper(querier supertokens.Querier, newAccessTokenPayload *map[string]interface{}, accessToken string) (sessmodels.RegenerateAccessTokenResponse, error) {`
	`366`	`+func regenerateAccessTokenHelper(querier supertokens.Querier, newAccessTokenPayload map[string]interface{}, accessToken string) (sessmodels.RegenerateAccessTokenResponse, error) {`
`367`	`367`	`if newAccessTokenPayload == nil {`
`368`	`368`	`newAccessTokenPayload = &map[string]interface{}{}`
`369`	`369`	`}`
`@@ -372,19 +372,19 @@ func regenerateAccessTokenHelper(querier supertokens.Querier, newAccessTokenPayl`
`372`	`372`	`"userDataInJWT": newAccessTokenPayload,`
`373`	`373`	`})`
`374`	`374`	`if err != nil {`
`375`		`- return sessmodels.RegenerateAccessTokenResponse{}, err`
	`375`	`+ return nil, err`
`376`	`376`	`}`
`377`	`377`	`if response["status"].(string) == errors.UnauthorizedErrorStr {`
`378`		`- return sessmodels.RegenerateAccessTokenResponse{}, errors.UnauthorizedError{Msg: response["message"].(string)}`
	`378`	`+ return nil, nil`
`379`	`379`	`}`
`380`	`380`	`responseByte, err := json.Marshal(response)`
`381`	`381`	`if err != nil {`
`382`		`- return sessmodels.RegenerateAccessTokenResponse{}, err`
	`382`	`+ return nil, err`
`383`	`383`	`}`
`384`	`384`	`var resp sessmodels.RegenerateAccessTokenResponse`
`385`	`385`	`err = json.Unmarshal(responseByte, &resp)`
`386`	`386`	`if err != nil {`
`387`		`- return sessmodels.RegenerateAccessTokenResponse{}, err`
	`387`	`+ return nil, err`
`388`	`388`	`}`
`389`		`- return resp, nil`
	`389`	`+ return &resp, nil`
`390`	`390`	`}`