Просмотр исходного кода

re initalise oauth and email config

abhishek9686 4 месяцев назад
Родитель
Сommit
0c9ae23dbe
4 измененных файлов с 13 добавлено и 1 удалено
  1. 4 1
      logic/auth.go
  2. 6 0
      logic/settings.go
  3. 1 0
      logic/user_mgmt.go
  4. 2 0
      pro/initialize.go

+ 4 - 1
logic/auth.go

@@ -6,9 +6,10 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"time"
+
 	"github.com/gravitl/netmaker/db"
 	"github.com/gravitl/netmaker/schema"
-	"time"
 
 	"github.com/go-playground/validator/v10"
 	"golang.org/x/crypto/bcrypt"
@@ -31,6 +32,8 @@ func ClearSuperUserCache() {
 	superUser = models.User{}
 }
 
+var InitializeAuthProvider = func() string { return "" }
+
 // HasSuperAdmin - checks if server has an superadmin/owner
 func HasSuperAdmin() (bool, error) {
 

+ 6 - 0
logic/settings.go

@@ -34,6 +34,7 @@ func UpsertServerSettings(s models.ServerSettings) error {
 	if err != nil {
 		return err
 	}
+	go reInit()
 	return nil
 }
 
@@ -42,6 +43,11 @@ func ValidateNewSettings(req models.ServerSettings) bool {
 	return true
 }
 
+func reInit() {
+	InitializeAuthProvider()
+	EmailInit()
+}
+
 func GetServerSettingsFromEnv() (s models.ServerSettings) {
 
 	s = models.ServerSettings{

+ 1 - 0
logic/user_mgmt.go

@@ -62,6 +62,7 @@ var CreateDefaultUserPolicies = func(netID models.NetworkID) {}
 var GetUserGroupsInNetwork = func(netID models.NetworkID) (networkGrps map[models.UserGroupID]models.UserGroup) { return }
 var GetUserGroup = func(groupId models.UserGroupID) (userGrps models.UserGroup, err error) { return }
 var AddGlobalNetRolesToAdmins = func(u models.User) {}
+var EmailInit = func() {}
 
 // GetRole - fetches role template by id
 func GetRole(roleID models.UserRoleID) (models.UserRolePermissionTemplate, error) {

+ 2 - 0
pro/initialize.go

@@ -137,6 +137,8 @@ func InitPro() {
 	logic.GetUserGroupsInNetwork = proLogic.GetUserGroupsInNetwork
 	logic.GetUserGroup = proLogic.GetUserGroup
 	logic.GetNodeStatus = proLogic.GetNodeStatus
+	logic.InitializeAuthProvider = auth.InitializeAuthProvider
+	logic.EmailInit = email.Init
 }
 
 func retrieveProLogo() string {