Fixed tests

Forceu · Feb 3, 2025 · 862ca18 · 862ca18
1 parent a7a31c3
commit 862ca18
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/internal/models/ApiKey.go b/internal/models/ApiKey.go
@@ -1,6 +1,8 @@
 package models
 
-import "time"
+import (
+	"time"
+)
 
 const (
 	// ApiPermView is the permission for viewing metadata of all uploaded files
@@ -53,8 +55,7 @@ func (key *ApiKey) GetReadableDate() string {
 
 // GetRedactedId returns a redacted version of the API key
 func (key *ApiKey) GetRedactedId() string {
-	return key.Id[0:2] + "**************************" + key.Id[28:]
-
+	return key.Id[0:2] + "**************************" + key.Id[len(key.Id)-2:]
 }
 
 // GrantPermission sets one or more permissions

diff --git a/internal/test/testconfiguration/TestConfiguration.go b/internal/test/testconfiguration/TestConfiguration.go
@@ -256,36 +256,36 @@ func writeApiKeys() {
 		FriendlyName: "First Key",
 		Permissions:  models.ApiPermAll, // TODO
 		UserId:       5,
-		PublicId:     "Queime3iun",
+		PublicId:     "taiyeo6uLie6nu6eip0ieweiM5mahv",
 	})
 	database.SaveApiKey(models.ApiKey{
 		Id:           "validkeyid7",
 		FriendlyName: "Key for uid 7",
 		Permissions:  models.ApiPermAll, // TODO
 		UserId:       7,
-		PublicId:     "Queime3iun7",
+		PublicId:     "vu0eemi8eehaisuth3pahDai2eo6ze",
 	})
 	database.SaveApiKey(models.ApiKey{
 		Id:           "GAh1IhXDvYnqfYLazWBqMB9HSFmNPO",
 		FriendlyName: "Second Key",
 		LastUsed:     1620671580,
 		Permissions:  models.ApiPermAll, // TODO
 		UserId:       5,
-		PublicId:     "Xoox8chaiX",
+		PublicId:     "yaeVohng1ohNohsh1vailizeil5ka5",
 	})
 	database.SaveApiKey(models.ApiKey{
 		Id:           "jiREglQJW0bOqJakfjdVfe8T1EM8n8",
 		FriendlyName: "Unnamed Key",
 		Permissions:  models.ApiPermAll, // TODO
 		UserId:       5,
-		PublicId:     "giD8peitoo",
+		PublicId:     "ahYie4ophoo5OoGhahCe1neic6thah",
 	})
 	database.SaveApiKey(models.ApiKey{
 		Id:           "okeCMWqhVMZSpt5c1qpCWhKvJJPifb",
 		FriendlyName: "Unnamed Key",
 		Permissions:  models.ApiPermAll, // TODO
 		UserId:       5,
-		PublicId:     "gahNg6geaf",
+		PublicId:     "ugoo0roowoanahthei7ohSail5OChu",
 	})
 }
 

diff --git a/internal/webserver/Webserver_test.go b/internal/webserver/Webserver_test.go
@@ -507,6 +507,7 @@ func TestPostUpload(t *testing.T) {
 				{"filename", "fileupload.jpg"},
 				{"filecontenttype", "test-content"},
 				{"filesize", "50"},
+				{"nonblocking", "true"},
 			},
 			RequiredContent: []string{"{\"result\":\"OK\"}"},
 			Cookies: []test.Cookie{{