瀏覽代碼

fix(go): netclient SSO login;

Vishal Dalwadi 1 月之前
父節點
當前提交
f3cd712235
共有 4 個文件被更改,包括 7 次插入1 次删除
  1. 1 1
      auth/host_session.go
  2. 1 0
      logic/auth.go
  3. 4 0
      pro/auth/auth.go
  4. 1 0
      pro/initialize.go

+ 1 - 1
auth/host_session.go

@@ -110,7 +110,7 @@ func SessionHandler(conn *websocket.Conn) {
 			return
 		}
 	} else { // handle SSO / OAuth
-		if auth_provider == nil {
+		if logic.IsOAuthConfigured() {
 			err = conn.WriteMessage(messageType, []byte("Oauth not configured"))
 			if err != nil {
 				logger.Log(0, "error during message writing:", err.Error())

+ 1 - 0
logic/auth.go

@@ -38,6 +38,7 @@ func ClearSuperUserCache() {
 	superUser = models.User{}
 }
 
+var IsOAuthConfigured = func() bool { return false }
 var ResetAuthProvider = func() {}
 var ResetIDPSyncHook = func() {}
 

+ 4 - 0
pro/auth/auth.go

@@ -103,6 +103,10 @@ func ResetAuthProvider() {
 	InitializeAuthProvider()
 }
 
+func IsOAuthConfigured() bool {
+	return auth_provider != nil
+}
+
 // InitializeAuthProvider - initializes the auth provider if any is present
 func InitializeAuthProvider() string {
 	var functions = getCurrentAuthFunctions()

+ 1 - 0
pro/initialize.go

@@ -134,6 +134,7 @@ func InitPro() {
 	logic.GetUserGroupsInNetwork = proLogic.GetUserGroupsInNetwork
 	logic.GetUserGroup = proLogic.GetUserGroup
 	logic.GetNodeStatus = proLogic.GetNodeStatus
+	logic.IsOAuthConfigured = auth.IsOAuthConfigured
 	logic.ResetAuthProvider = auth.ResetAuthProvider
 	logic.ResetIDPSyncHook = auth.ResetIDPSyncHook
 	logic.EmailInit = email.Init