Sfoglia il codice sorgente

move oauth from CE build block to pro

Max Ma 1 anno fa
parent
commit
411ba64116
2 ha cambiato i file con 8 aggiunte e 8 eliminazioni
  1. 0 8
      main.go
  2. 8 0
      pro/initialize.go

+ 0 - 8
main.go

@@ -12,7 +12,6 @@ import (
 	"sync"
 	"syscall"
 
-	"github.com/gravitl/netmaker/auth"
 	"github.com/gravitl/netmaker/config"
 	controller "github.com/gravitl/netmaker/controllers"
 	"github.com/gravitl/netmaker/database"
@@ -91,13 +90,6 @@ func initialize() { // Client Mode Prereq Check
 
 	logic.SetJWTSecret()
 
-	var authProvider = auth.InitializeAuthProvider()
-	if authProvider != "" {
-		logger.Log(0, "OAuth provider,", authProvider+",", "initialized")
-	} else {
-		logger.Log(0, "no OAuth provider found or not configured, continuing without OAuth")
-	}
-
 	err = serverctl.SetDefaults()
 	if err != nil {
 		logger.FatalLog("error setting defaults: ", err.Error())

+ 8 - 0
pro/initialize.go

@@ -6,6 +6,7 @@ package pro
 import (
 	"time"
 
+	"github.com/gravitl/netmaker/auth"
 	controller "github.com/gravitl/netmaker/controllers"
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/logic"
@@ -81,6 +82,13 @@ func InitPro() {
 			AddRacHooks()
 		}
 
+		var authProvider = auth.InitializeAuthProvider()
+		if authProvider != "" {
+			slog.Error("OAuth provider,", authProvider+",", "initialized")
+		} else {
+			slog.Error("no OAuth provider found or not configured, continuing without OAuth")
+		}
+
 	})
 	logic.ResetFailOver = proLogic.ResetFailOver
 	logic.ResetFailedOverPeer = proLogic.ResetFailedOverPeer