fix: Backwards compability on return types for liman

Author: dogukanoksuz

app/handlers/extension.go

@@ -75,10 +75,10 @@ func ExtensionRunner(c *fiber.Ctx) error {
 
 	output := linux.Execute(command)
 
-	if helpers.LimanJSON(output) {
+	if helpers.IsJSON(output) {
 		type LimanMessage struct {
-			Message string `json:"message"`
-			Status  int    `json:"status"`
+			Message any `json:"message"`
+			Status  int `json:"status"`
 		}
 		msg := &LimanMessage{}
 
@@ -87,9 +87,15 @@ func ExtensionRunner(c *fiber.Ctx) error {
 			return c.Type("json").SendString(output)
 		}
 
-		if msg != nil && msg.Status > 200 {
+		if msg != nil && msg.Status > 399 {
 			return c.Status(201).Type("json").SendString(output)
 		}
+
+		if msg != nil {
+			return c.Status(msg.Status).Type("json").SendString(output)
+		}
+
+		return c.Type("json").SendString(output)
 	}
 
 	return c.SendString(output)

app/handlers/external.go

@@ -78,10 +78,10 @@ func ExternalAPI(c *fiber.Ctx) error {
 	}
 
 	output := linux.Execute(command)
-	if helpers.LimanJSON(output) {
+	if helpers.IsJSON(output) {
 		type LimanMessage struct {
-			Message string `json:"message"`
-			Status  int    `json:"status"`
+			Message any `json:"message"`
+			Status  int `json:"status"`
 		}
 		msg := &LimanMessage{}
 
@@ -90,9 +90,15 @@ func ExternalAPI(c *fiber.Ctx) error {
 			return c.Type("json").SendString(output)
 		}
 
-		if msg != nil && msg.Status > 200 {
+		if msg != nil && msg.Status > 399 {
 			return c.Status(201).Type("json").SendString(output)
 		}
+
+		if msg != nil {
+			return c.Status(msg.Status).Type("json").SendString(output)
+		}
+
+		return c.Type("json").SendString(output)
 	}
 
 	return c.SendString(output)

app/middleware/app_logger/new.go

@@ -1,6 +1,8 @@
 package app_logger
 
 import (
+	"strings"
+
 	"github.com/gofiber/fiber/v2"
 	"github.com/google/uuid"
 	"github.com/limanmys/render-engine/pkg/helpers"
@@ -40,6 +42,12 @@ func New() fiber.Handler {
 
 		formData := helpers.GetFormData(c)
 
+		for k := range formData {
+			if strings.Contains(strings.ToLower(k), "password") || strings.Contains(strings.ToLower(k), "token") {
+				formData[k] = ""
+			}
+		}
+
 		user_id := ""
 		if c.Locals("user_id") != nil {
 			user_id = c.Locals("user_id").(string)

internal/server/error_handler.go

@@ -1,6 +1,8 @@
 package server
 
 import (
+	"strings"
+
 	"github.com/gofiber/fiber/v2"
 	"github.com/limanmys/render-engine/pkg/helpers"
 	"github.com/limanmys/render-engine/pkg/logger"
@@ -23,6 +25,12 @@ var ErrorHandler = func(c *fiber.Ctx, err error) error {
 		if code >= fiber.StatusInternalServerError {
 			request := helpers.GetFormData(c)
 
+			for k := range request {
+				if strings.Contains(strings.ToLower(k), "password") || strings.Contains(strings.ToLower(k), "token") {
+					request[k] = ""
+				}
+			}
+
 			logger.Sugar().WithOptions(zap.WithCaller(false)).Errorw(
 				"recover middleware catch",
 				"status", code,

pkg/helpers/form.go

@@ -2,7 +2,6 @@ package helpers
 
 import (
 	"net/url"
-	"strings"
 
 	"github.com/gofiber/fiber/v2"
 )
@@ -22,10 +21,6 @@ func GetFormData(c *fiber.Ctx) map[string]string {
 			continue
 		}
 
-		if strings.Contains(strings.ToLower(key), "password") || strings.Contains(strings.ToLower(key), "token") {
-			continue
-		}
-
 		if len(value) > 0 {
 			formValues[key] = value[0]
 		}
@@ -42,10 +37,6 @@ func BodyParser(body []byte) map[string]string {
 
 	obj := map[string]string{}
 	for k, v := range values {
-		if strings.Contains(strings.ToLower(k), "password") || strings.Contains(strings.ToLower(k), "token") {
-			continue
-		}
-
 		if len(v) > 0 {
 			obj[k] = v[0]
 		}