Use feedbacks from code review

cozy · Dec 5, 2023 · 84dc60b · 84dc60b
1 parent ec9537d
commit 84dc60b
Show file tree

Hide file tree

Showing 7 changed files with 666 additions and 661 deletions.
diff --git a/assets/locales/de.po b/assets/locales/de.po
@@ -971,7 +971,7 @@ msgid "Install flagship app Skip"
 msgstr "Continue in the browser"
 
 msgid "Share by link Password Title"
-msgstr "Fill the password to access the link"
+msgstr "Enter the password to access the link"
 
 msgid "Share by link Password Field"
 msgstr "Password"

diff --git a/assets/locales/en.po b/assets/locales/en.po
@@ -1258,7 +1258,7 @@ msgid "Install flagship app Skip"
 msgstr "Continue in the browser"
 
 msgid "Share by link Password Title"
-msgstr "Fill the password to access the link"
+msgstr "Enter the password to access the link"
 
 msgid "Share by link Password Field"
 msgstr "Password"

diff --git a/assets/locales/es.po b/assets/locales/es.po
@@ -982,7 +982,7 @@ msgid "Install flagship app Skip"
 msgstr "Continue in the browser"
 
 msgid "Share by link Password Title"
-msgstr "Fill the password to access the link"
+msgstr "Enter the password to access the link"
 
 msgid "Share by link Password Field"
 msgstr "Password"

diff --git a/assets/locales/ja.po b/assets/locales/ja.po
@@ -786,7 +786,7 @@ msgid "Install flagship app Skip"
 msgstr "Continue in the browser"
 
 msgid "Share by link Password Title"
-msgstr "Fill the password to access the link"
+msgstr "Enter the password to access the link"
 
 msgid "Share by link Password Field"
 msgstr "Password"

diff --git a/assets/locales/nl_NL.po b/assets/locales/nl_NL.po
@@ -1167,7 +1167,7 @@ msgid "Install flagship app Skip"
 msgstr "Continue in the browser"
 
 msgid "Share by link Password Title"
-msgstr "Fill the password to access the link"
+msgstr "Enter the password to access the link"
 
 msgid "Share by link Password Field"
 msgstr "Password"

diff --git a/web/auth/share_by_link.go b/web/auth/share_by_link.go
@@ -2,11 +2,13 @@ package auth
 
 import (
 	"encoding/base64"
+	"errors"
 	"net/http"
 
 	"github.com/cozy/cozy-stack/model/permission"
 	"github.com/cozy/cozy-stack/model/session"
 	build "github.com/cozy/cozy-stack/pkg/config"
+	"github.com/cozy/cozy-stack/pkg/couchdb"
 	"github.com/cozy/cozy-stack/pkg/crypto"
 	"github.com/cozy/cozy-stack/web/middlewares"
 	"github.com/labstack/echo/v4"
@@ -25,6 +27,9 @@ func checkPasswordForShareByLink(c echo.Context) error {
 	permID := c.FormValue("perm_id")
 	perm, err := permission.GetByID(inst, permID)
 	if err != nil {
+		if couchdb.IsNotFoundError(err) || errors.Is(err, permission.ErrExpiredToken) {
+			return c.JSON(http.StatusNotFound, echo.Map{"error": err.Error()})
+		}
 		return c.JSON(http.StatusInternalServerError, echo.Map{"error": err.Error()})
 	}
 

diff --git a/web/statik/statik.go b/web/statik/statik.go