WIP: Implementing guest upload / file requests

build/go-generate/minifyStaticContent.go

@@ -72,16 +72,10 @@ func getPaths() []converter {
 		Name:       "wasm_exec JS",
 	})
 	result = append(result, converter{
-		InputPath:  pathPrefix + "js/dateformat.js",
-		OutputPath: pathPrefix + "js/min/dateformat.min.js",
+		InputPath:  pathPrefix + "js/all_public.js",
+		OutputPath: pathPrefix + "js/min/all_public.min.js",
 		Type:       "text/javascript",
-		Name:       "Dateformat JS",
-	})
-	result = append(result, converter{
-		InputPath:  pathPrefix + "js/uuid.js",
-		OutputPath: pathPrefix + "js/min/uuid.min.js",
-		Type:       "text/javascript",
-		Name:       "UUID JS",
+		Name:       "Public functions JS",
 	})
 	return result
 }

build/go-generate/updateApiRouting.go

@@ -81,14 +81,28 @@ func hasRequiredTag(tags []string) bool {
 	return false
 }
 
-func headerExists(headerName string, required, isString bool) string {
+func hasBase64Tag(tags []string) bool {
+	// Check if the tag contains "supportBase64:true"
+	for _, tag := range tags {
+		if strings.HasPrefix(tag, "supportBase64") {
+			return true
+		}
+	}
+	return false
+}
+
+func headerExists(headerName string, required, isString, base64Support bool) string {
+	base64SupportEntry := ""
+	if base64Support {
+		base64SupportEntry = ", has base64support"
+	}
 	return fmt.Sprintf("\n"+`
-							// RequestParser header value %s, required: %v
+							// RequestParser header value %s, required: %v%s
 							exists, err = checkHeaderExists(r, %s, %v, %v)
 							if err != nil {
 								return err
 							}
-							p.foundHeaders[%s] = exists`, headerName, required, headerName, required, isString, headerName)
+							p.foundHeaders[%s] = exists`, headerName, required, base64SupportEntry, headerName, required, isString, headerName)
 }
 
 func generateParseRequestMethod(typeName string, fields []*ast.Field) string {
@@ -122,25 +136,41 @@ func generateParseRequestMethod(typeName string, fields []*ast.Field) string {
 				// Check if the tag has the "header" key and extract its value
 				tagParts := strings.Split(tag, " ")
 				required := hasRequiredTag(tagParts)
+				base64Support := hasBase64Tag(tagParts)
 				for _, part := range tagParts {
 					if strings.HasPrefix(part, "header:") {
-						// Extract header name after 'header:'
+						// Extract the header name after 'header:'
 						headerName := strings.TrimPrefix(part, "header:")
 
 						fieldType := field.Type.(*ast.Ident).Name
 
-						// Use appropriate parsing function based on the field type
+						// Use the appropriate parsing function based on the field type
 						switch fieldType {
 						case "string":
-							method += headerExists(headerName, required, true)
-							method += fmt.Sprintf(`
-							if (exists) {
-								p.%s = r.Header.Get(%s)
+							method += headerExists(headerName, required, true, base64Support)
+							if !base64Support {
+								method += fmt.Sprintf(`
+									if (exists) {
+										p.%s = r.Header.Get(%s)
+									}
+									`, field.Names[0].Name, headerName)
+							} else {
+								method += fmt.Sprintf(`
+									if (exists) {
+										p.%s = r.Header.Get(%s)
+										if strings.HasPrefix(p.%s, "base64:") {
+											decoded, err := base64.StdEncoding.DecodeString(strings.TrimPrefix(p.%s, "base64:"))
+											if err != nil {
+												return err
+											}
+											p.%s = string(decoded)
+										}
+									}
+								`, field.Names[0].Name, headerName, field.Names[0].Name, field.Names[0].Name, field.Names[0].Name)
 							}
-							`, field.Names[0].Name, headerName)
 
 						case "bool":
-							method += headerExists(headerName, required, false)
+							method += headerExists(headerName, required, false, false)
 							method += fmt.Sprintf(`
 							if (exists) {
 								p.%s, err = parseHeaderBool(r, %s)
@@ -151,7 +181,7 @@ func generateParseRequestMethod(typeName string, fields []*ast.Field) string {
 							`, field.Names[0].Name, headerName, strings.Replace(headerName, "\"", "", -1))
 
 						case "int":
-							method += headerExists(headerName, required, false)
+							method += headerExists(headerName, required, false, false)
 							method += fmt.Sprintf(`
 							if (exists) {
 								p.%s, err = parseHeaderInt(r, %s)
@@ -162,7 +192,7 @@ func generateParseRequestMethod(typeName string, fields []*ast.Field) string {
 							`, field.Names[0].Name, headerName, strings.Replace(headerName, "\"", "", -1))
 
 						case "int64":
-							method += headerExists(headerName, required, false)
+							method += headerExists(headerName, required, false, false)
 							method += fmt.Sprintf(`
 							if (exists) {
 								p.%s, err = parseHeaderInt64(r, %s)
@@ -236,8 +266,10 @@ func main() {
 			package api
 
 			import (
+				"encoding/base64"
 				"fmt"
 				"net/http"
+				"strings"
 			)
 
 			// Do not modify: This is an automatically generated file created by updateApiRouting.go

build/go.mod

@@ -19,24 +19,30 @@ require (
 	golang.org/x/oauth2 v0.27.0
 	golang.org/x/sync v0.11.0
 	golang.org/x/term v0.37.0
+	golang.org/x/time v0.14.0
 	gopkg.in/yaml.v3 v3.0.1
 	modernc.org/sqlite v1.35.0
 )
 
 require (
 	github.com/alicebob/gopher-json v0.0.0-20230218143504-906a9b012302 // indirect
+	github.com/djherbis/atime v1.1.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/go-jose/go-jose/v4 v4.0.5 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/jmoiron/sqlx v1.4.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
 	github.com/ncruces/go-strftime v0.1.9 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 // indirect
-	github.com/tdewolff/minify/v2 v2.24.2 // indirect
-	github.com/tdewolff/parse/v2 v2.8.3 // indirect
+	github.com/tdewolff/argp v0.0.0-20250430135133-0f54527d2b1e // indirect
+	github.com/tdewolff/minify/v2 v2.24.8 // indirect
+	github.com/tdewolff/parse/v2 v2.8.5 // indirect
 	github.com/yuin/gopher-lua v1.1.1 // indirect
 	go.shabbyrobe.org/gocovmerge v0.0.0-20230507111327-fa4f82cfbf4d // indirect
 	golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa // indirect

build/go.sum

@@ -1,3 +1,4 @@
+filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9/go.mod h1:7uhhqiBaR4CpN0k9rMjOtjpcfGd6DG2m04zQxKnWQ0I=
 github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
 github.com/alicebob/gopher-json v0.0.0-20230218143504-906a9b012302/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
@@ -8,21 +9,28 @@ github.com/caarlos0/env/v6 v6.10.1/go.mod h1:hvp/ryKXKipEkcuYjs9mI4bBCg+UI0Yhgm5
 github.com/cevatbarisyilmaz/ara v0.0.4/go.mod h1:BfFOxnUd6Mj6xmcvRxHN3Sr21Z1T3U2MYkYOmoQe4Ts=
 github.com/coreos/go-oidc/v3 v3.12.0/go.mod h1:gE3LgjOgFoHi9a4ce4/tJczr0Ai2/BoDhf0r5lltWI0=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/djherbis/atime v1.1.0/go.mod h1:28OF6Y8s3NQWwacXc5eZTsEsiMzp7LF8MbXE+XJPdBE=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
+github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/go-jose/go-jose/v4 v4.0.5/go.mod h1:s3P1lRrkT8igV8D9OjyL4WRyHvjB6a4JSllnOrmmBOA=
+github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
 github.com/gomodule/redigo v1.9.2/go.mod h1:KsU3hiK/Ay8U42qpaJk+kuNa3C+spxapWpM+ywhcgtw=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
+github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
 github.com/johannesboyne/gofakes3 v0.0.0-20250106100439-5c39aecd6999/go.mod h1:t6osVdP++3g4v2awHz4+HFccij23BbdT1rX3W7IijqQ=
 github.com/juju/ratelimit v1.0.2/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
 github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
+github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
@@ -34,12 +42,15 @@ github.com/spf13/afero v1.2.1/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTd
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/tdewolff/argp v0.0.0-20250430135133-0f54527d2b1e/go.mod h1:xw2b1X81m4zY1OGytzHNr/YKXbf/STHkK5idoNamlYE=
 github.com/tdewolff/minify/v2 v2.23.11 h1:cZqTVCtuVvPC8/GbCvYgIcdAQGmoxEObZzKeKIUixTE=
 github.com/tdewolff/minify/v2 v2.23.11/go.mod h1:vmkbfGQ5hp/eYB+TswNWKma67S0a+32HBL+mFWxjZ2Q=
 github.com/tdewolff/minify/v2 v2.24.2/go.mod h1:1JrCtoZXaDbqioQZfk3Jdmr0GPJKiU7c1Apmb+7tCeE=
+github.com/tdewolff/minify/v2 v2.24.8/go.mod h1:0Ukj0CRpo/sW/nd8uZ4ccXaV1rEVIWA3dj8U7+Shhfw=
 github.com/tdewolff/parse/v2 v2.8.2-0.20250806174018-50048bb39781 h1:2qicgFovKg1XtX7Wf6GwexUdpb7q/jMIE2IgkYsVAvE=
 github.com/tdewolff/parse/v2 v2.8.2-0.20250806174018-50048bb39781/go.mod h1:Hwlni2tiVNKyzR1o6nUs4FOF07URA+JLBLd6dlIXYqo=
 github.com/tdewolff/parse/v2 v2.8.3/go.mod h1:Hwlni2tiVNKyzR1o6nUs4FOF07URA+JLBLd6dlIXYqo=
+github.com/tdewolff/parse/v2 v2.8.5/go.mod h1:Hwlni2tiVNKyzR1o6nUs4FOF07URA+JLBLd6dlIXYqo=
 github.com/tdewolff/test v1.0.11 h1:FdLbwQVHxqG16SlkGveC0JVyrJN62COWTRyUFzfbtBE=
 github.com/tdewolff/test v1.0.11/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
@@ -96,6 +107,7 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190829051458-42f498d34c4d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=

cmd/cli-uploader/Main.go

@@ -5,16 +5,17 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+
 	"github.com/forceu/gokapi/cmd/cli-uploader/cliapi"
 	"github.com/forceu/gokapi/cmd/cli-uploader/cliconfig"
 	"github.com/forceu/gokapi/cmd/cli-uploader/cliconstants"
 	"github.com/forceu/gokapi/cmd/cli-uploader/cliflags"
 	"github.com/forceu/gokapi/internal/environment"
 	"github.com/forceu/gokapi/internal/helper"
 	"github.com/schollz/progressbar/v3"
-	"io"
-	"os"
-	"path/filepath"
 )
 
 func main() {
@@ -25,9 +26,11 @@ func main() {
 	case cliflags.ModeLogout:
 		doLogout()
 	case cliflags.ModeUpload:
-		processUpload(false)
+		processUpload(cliflags.ModeUpload)
 	case cliflags.ModeArchive:
-		processUpload(true)
+		processUpload(cliflags.ModeArchive)
+	case cliflags.ModeDownload:
+		processDownload()
 	case cliflags.ModeInvalid:
 		os.Exit(3)
 	}
@@ -38,11 +41,11 @@ func doLogin() {
 	cliconfig.CreateLogin()
 }
 
-func processUpload(isArchive bool) {
+func processUpload(mode int) {
 	cliconfig.Load()
-	uploadParam := cliflags.GetUploadParameters(isArchive)
+	uploadParam := cliflags.GetUploadParameters(mode)
 
-	if isArchive {
+	if mode == cliflags.ModeArchive {
 		zipPath, err := zipFolder(uploadParam.Directory, uploadParam.TmpFolder, !uploadParam.JsonOutput)
 		if err != nil {
 			fmt.Println(err)
@@ -57,7 +60,7 @@ func processUpload(isArchive bool) {
 	if err != nil {
 		fmt.Println()
 		if errors.Is(cliapi.ErrUnauthorised, err) {
-			fmt.Println("ERROR: Unauthorised API key. Please re-run login.")
+			fmt.Println("ERROR: Unauthorised API key. Please re-run login or make sure that the API key has the permission to upload files.")
 		} else {
 			fmt.Println("ERROR: Could not upload file")
 			fmt.Println(err)
@@ -77,6 +80,24 @@ func processUpload(isArchive bool) {
 	fmt.Println("File Download URL: " + result.UrlDownload)
 }
 
+func processDownload() {
+	cliconfig.Load()
+	uploadParam := cliflags.GetUploadParameters(cliflags.ModeDownload)
+
+	// Perform the download
+	err := cliapi.DownloadFile(uploadParam)
+	if err != nil {
+		fmt.Println()
+		if errors.Is(cliapi.ErrUnauthorised, err) {
+			fmt.Println("ERROR: Unauthorised API key. Please re-run login or make sure that the API key has the permission to download files.")
+		} else {
+			fmt.Println("ERROR: Could not download file")
+			fmt.Println(err)
+		}
+		os.Exit(1)
+	}
+}
+
 func doLogout() {
 	err := cliconfig.Delete()
 	if err != nil {