Fix: Login ID not available in trigger functions via API handler

Boyquotes · Aug 9, 2024 · 62ebe85 · 62ebe85
1 parent d3f6dd4
commit 62ebe85
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/db/db.go b/db/db.go
@@ -7,6 +7,7 @@ import (
 	"net/url"
 	"r3/tools"
 	"r3/types"
+	"strconv"
 	"time"
 
 	pgxuuid "github.com/jackc/pgx-gofrs-uuid"
@@ -70,6 +71,13 @@ func Open(config types.FileTypeDb) error {
 	return Pool.Ping(context.Background())
 }
 
+// set transaction config parameters
+// these are used by system functions, such as instance.get_login_id()
+func SetSessionConfig_tx(ctx context.Context, tx pgx.Tx, loginId int64) error {
+	_, err := tx.Exec(ctx, `SELECT SET_CONFIG('r3.login_id',$1,TRUE)`, strconv.FormatInt(loginId, 10))
+	return err
+}
+
 func Close() {
 	Pool.Close()
 	Pool = nil

diff --git a/handler/api/api.go b/handler/api/api.go
@@ -71,8 +71,8 @@ func Handler(w http.ResponseWriter, r *http.Request) {
 
 	/*
 		Parse URL, such as:
-		GET /api/lsw_invoices/contracts/v1?limit=10
-		GET /api/lsw_invoices/contracts/v1/45
+		GET    /api/lsw_invoices/contracts/v1?limit=10
+		GET    /api/lsw_invoices/contracts/v1/45
 		DELETE /api/lsw_invoices/contracts/v1/45
 
 		Rules:
@@ -209,6 +209,11 @@ func Handler(w http.ResponseWriter, r *http.Request) {
 	}
 	defer tx.Rollback(ctx)
 
+	if err := db.SetSessionConfig_tx(ctx, tx, loginId); err != nil {
+		abort(http.StatusServiceUnavailable, err, handler.ErrGeneral)
+		return
+	}
+
 	if isDelete {
 		if recordId < 1 {
 			abort(http.StatusBadRequest, nil, "record ID must be > 0")

diff --git a/request/request.go b/request/request.go
@@ -12,7 +12,6 @@ import (
 	"r3/handler"
 	"r3/log"
 	"r3/types"
-	"strconv"
 	"time"
 
 	"github.com/jackc/pgx/v5"
@@ -52,8 +51,7 @@ func ExecTransaction(ctxClient context.Context, address string, loginId int64, i
 
 		// set local transaction configuration parameters
 		// these are used by system functions, such as instance.get_login_id()
-		if _, err := tx.Exec(ctx, `SELECT SET_CONFIG('r3.login_id',$1,TRUE)`, strconv.FormatInt(loginId, 10)); err != nil {
-
+		if err := db.SetSessionConfig_tx(ctx, tx, loginId); err != nil {
 			log.Error("websocket", fmt.Sprintf("TRANSACTION %d, transaction config failure (login ID %d)",
 				reqTrans.TransactionNr, loginId), err)