From 6da050e3b9a151f53cbe20d7dbf62ab6ca7f527c Mon Sep 17 00:00:00 2001 From: jamesread Date: Fri, 23 Feb 2024 21:30:13 +0000 Subject: [PATCH] bugfix: Allow static IDs --- OliveTin.proto | 2 +- internal/grpcapi/grpcApiActions.go | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/OliveTin.proto b/OliveTin.proto index 89ed6d7..6ead647 100644 --- a/OliveTin.proto +++ b/OliveTin.proto @@ -251,7 +251,7 @@ service OliveTinApiService { rpc DumpPublicIdActionMap(DumpPublicIdActionMapRequest) returns (DumpPublicIdActionMapResponse) { option (google.api.http) = { - get: "/api/DumpPublicIdActionMap" + get: "/api/DumpPublicActionMap" }; } diff --git a/internal/grpcapi/grpcApiActions.go b/internal/grpcapi/grpcApiActions.go index 1514a2f..cde6fc9 100644 --- a/internal/grpcapi/grpcApiActions.go +++ b/internal/grpcapi/grpcApiActions.go @@ -118,10 +118,14 @@ func buildChoices(choices []config.ActionArgumentChoice) []*pb.ActionArgumentCho } func createPublicID(action *config.Action, entityPrefix string) string { - h := sha256.New() - h.Write([]byte(action.ID + "." + entityPrefix)) + if action.Entity == "" { + return action.ID + } else { + h := sha256.New() + h.Write([]byte(action.ID + "." + entityPrefix)) - return fmt.Sprintf("%x", h.Sum(nil)) + return fmt.Sprintf("%x", h.Sum(nil)) + } } func findActionByPublicID(id string) *config.Action {