From 14b2f71af68d717bda0cd7be1578dbc953313026 Mon Sep 17 00:00:00 2001
From: xushuhui <xushuhui@infini.ltd>
Date: Thu, 28 Apr 2022 11:54:49 +0800
Subject: [PATCH] fix: (rbac) token map

---
 internal/biz/user.go          | 8 +++++---
 plugin/api/rbac/permission.go | 5 -----
 plugin/api/rbac/user.go       | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/internal/biz/user.go b/internal/biz/user.go
index b5acafd2..5777ad56 100644
--- a/internal/biz/user.go
+++ b/internal/biz/user.go
@@ -27,7 +27,7 @@ func DeleteUser(localUser *User, id string) (err error) {
 	if err != nil {
 		return
 	}
-	fmt.Println("tokenmap", TokenMap)
+
 	delete(TokenMap, id)
 	err = orm.Save(GenerateEvent(event.ActivityMetadata{
 		Category: "platform",
@@ -148,6 +148,8 @@ func UpdateUser(localUser *User, id string, req dto.UpdateUser) (err error) {
 	if err != nil {
 		return
 	}
+	delete(TokenMap, id)
+
 	err = orm.Save(GenerateEvent(event.ActivityMetadata{
 		Category: "platform",
 		Group:    "rbac",
@@ -191,7 +193,7 @@ func UpdateUserRole(localUser *User, id string, req dto.UpdateUserRole) (err err
 	if err != nil {
 		return
 	}
-
+	delete(TokenMap, id)
 	err = orm.Save(GenerateEvent(event.ActivityMetadata{
 		Category: "platform",
 		Group:    "rbac",
@@ -255,7 +257,7 @@ func UpdateUserPassword(localUser *User, id string, password string) (err error)
 	if err != nil {
 		return
 	}
-
+	delete(TokenMap, localUser.UserId)
 	err = orm.Save(GenerateEvent(event.ActivityMetadata{
 		Category: "platform",
 		Group:    "rbac",
diff --git a/plugin/api/rbac/permission.go b/plugin/api/rbac/permission.go
index 1f30c770..a77038a6 100644
--- a/plugin/api/rbac/permission.go
+++ b/plugin/api/rbac/permission.go
@@ -10,11 +10,6 @@ import (
 func (h Rbac) ListPermission(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	typ := ps.MustGetParameter("type")
 
-	err := biz.IsAllowRoleType(typ)
-	if err != nil {
-		h.Error400(w, err.Error())
-		return
-	}
 	role, err := biz.NewRole(typ)
 
 	if err != nil {
diff --git a/plugin/api/rbac/user.go b/plugin/api/rbac/user.go
index 7a00f798..9423b729 100644
--- a/plugin/api/rbac/user.go
+++ b/plugin/api/rbac/user.go
@@ -185,7 +185,7 @@ func (h Rbac) UpdateUserPassword(w http.ResponseWriter, r *http.Request, ps http
 		h.ErrorInternalServer(w, err.Error())
 		return
 	}
-	delete(biz.TokenMap, localUser.UserId)
+
 	_ = h.WriteOKJSON(w, core.UpdateResponse(id))
 	return