From 43d91f84f63de18da50847d6368a2b695b709586 Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Fri, 28 Mar 2025 10:49:31 +0300 Subject: [PATCH 1/4] use a different key for the suggested aliases --- handlers/application/menuhandler.go | 8 ++++---- store/db/db.go | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/handlers/application/menuhandler.go b/handlers/application/menuhandler.go index 5cbea34..1c0c044 100644 --- a/handlers/application/menuhandler.go +++ b/handlers/application/menuhandler.go @@ -2530,7 +2530,7 @@ func (h *MenuHandlers) RequestCustomAlias(ctx context.Context, sym string, input alias := aliasResult.Alias //Store the returned alias,wait for user to confirm it as new account alias - err = store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(alias)) + err = store.WriteEntry(ctx, sessionId, storedb.DATA_SUGGESTED_ALIAS, []byte(alias)) if err != nil { logg.ErrorCtxf(ctx, "failed to write account alias", "key", storedb.DATA_TEMPORARY_VALUE, "value", alias, "error", err) return res, err @@ -2559,7 +2559,7 @@ func (h *MenuHandlers) GetSuggestedAlias(ctx context.Context, sym string, input if !ok { return res, fmt.Errorf("missing session") } - suggestedAlias, err := store.ReadEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE) + suggestedAlias, err := store.ReadEntry(ctx, sessionId, storedb.DATA_SUGGESTED_ALIAS) if err != nil { return res, nil } @@ -2567,7 +2567,7 @@ func (h *MenuHandlers) GetSuggestedAlias(ctx context.Context, sym string, input return res, nil } -// ConfirmNewAlias reads the suggested alias from the temporary value and confirms it as the new account alias. +// ConfirmNewAlias reads the suggested alias from the [DATA_SUGGECTED_ALIAS] key and confirms it as the new account alias. func (h *MenuHandlers) ConfirmNewAlias(ctx context.Context, sym string, input []byte) (resource.Result, error) { var res resource.Result store := h.userdataStore @@ -2578,7 +2578,7 @@ func (h *MenuHandlers) ConfirmNewAlias(ctx context.Context, sym string, input [] if !ok { return res, fmt.Errorf("missing session") } - newAlias, err := store.ReadEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE) + newAlias, err := store.ReadEntry(ctx, sessionId, storedb.DATA_SUGGESTED_ALIAS) if err != nil { return res, nil } diff --git a/store/db/db.go b/store/db/db.go index 73c9c5d..220ac56 100644 --- a/store/db/db.go +++ b/store/db/db.go @@ -63,6 +63,8 @@ const ( DATA_INITIAL_LANGUAGE_CODE //Fully qualified account alias string DATA_ACCOUNT_ALIAS + //currently suggested alias by the api awaiting user's confirmation as accepted account alias + DATA_SUGGESTED_ALIAS ) const ( From 18acb53eade2b93b4888f808b9cde7ca3b204df5 Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Fri, 28 Mar 2025 11:08:50 +0300 Subject: [PATCH 2/4] add alias logs --- handlers/application/menuhandler.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/handlers/application/menuhandler.go b/handlers/application/menuhandler.go index 1c0c044..efb61ca 100644 --- a/handlers/application/menuhandler.go +++ b/handlers/application/menuhandler.go @@ -2509,6 +2509,7 @@ func (h *MenuHandlers) RequestCustomAlias(ctx context.Context, sym string, input } return res, err } + logg.InfoCtxf(ctx, "Read alias hint from temporary value", "hint", string(aliasHint)) //Ensures that the call doesn't happen twice for the same alias hint if !bytes.Equal(aliasHint, input) { err = store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(string(input))) @@ -2522,12 +2523,14 @@ func (h *MenuHandlers) RequestCustomAlias(ctx context.Context, sym string, input } } sanitizedInput := sanitizeAliasHint(string(input)) + logg.InfoCtxf(ctx, "sanitized alias hint", "sanitizedhint", sanitizedInput) aliasResult, err := h.accountService.RequestAlias(ctx, string(pubKey), sanitizedInput) if err != nil { logg.ErrorCtxf(ctx, "failed to retrieve alias", "alias", string(aliasHint), "error_alias_request", err) return res, fmt.Errorf("Failed to retrieve alias: %s", err.Error()) } alias := aliasResult.Alias + logg.InfoCtxf(ctx, "Suggested alias ", "alias", alias) //Store the returned alias,wait for user to confirm it as new account alias err = store.WriteEntry(ctx, sessionId, storedb.DATA_SUGGESTED_ALIAS, []byte(alias)) @@ -2582,6 +2585,7 @@ func (h *MenuHandlers) ConfirmNewAlias(ctx context.Context, sym string, input [] if err != nil { return res, nil } + logg.InfoCtxf(ctx, "Confirming new alias", "alias", string(newAlias)) err = store.WriteEntry(ctx, sessionId, storedb.DATA_ACCOUNT_ALIAS, []byte(string(newAlias))) if err != nil { logg.ErrorCtxf(ctx, "failed to clear DATA_ACCOUNT_ALIAS_VALUE entry with", "key", storedb.DATA_ACCOUNT_ALIAS, "value", "empty", "error", err) From 39c0d3199541f0faad526777dbd8644b969cdc35 Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Fri, 28 Mar 2025 11:26:32 +0300 Subject: [PATCH 3/4] remove verbose logs --- handlers/application/menuhandler.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/handlers/application/menuhandler.go b/handlers/application/menuhandler.go index efb61ca..13d1315 100644 --- a/handlers/application/menuhandler.go +++ b/handlers/application/menuhandler.go @@ -2509,7 +2509,6 @@ func (h *MenuHandlers) RequestCustomAlias(ctx context.Context, sym string, input } return res, err } - logg.InfoCtxf(ctx, "Read alias hint from temporary value", "hint", string(aliasHint)) //Ensures that the call doesn't happen twice for the same alias hint if !bytes.Equal(aliasHint, input) { err = store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(string(input))) @@ -2523,7 +2522,6 @@ func (h *MenuHandlers) RequestCustomAlias(ctx context.Context, sym string, input } } sanitizedInput := sanitizeAliasHint(string(input)) - logg.InfoCtxf(ctx, "sanitized alias hint", "sanitizedhint", sanitizedInput) aliasResult, err := h.accountService.RequestAlias(ctx, string(pubKey), sanitizedInput) if err != nil { logg.ErrorCtxf(ctx, "failed to retrieve alias", "alias", string(aliasHint), "error_alias_request", err) From 272a7ac05fdb0e73bbc3df901cb8114ff031cbcf Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Fri, 28 Mar 2025 11:32:24 +0300 Subject: [PATCH 4/4] chore: remove extra colon --- services/registration/my_account_alias | 2 +- services/registration/my_account_alias_swa | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/registration/my_account_alias b/services/registration/my_account_alias index 726f06b..4ab2e04 100644 --- a/services/registration/my_account_alias +++ b/services/registration/my_account_alias @@ -1,2 +1,2 @@ Current alias: {{.get_current_profile_info}} -Enter your preferred alias:: \ No newline at end of file +Enter your preferred alias: \ No newline at end of file diff --git a/services/registration/my_account_alias_swa b/services/registration/my_account_alias_swa index 0ea3166..3bd52a3 100644 --- a/services/registration/my_account_alias_swa +++ b/services/registration/my_account_alias_swa @@ -1,2 +1,2 @@ Lakabu ya sasa: {{.get_current_profile_info}} -Weka lakabu unalopendelea:: \ No newline at end of file +Weka lakabu unalopendelea: \ No newline at end of file