zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2026-04-23 00:17:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

move api tokens models to schema pkg (#3434)

Browse Source
This commit is contained in:
Abhishek K
2025-04-29 00:11:56 +04:00
committed by GitHub
parent ca95954fb5
commit 119ef4e17e
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/user.go
+6 -5
View File
@@ -16,6 +16,7 @@ import (
"github.com/gravitl/netmaker/logic"
"github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/mq"
"github.com/gravitl/netmaker/schema"
"github.com/gravitl/netmaker/servercfg"
"golang.org/x/exp/slog"
)
@@ -57,7 +58,7 @@ func createUserAccessToken(w http.ResponseWriter, r *http.Request) {
// Auth request consists of Mac Address and Password (from node that is authorizing
// in case of Master, auth is ignored and mac is set to "mastermac"
var req models.UserAccessToken
var req schema.UserAccessToken
err := json.NewDecoder(r.Body).Decode(&req)
if err != nil {
@@ -139,7 +140,7 @@ func getUserAccessTokens(w http.ResponseWriter, r *http.Request) {
logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("username is required"), "badrequest"))
return
}
logic.ReturnSuccessResponseWithJson(w, r, (&models.UserAccessToken{UserName: username}).ListByUser(), "fetched api access tokens for user "+username)
logic.ReturnSuccessResponseWithJson(w, r, (&schema.UserAccessToken{UserName: username}).ListByUser(), "fetched api access tokens for user "+username)
}
// @Summary Authenticate a user to retrieve an authorization token
@@ -157,7 +158,7 @@ func deleteUserAccessTokens(w http.ResponseWriter, r *http.Request) {
logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("id is required"), "badrequest"))
return
}
a := models.UserAccessToken{
a := schema.UserAccessToken{
ID: id,
}
err := a.Get()
@@ -187,7 +188,7 @@ func deleteUserAccessTokens(w http.ResponseWriter, r *http.Request) {
}
}
err = (&models.UserAccessToken{ID: id}).Delete()
err = (&schema.UserAccessToken{ID: id}).Delete()
if err != nil {
logic.ReturnErrorResponse(
w,
@@ -753,7 +754,7 @@ func updateUser(w http.ResponseWriter, r *http.Request) {
}
logic.AddGlobalNetRolesToAdmins(&userchange)
if userchange.PlatformRoleID != user.PlatformRoleID || !logic.CompareMaps(user.UserGroups, userchange.UserGroups) {
(&models.UserAccessToken{UserName: user.UserName}).DeleteAllUserTokens()
(&schema.UserAccessToken{UserName: user.UserName}).DeleteAllUserTokens()
}
user, err = logic.UpdateUser(&userchange, user)
if err != nil {