feat(serverHandler/responseData): add field LoginAvail

Author: marjune163

src/i18n/translation.go

@@ -1,6 +1,7 @@
 package i18n
 
 type Translation struct {
+	LoginLabel string
 	MkdirLabel string
 
 	UploadFilesLabel       string
@@ -38,6 +39,7 @@ type Translation struct {
 }
 
 var translationEnUs = Translation{
+	LoginLabel: "Login",
 	MkdirLabel: "Create dir",
 
 	UploadFilesLabel:       "Files",
@@ -75,6 +77,7 @@ var translationEnUs = Translation{
 }
 
 var translationZhSimp = Translation{
+	LoginLabel: "登录",
 	MkdirLabel: "建目录",
 
 	UploadFilesLabel:       "文件",
@@ -112,6 +115,7 @@ var translationZhSimp = Translation{
 }
 
 var translationZhTrad = Translation{
+	LoginLabel: "登入",
 	MkdirLabel: "建目錄",
 
 	UploadFilesLabel:       "檔案",

src/serverHandler/auth.go

@@ -9,20 +9,23 @@ func (h *aliasHandler) needAuth(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("WWW-Authenticate", "Basic realm=\"files\"")
 }
 
-func (h *aliasHandler) verifyAuth(r *http.Request) (username string, success bool, err error) {
-	var password string
-	var hasAuthReq bool
-	username, password, hasAuthReq = r.BasicAuth()
+func (h *aliasHandler) verifyAuth(r *http.Request, needAuth bool) (username string, success bool, err error) {
+	user, pass, hasAuthReq := r.BasicAuth()
 
-	if !hasAuthReq {
-		err = errors.New(r.RemoteAddr + " missing auth info")
-		return
+	if hasAuthReq && h.users.Auth(user, pass) {
+		return user, true, nil
+	}
+
+	if !needAuth {
+		return "", true, nil
 	}
 
-	success = h.users.Auth(username, password)
-	if !success {
+	if !hasAuthReq {
+		err = errors.New(r.RemoteAddr + " missing auth info")
+	} else {
 		err = errors.New(r.RemoteAddr + " auth failed")
 	}
+
 	return
 }
 

src/serverHandler/responseData.go

@@ -53,6 +53,7 @@ type responseData struct {
 	HasDeletable bool
 	CanArchive   bool
 	CanCors      bool
+	LoginAvail   bool
 
 	errors []error
 	Status int
@@ -307,11 +308,8 @@ func (h *aliasHandler) getResponseData(r *http.Request) (data *responseData, fsP
 	status := http.StatusOK
 
 	needAuth := h.getNeedAuth(rawReqPath, reqFsPath)
-	authUserName := ""
-	authSuccess := true
+	authUserName, authSuccess, _authErr := h.verifyAuth(r, needAuth)
 	if needAuth {
-		var _authErr error
-		authUserName, authSuccess, _authErr = h.verifyAuth(r)
 		if _authErr != nil {
 			errs = append(errs, _authErr)
 		}
@@ -419,6 +417,7 @@ func (h *aliasHandler) getResponseData(r *http.Request) (data *responseData, fsP
 	hasDeletable := canDelete && len(subItems) > len(aliasSubItems)
 	canArchive := h.getCanArchive(subItems, rawReqPath, reqFsPath)
 	canCors := h.getCanCors(rawReqPath, reqFsPath)
+	loginAvail := len(authUserName) == 0 && h.users.Len() > 0
 
 	context := pathContext{
 		download:     isDownload,
@@ -455,6 +454,7 @@ func (h *aliasHandler) getResponseData(r *http.Request) (data *responseData, fsP
 		HasDeletable: hasDeletable,
 		CanArchive:   canArchive,
 		CanCors:      canCors,
+		LoginAvail:   loginAvail,
 
 		errors: errs,
 		Status: status,

src/user/list.go

@@ -10,6 +10,10 @@ type List struct {
 	namesEqualFunc util.StrEqualFunc
 }
 
+func (list *List) Len() int {
+	return len(list.users)
+}
+
 func (list *List) findIndex(username string) int {
 	for i := range list.users {
 		if list.namesEqualFunc(list.users[i].getName(), username) {