[incubator-devlake] branch main updated: fix: the apikey log level (#5832)

[ab...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

abeizn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git


The following commit(s) were added to refs/heads/main by this push:
     new 47683f2bb fix: the apikey log level (#5832)
47683f2bb is described below

commit 47683f2bbda14e3e288d648ac3914d3d204185c7
Author: abeizn <zi...@merico.dev>
AuthorDate: Tue Aug 8 19:32:42 2023 +0800

    fix: the apikey log level (#5832)
---
 backend/server/api/middlewares.go | 18 ++++++++++--------
 backend/server/api/router.go      |  7 ++++---
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/backend/server/api/middlewares.go b/backend/server/api/middlewares.go
index 554fd8c42..b283fb727 100644
--- a/backend/server/api/middlewares.go
+++ b/backend/server/api/middlewares.go
@@ -20,16 +20,17 @@ package api
 import (
 	"encoding/base64"
 	"fmt"
+	"net/http"
+	"regexp"
+	"strings"
+	"time"
+
 	"github.com/apache/incubator-devlake/core/context"
 	"github.com/apache/incubator-devlake/core/dal"
 	"github.com/apache/incubator-devlake/core/errors"
 	"github.com/apache/incubator-devlake/core/models/common"
 	"github.com/apache/incubator-devlake/helpers/apikeyhelper"
 	"github.com/gin-gonic/gin"
-	"net/http"
-	"regexp"
-	"strings"
-	"time"
 )
 
 func getOAuthUserInfo(c *gin.Context) (*common.User, error) {
@@ -44,13 +45,14 @@ func getOAuthUserInfo(c *gin.Context) (*common.User, error) {
 	}, nil
 }
 
-func getBasicAuthUserInfo(c *gin.Context) (*common.User, error) {
+func getBasicAuthUserInfo(c *gin.Context, basicRes context.BasicRes) (*common.User, error) {
 	if c == nil {
 		return nil, errors.Default.New("request is nil")
 	}
 	authHeader := c.GetHeader("Authorization")
 	if authHeader == "" {
-		return nil, errors.Default.New("Authorization is empty")
+		basicRes.GetLogger().Debug("Authorization is empty")
+		return nil, nil
 	}
 	basicAuth := strings.TrimPrefix(authHeader, "Basic ")
 	if basicAuth == authHeader || basicAuth == "" {
@@ -80,9 +82,9 @@ func OAuth2ProxyAuthentication(basicRes context.BasicRes) gin.HandlerFunc {
 			}
 			if user == nil || user.Name == "" {
 				// fetch with basic auth header
-				user, err = getBasicAuthUserInfo(c)
+				user, err = getBasicAuthUserInfo(c, basicRes)
 				if err != nil {
-					logger.Warn(err, "getBasicAuthUserInfo")
+					logger.Debug("getBasicAuthUserInfo")
 				}
 			}
 			if user != nil && user.Name != "" {
diff --git a/backend/server/api/router.go b/backend/server/api/router.go
index 34adf384c..958dfa8ff 100644
--- a/backend/server/api/router.go
+++ b/backend/server/api/router.go
@@ -19,12 +19,13 @@ package api
 
 import (
 	"fmt"
+	"net/http"
+	"strings"
+
 	"github.com/apache/incubator-devlake/core/context"
 	"github.com/apache/incubator-devlake/core/errors"
 	"github.com/apache/incubator-devlake/impls/logruslog"
 	"github.com/apache/incubator-devlake/server/api/apikeys"
-	"net/http"
-	"strings"
 
 	"github.com/apache/incubator-devlake/core/plugin"
 	"github.com/apache/incubator-devlake/server/api/blueprints"
@@ -118,7 +119,7 @@ func handlePluginCall(basicRes context.BasicRes, pluginName string, handler plug
 		input.Query = c.Request.URL.Query()
 		user, exist := shared.GetUser(c)
 		if !exist {
-			basicRes.GetLogger().Warn(nil, "user doesn't exist")
+			basicRes.GetLogger().Debug("user doesn't exist")
 		} else {
 			input.User = user
 		}