refactor(client): extract storage key (#27)

logto-io · Aug 30, 2022 · b57b1c0 · b57b1c0
1 parent d66ff91
commit b57b1c0
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/client/client.go b/client/client.go
@@ -54,19 +54,19 @@ func (logtoClient *LogtoClient) IsAuthenticated() bool {
 }
 
 func (logtoClient *LogtoClient) GetRefreshToken() string {
-	return logtoClient.storage.GetItem("logto_refresh_token")
+	return logtoClient.storage.GetItem(StorageKeyRefreshToken)
 }
 
 func (logtoClient *LogtoClient) SetRefreshToken(refreshToken string) {
-	logtoClient.storage.SetItem("logto_refresh_token", refreshToken)
+	logtoClient.storage.SetItem(StorageKeyRefreshToken, refreshToken)
 }
 
 func (LogtoClient *LogtoClient) GetIdToken() string {
-	return LogtoClient.storage.GetItem("logto_id_token")
+	return LogtoClient.storage.GetItem(StorageKeyIdToken)
 }
 
 func (logtoClient *LogtoClient) SetIdToken(idToken string) {
-	logtoClient.storage.SetItem("logto_id_token", idToken)
+	logtoClient.storage.SetItem(StorageKeyIdToken, idToken)
 }
 
 func (logtoClient *LogtoClient) GetIdTokenClaims() (core.IdTokenClaims, error) {

diff --git a/client/constants.go b/client/constants.go
@@ -0,0 +1,8 @@
+package client
+
+const (
+	StorageKeySignInContext  = "logto_sign_in_context"
+	StorageKeyRefreshToken   = "logto_refresh_token"
+	StorageKeyIdToken        = "logto_id_token"
+	StorageKeyAccessTokenMap = "logto_access_token_map"
+)
diff --git a/client/handle_sign_in_callback.go b/client/handle_sign_in_callback.go
@@ -40,7 +40,7 @@ func (logtoClient *LogtoClient) HandleSignInCallback(request *http.Request) erro
 		return fetchTokenErr
 	}
 
-	logtoClient.storage.SetItem("logto_sign_in_context", "")
+	logtoClient.storage.SetItem(StorageKeySignInContext, "")
 
 	accessToken := AccessToken{
 		Token:     codeTokenResponse.AccessToken,

diff --git a/client/helper.go b/client/helper.go
@@ -36,7 +36,7 @@ func (logtoClient *LogtoClient) persistAccessTokenMap() {
 	if err != nil {
 		return
 	}
-	logtoClient.storage.SetItem("logto_access_token_map", string(accessTokenMapJsonString))
+	logtoClient.storage.SetItem(StorageKeyAccessTokenMap, string(accessTokenMapJsonString))
 }
 
 func (logtoClient *LogtoClient) createRemoteJwks(jwksUri string) (*jose.JSONWebKeySet, error) {

diff --git a/client/sign_in.go b/client/sign_in.go
@@ -51,7 +51,7 @@ func (logtoClient *LogtoClient) SignIn(redirectUri string) (string, error) {
 		return "", marshalErr
 	}
 
-	logtoClient.storage.SetItem("logto_sign_in_context", string(signInContextJsonValue))
+	logtoClient.storage.SetItem(StorageKeySignInContext, string(signInContextJsonValue))
 
 	return signInUri, nil
 }
diff --git a/client/sign_out.go b/client/sign_out.go
@@ -15,9 +15,9 @@ func (logtoClient *LogtoClient) SignOut(postLogoutRedirectUri string) (string, e
 	refreshToken := logtoClient.GetRefreshToken()
 
 	logtoClient.accessTokenMap = make(map[string]AccessToken)
-	logtoClient.storage.SetItem("logto_access_token_map", "")
-	logtoClient.storage.SetItem("logto_refresh_token", "")
-	logtoClient.storage.SetItem("logto_id_token", "")
+	logtoClient.storage.SetItem(StorageKeyAccessTokenMap, "")
+	logtoClient.storage.SetItem(StorageKeyRefreshToken, "")
+	logtoClient.storage.SetItem(StorageKeyIdToken, "")
 
 	oidcConfig, fetchOidcConfigErr := logtoClient.fetchOidcConfig()