Preprod to main for feature release v1.6.3 (#537)

Author: loleg

.circleci/config.yml

@@ -4,7 +4,7 @@ version: 2.1
 parameters:
   golang-tag:
     type: string
-    default: "1.21"
+    default: "1.22"
   nodejs-ver:
     type: integer
     default: 16

Makefile

@@ -1,6 +1,6 @@
 SHELL:= /bin/bash
 DEBUG_FLAG?=false
-GO_VERSION=1.21
+GO_VERSION=1.22
 
 ifeq ($(DEBUG), "true")
 	BINDATA_OPTS="-debug"
@@ -159,7 +159,8 @@ fmt:
 
 .PHONY: test
 test: generate
-	go test $(COVERAGE_OPTS)  ./main/... ./sys/... ./storage/... ./service/...
+	go test $(COVERAGE_OPTS)  ./main/... ./sys/... ./storage/... ./service/...; ret=$$?; \
+		echo $$ret
 
 .PHONY: test-integration
 test-integration:

demo/restore_db/i18n

@@ -1,6 +1,8 @@
 module github.com/ProxeusApp/proxeus-core
 
-go 1.20
+go 1.21
+
+toolchain go1.22.0
 
 require (
 	github.com/SparkPost/gosparkpost v0.2.0
@@ -30,8 +32,8 @@ require (
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	go.etcd.io/bbolt v1.3.8 // indirect
-	golang.org/x/crypto v0.21.0
-	golang.org/x/net v0.22.0
+	golang.org/x/crypto v0.22.0
+	golang.org/x/net v0.24.0
 	gopkg.in/gavv/httpexpect.v2 v2.16.0
 )
 
@@ -43,7 +45,7 @@ require (
 	github.com/gorilla/context v1.1.2 // indirect
 	github.com/gorilla/websocket v1.5.1 // indirect
 	github.com/klauspost/compress v1.17.3 // indirect
-	github.com/labstack/echo-contrib v0.15.0
+	github.com/labstack/echo-contrib v0.17.0
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/sergi/go-diff v1.3.1 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
@@ -59,7 +61,7 @@ require (
 
 require (
 	github.com/labstack/echo/v4 v4.11.4
-	go.mongodb.org/mongo-driver v1.14.0
+	go.mongodb.org/mongo-driver v1.15.0
 )
 
 require (
@@ -78,7 +80,7 @@ require (
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a // indirect
@@ -102,7 +104,7 @@ require (
 	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
 	golang.org/x/mod v0.14.0 // indirect
 	golang.org/x/sync v0.5.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/sys v0.19.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	golang.org/x/tools v0.16.1 // indirect

go.mod

@@ -54,7 +54,7 @@ func redirectToLogin(c echo.Context) error {
 	if isAjax {
 		return echo.ErrUnauthorized
 	}
-	return c.Redirect(http.StatusTemporaryRedirect, "/login")
+	return c.Redirect(http.StatusTemporaryRedirect, "/login?redirect="+req.URL.Path)
 }
 
 func getURI(host, url string) string {

go.sum

@@ -87,7 +87,7 @@ func (me *DefaultDocumentService) Edit(auth model.Auth, userId string, formInput
 	if !ok {
 		return ErrUnableToEdit
 	}
-	if len(fName) >= 80 || !filenameRegex.MatchString(fName) {
+	if len(fName) > 80 || !filenameRegex.MatchString(fName) {
 		return ErrUnableToEdit
 	}
 	usrDataItem, err := userDataDB().Get(auth, userId)

main/www/security.go

@@ -304,8 +304,9 @@ func (me *Engine) setupNodes(ctx *context) error {
 	if len(me.nodeImpls) == 0 {
 		return ErrNodeImplementationNotProvided
 	}
+
 	for _, item := range ctx.flow.Nodes {
-		item.internalNode = item.isCondition() || item.isWorkflow()
+		item.internalNode = item.isCondition() || item.isWorkflow() || item.isPlaceholder()
 		if !item.internalNode {
 			if s, ok := me.nodeImpls[item.Type]; ok && s.InitImplFunc != nil {
 				item.new = s.InitImplFunc
@@ -319,6 +320,62 @@ func (me *Engine) setupNodes(ctx *context) error {
 	return nil
 }
 
+func (me *Engine) removeUselessNodes(ctx *context) error {
+	uselessConnections := make(map[string]*Connection, 0)
+
+	for name, item := range ctx.flow.Nodes {
+		if !item.isPlaceholder() {
+			continue
+		}
+
+		for _, conn := range item.Connections {
+			correctConnection := conn
+			currentNode := ctx.flow.Nodes[correctConnection.NodeID]
+
+			for currentNode.isPlaceholder() {
+				if len(currentNode.Connections) > 0 {
+					correctConnection = currentNode.Connections[0]
+					currentNode = ctx.flow.Nodes[correctConnection.NodeID]
+				} else {
+					break
+				}
+			}
+
+			uselessConnections[name] = correctConnection
+		}
+	}
+
+	for _, item := range ctx.flow.Nodes {
+		if item.isPlaceholder() {
+			continue
+		}
+
+		for i := 0; i < len(item.Connections); i++ {
+			conn := item.Connections[i]
+
+			if val, ok := uselessConnections[conn.NodeID]; ok {
+				item.Connections[i] = val
+			}
+		}
+	}
+
+	if val, ok := uselessConnections[ctx.flow.Start.NodeID]; ok {
+		ctx.flow.Start.NodeID = val.NodeID
+	}
+
+	filteredNodes := make(map[string]*Node, 0)
+
+	for name, item := range ctx.flow.Nodes {
+		if !item.isPlaceholder() {
+			filteredNodes[name] = item
+		}
+	}
+
+	ctx.flow.Nodes = filteredNodes
+
+	return nil
+}
+
 func (me *Engine) execute(nn *Node, considerSteps bool) (proceed bool, err error) {
 	nn.focus()
 	if nn.internalNode {

service/document.go

@@ -71,6 +71,10 @@ func (n *Node) isWorkflow() bool {
 	return n.Type == "workflow"
 }
 
+func (n *Node) isPlaceholder() bool {
+	return n.Type == "placeholder"
+}
+
 func (me *Node) getImpl() (NodeIF, error) {
 	//instance is still valid for reuse
 	if me.impl != nil {

sys/workflow/engine.go

@@ -73,9 +73,11 @@ func newWorkflow(wf *Workflow, engine *Engine, parent *context) (*context, error
 	if wf == nil {
 		return nil, ErrWorkflowMissing
 	}
+
 	if wf.Flow == nil || wf.Flow.Start == nil || wf.Flow.Start.NodeID == "" {
 		return nil, ErrStartNodeMissing
 	}
+
 	me := context{
 		id:      "root",
 		flow:    wf.Flow,
@@ -84,11 +86,18 @@ func newWorkflow(wf *Workflow, engine *Engine, parent *context) (*context, error
 		engine:  engine,
 	}
 
-	err := engine.setupNodes(&me)
+	err := engine.removeUselessNodes(&me)
 	if err != nil {
 		return nil, err
 	}
+
+	err = engine.setupNodes(&me)
+	if err != nil {
+		return nil, err
+	}
+
 	me.start()
+
 	return &me, nil
 }
 
@@ -122,6 +131,8 @@ func (me *context) resolve(n *Node) error {
 					return err
 				}
 				return me.resolve(nn)
+			} else if n.isPlaceholder() {
+				return nil
 			} else if n.isWorkflow() {
 				return me.stepIntoWorkflow(n)
 			}