gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-06 20:05:46 +08:00
Code Issues Projects Releases Packages Wiki Activity

use correct log messages

Browse source
This commit is contained in:
Anish Mukherjee 2023-01-03 17:51:38 +05:30
parent fd21d960fc
commit a34aeffaf5
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
auth/auth.go
View file

@ -172,11 +172,11 @@ func IsOauthUser(user *models.User) error {
func HandleHeadlessSSO(w http.ResponseWriter, r *http.Request) { func HandleHeadlessSSO(w http.ResponseWriter, r *http.Request) {
conn, err := upgrader.Upgrade(w, r, nil) conn, err := upgrader.Upgrade(w, r, nil)
if err != nil { if err != nil {
logger.Log(0, "error during connection upgrade for node sign-in:", err.Error()) logger.Log(0, "error during connection upgrade for headless sign-in:", err.Error())
return return
} }
if conn == nil { if conn == nil {
logger.Log(0, "failed to establish web-socket connection during node sign-in") logger.Log(0, "failed to establish web-socket connection during headless sign-in")
return return
} }
defer conn.Close() defer conn.Close()

4
auth/headless_callback.go
View file

@ -9,7 +9,6 @@ import (
"github.com/gravitl/netmaker/logic" "github.com/gravitl/netmaker/logic"
"github.com/gravitl/netmaker/logic/pro/netcache" "github.com/gravitl/netmaker/logic/pro/netcache"
"github.com/gravitl/netmaker/models" "github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/servercfg"
) )
// HandleHeadlessSSOCallback - handle OAuth callback for headless logins such as Netmaker CLI // HandleHeadlessSSOCallback - handle OAuth callback for headless logins such as Netmaker CLI
@ -26,7 +25,8 @@ func HandleHeadlessSSOCallback(w http.ResponseWriter, r *http.Request) {
userClaims, err := functions[get_user_info].(func(string, string) (*OAuthUser, error))(state, code) userClaims, err := functions[get_user_info].(func(string, string) (*OAuthUser, error))(state, code)
if err != nil { if err != nil {
logger.Log(0, "error when getting user info from callback:", err.Error()) logger.Log(0, "error when getting user info from callback:", err.Error())
http.Redirect(w, r, servercfg.GetFrontendURL()+"/login?oauth=callback-error", http.StatusTemporaryRedirect) w.WriteHeader(http.StatusBadRequest)
w.Write([]byte("Failed to retrieve OAuth user claims"))
return return
} }