From c458123d9e167038b48e7553932d9f379b71cd55 Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Wed, 24 Jul 2024 18:09:18 +0800
Subject: [PATCH] :bug: Fix permissions in groups

---
 .idea/workspace.xml                     | 11 ++++++-----
 pkg/internal/server/api/accounts_api.go |  2 ++
 pkg/internal/server/api/userinfo_api.go | 14 ++++++++++++++
 pkg/internal/services/account_groups.go |  4 ++--
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index df38cf5..9166abe 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,10 +4,11 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":sparkles: Account groups">
+    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":sparkles: Default user group">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pkg/internal/services/accounts.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/accounts.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/settings.toml" beforeDir="false" afterPath="$PROJECT_DIR$/settings.toml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/accounts_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/server/api/accounts_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/userinfo_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/server/api/userinfo_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/services/account_groups.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/account_groups.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -154,7 +155,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value=":bug: Fix API mapping issue" />
     <MESSAGE value=":recycle: Improve notify API" />
     <MESSAGE value=":sparkles: Reset password APIs" />
     <MESSAGE value=":sparkles: Password reset &amp; user lookup API" />
@@ -179,7 +179,8 @@
     <MESSAGE value=":recycle: Use dealer postman instead of built-in feature to deliver email and notify" />
     <MESSAGE value=":bug: Fix push notification to wrong person" />
     <MESSAGE value=":sparkles: Account groups" />
-    <option name="LAST_COMMIT_MESSAGE" value=":sparkles: Account groups" />
+    <MESSAGE value=":sparkles: Default user group" />
+    <option name="LAST_COMMIT_MESSAGE" value=":sparkles: Default user group" />
   </component>
   <component name="VgoProject">
     <settings-migrated>true</settings-migrated>
diff --git a/pkg/internal/server/api/accounts_api.go b/pkg/internal/server/api/accounts_api.go
index b5b3281..152afe9 100644
--- a/pkg/internal/server/api/accounts_api.go
+++ b/pkg/internal/server/api/accounts_api.go
@@ -43,6 +43,8 @@ func getUserinfo(c *fiber.Ctx) error {
 		Preload("Badges").
 		First(&data).Error; err != nil {
 		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
+	} else {
+		data.PermNodes = c.Locals("permissions").(map[string]any)
 	}
 
 	var resp fiber.Map
diff --git a/pkg/internal/server/api/userinfo_api.go b/pkg/internal/server/api/userinfo_api.go
index b200d8e..d1196e4 100644
--- a/pkg/internal/server/api/userinfo_api.go
+++ b/pkg/internal/server/api/userinfo_api.go
@@ -1,8 +1,10 @@
 package api
 
 import (
+	"fmt"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 )
 
@@ -19,5 +21,17 @@ func getOtherUserinfo(c *fiber.Ctx) error {
 		return fiber.NewError(fiber.StatusBadRequest, err.Error())
 	}
 
+	groups, err := services.GetUserAccountGroup(account)
+	if err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("unable to get account groups: %v", err))
+	}
+	for _, group := range groups {
+		for k, v := range group.PermNodes {
+			if _, ok := account.PermNodes[k]; !ok {
+				account.PermNodes[k] = v
+			}
+		}
+	}
+
 	return c.JSON(account)
 }
diff --git a/pkg/internal/services/account_groups.go b/pkg/internal/services/account_groups.go
index 8c68a50..b3ff402 100644
--- a/pkg/internal/services/account_groups.go
+++ b/pkg/internal/services/account_groups.go
@@ -15,8 +15,8 @@ func GetUserAccountGroup(user models.Account) ([]models.AccountGroup, error) {
 	}
 
 	var groups []models.AccountGroup
-	if err := database.C.Where("id IN ?", lo.Map(groups, func(item models.AccountGroup, index int) uint {
-		return item.ID
+	if err := database.C.Where("id IN ?", lo.Map(members, func(item models.AccountGroupMember, index int) uint {
+		return item.GroupID
 	})).Find(&groups).Error; err != nil {
 		return nil, err
 	}