INTG-3224 fix api key validation (#113)

SafetyCulture · Feb 4, 2024 · 4c2c5f8 · 4c2c5f8
1 parent 1773490
commit 4c2c5f8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app.go b/app.go
@@ -175,12 +175,12 @@ func (a *App) ValidateApiKey(apiKey string) string {
 
 		if err != nil {
 			runtime.LogErrorf(a.ctx, "cannot check WhoAmI: %s", err.Error())
-			return err.Error()
+			return "cannot validate the credentials for the given ApiKey"
 		}
 
-		if res != nil && (res.UserID == "" || res.OrganisationID == "") {
-			runtime.LogErrorf(a.ctx, "cannot validate the credentials for the given ApiKey: %s", err.Error())
-			return err.Error()
+		if res == nil || (res != nil && res.UserID == "" || res.OrganisationID == "") {
+			runtime.LogErrorf(a.ctx, "cannot validate the credentials for the given ApiKey: %s", apiKey)
+			return "cannot validate the credentials for the given ApiKey"
 		}
 
 		runtime.LogInfo(a.ctx, "saving the key")

diff --git a/frontend/src/routes/Init.svelte b/frontend/src/routes/Init.svelte
@@ -26,7 +26,7 @@
             } else {
                 // check if it can auth
                 return ValidateApiKey(token).then(res => {
-                    if (res === false) {
+                    if (res !== "") {
                         return '/welcome'
                     } else {
                         return '/config'