gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-11 23:54:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix roles init

Browse source
This commit is contained in:
abhishek9686 2024-07-31 11:33:09 +05:30
parent 203d80ba33
commit a8c796b735
5 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
logic/user_mgmt.go
View file

@ -37,7 +37,7 @@ var IsGroupsValid = func(groups map[models.UserGroupID]struct{}) error {
}
var RemoveNetworkRoleFromUsers = func(host models.Host, node models.Node) {}
var InitialiseRoles = func() {}
var InitialiseRoles = userRolesInit
var DeleteNetworkRoles = func(netID string) {}
var CreateDefaultNetworkRoles = func(netID string) {}
@ -56,7 +56,7 @@ func GetRole(roleID models.UserRole) (models.UserRolePermissionTemplate, error)
return ur, nil
}
func UserRolesInit() {
func userRolesInit() {
d, _ := json.Marshal(SuperAdminPermissionTemplate)
database.Insert(SuperAdminPermissionTemplate.ID.String(), string(d), database.USER_PERMISSIONS_TABLE_NAME)
d, _ = json.Marshal(AdminPermissionTemplate)

2
main.go
View file

@ -89,7 +89,7 @@ func initialize() { // Client Mode Prereq Check
migrate.Run()
logic.SetJWTSecret()
logic.UserRolesInit()
logic.InitialiseRoles()
err = serverctl.SetDefaults()
if err != nil {
logger.FatalLog("error setting defaults: ", err.Error())

3
pro/controllers/users.go
View file

@ -9,7 +9,6 @@ import (
"net/url"
"github.com/gorilla/mux"
"github.com/gravitl/netmaker/auth"
"github.com/gravitl/netmaker/database"
"github.com/gravitl/netmaker/logger"
"github.com/gravitl/netmaker/logic"
@ -1148,7 +1147,7 @@ func approvePendingUser(w http.ResponseWriter, r *http.Request) {
}
for _, user := range users {
if user.UserName == username {
var newPass, fetchErr = auth.FetchPassValue("")
var newPass, fetchErr = logic.FetchPassValue("")
if fetchErr != nil {
logic.ReturnErrorResponse(w, r, logic.FormatError(fetchErr, "internal"))
return

2
pro/initialize.go
View file

@ -22,7 +22,6 @@ import (
func InitPro() {
servercfg.IsPro = true
models.SetLogo(retrieveProLogo())
proLogic.UserRolesInit()
controller.HttpMiddlewares = append(
controller.HttpMiddlewares,
proControllers.OnlyServerAPIWhenUnlicensedMiddleware,
@ -129,6 +128,7 @@ func InitPro() {
logic.FilterNetworksByRole = proLogic.FilterNetworksByRole
logic.IsGroupsValid = proLogic.IsGroupsValid
logic.RemoveNetworkRoleFromUsers = proLogic.RemoveNetworkRoleFromUsers
logic.InitialiseRoles = proLogic.UserRolesInit
}
func retrieveProLogo() string {

6
pro/logic/user_mgmt.go
View file

@ -26,7 +26,11 @@ var PlatformUserUserPermissionTemplate = models.UserRolePermissionTemplate{
}
func UserRolesInit() {
d, _ := json.Marshal(ServiceUserPermissionTemplate)
d, _ := json.Marshal(logic.SuperAdminPermissionTemplate)
database.Insert(logic.SuperAdminPermissionTemplate.ID.String(), string(d), database.USER_PERMISSIONS_TABLE_NAME)
d, _ = json.Marshal(logic.AdminPermissionTemplate)
database.Insert(logic.AdminPermissionTemplate.ID.String(), string(d), database.USER_PERMISSIONS_TABLE_NAME)
d, _ = json.Marshal(ServiceUserPermissionTemplate)
database.Insert(ServiceUserPermissionTemplate.ID.String(), string(d), database.USER_PERMISSIONS_TABLE_NAME)
d, _ = json.Marshal(PlatformUserUserPermissionTemplate)
database.Insert(PlatformUserUserPermissionTemplate.ID.String(), string(d), database.USER_PERMISSIONS_TABLE_NAME)