恢复余额功能 & 管理员修改余额功能

web/auth/account.go

@@ -155,22 +155,8 @@ func authAdminByPassword(tx *q.Query, username, password string) (*m.Admin, erro
 }
 
 func adminScopes(admin *m.Admin) ([]string, error) {
-	count, err := q.Admin.
-		LeftJoin(q.LinkAdminRole, q.LinkAdminRole.AdminID.EqCol(q.Admin.ID)).
-		LeftJoin(q.LinkAdminRolePermission, q.LinkAdminRolePermission.RoleID.EqCol(q.LinkAdminRole.RoleID)).
-		LeftJoin(q.Permission, q.Permission.ID.EqCol(q.LinkAdminRolePermission.PermissionID)).
-		Where(q.Admin.ID.Eq(admin.ID)).
-		Select(q.Permission.Name).
-		Count()
-	if err != nil {
-		return nil, err
-	}
-	if count == 0 {
-		return nil, nil
-	}
-
-	scopes := make([]string, 0, count)
-	err = q.Admin.
+	var scopes []struct{ Name string }
+	err := q.Admin.
 		LeftJoin(q.LinkAdminRole, q.LinkAdminRole.AdminID.EqCol(q.Admin.ID)).
 		LeftJoin(q.LinkAdminRolePermission, q.LinkAdminRolePermission.RoleID.EqCol(q.LinkAdminRole.RoleID)).
 		LeftJoin(q.Permission, q.Permission.ID.EqCol(q.LinkAdminRolePermission.PermissionID)).
@@ -181,5 +167,9 @@ func adminScopes(admin *m.Admin) ([]string, error) {
 		return nil, err
 	}
 
-	return scopes, nil
+	scopeNames := make([]string, 0, len(scopes))
+	for _, scope := range scopes {
+		scopeNames = append(scopeNames, scope.Name)
+	}
+	return scopeNames, nil
 }

web/auth/endpoints.go

@@ -336,9 +336,8 @@ func authPassword(c *fiber.Ctx, auth *AuthCtx, req *TokenReq, now time.Time) (*m
 
 			// 手机号首次登录的自动创建用户
 			user = &m.User{
-				Phone:    req.Username,
-				Username: u.P(req.Username),
-				Status:   m.UserStatusEnabled,
+				Phone:  req.Username,
+				Status: m.UserStatusEnabled,
 			}
 		}
 
@@ -549,22 +548,30 @@ func introspectUser(ctx *fiber.Ctx, authCtx *AuthCtx) error {
 func introspectAdmin(ctx *fiber.Ctx, authCtx *AuthCtx) error {
 	// 获取管理员信息
 	profile, err := q.Admin.
+		Preload(q.Admin.Roles, q.Admin.Roles.Permissions).
 		Where(q.Admin.ID.Eq(authCtx.Admin.ID)).
-		Omit(q.Admin.DeletedAt).
+		Omit(q.Admin.DeletedAt, q.Admin.Password).
 		Take()
 	if err != nil {
 		return err
 	}
 
-	// 不返回密码
-	profile.Password = ""
-
-	// 掩码敏感信息
-	if profile.Phone != nil && *profile.Phone != "" {
-		profile.Phone = u.P(maskPhone(*profile.Phone))
+	// 整理权限列表
+	scopes := make(map[string]struct{}, 0)
+	for _, role := range profile.Roles {
+		for _, permission := range role.Permissions {
+			scopes[permission.Name] = struct{}{}
+		}
+	}
+	list := make([]string, 0, len(scopes))
+	for scope := range scopes {
+		list = append(list, scope)
 	}
 
-	return ctx.JSON(profile)
+	return ctx.JSON(struct {
+		*m.Admin
+		Scopes []string `json:"scopes"`
+	}{profile, list})
 }
 
 func maskPhone(phone string) string {