@things-factory/auth-base 6.4.1 → 6.4.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/auth-base",
-  "version": "6.4.1",
+  "version": "6.4.5",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -30,10 +30,10 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/email-base": "^6.4.1",
+    "@things-factory/email-base": "^6.4.2",
     "@things-factory/env": "^6.3.0",
-    "@things-factory/i18n-base": "^6.4.1",
-    "@things-factory/shell": "^6.4.1",
+    "@things-factory/i18n-base": "^6.4.2",
+    "@things-factory/shell": "^6.4.2",
     "@things-factory/utils": "^6.3.1",
     "jsonwebtoken": "^9.0.0",
     "koa-passport": "^6.0.0",
@@ -43,5 +43,5 @@
     "passport-local": "^1.0.0",
     "popsicle-cookie-jar": "^1.0.0"
   },
-  "gitHead": "47ea4ab312b1d23a146e4d2048972b39af6592fa"
+  "gitHead": "df6e9fd7de8564e0ffc7b81221bf2f6afa1fabad"
 }

package/server/service/role/role-query.ts

@@ -5,10 +5,10 @@ import { SelectQueryBuilder } from 'typeorm'
 import { config } from '@things-factory/env'
 import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 
-import { Privilege } from '../privilege/privilege'
-import { User } from '../user/user'
-import { Role } from './role'
-import { RoleList, RolePrivilege, UserRole } from './role-types'
+import { Privilege } from '../privilege/privilege.js'
+import { User } from '../user/user.js'
+import { Role } from './role.js'
+import { RoleList, RolePrivilege, UserRole, RoleBrief } from './role-types.js'
 
 @Resolver(Role)
 export class RoleQuery {
@@ -96,19 +96,20 @@ export class RoleQuery {
     return userRoles
   }
 
-  @Query(returns => [Role], { description: 'To fetch roles of current user' })
-  async myRoles(@Ctx() context: ResolverContext): Promise<Role[]> {
+  @Query(returns => [RoleBrief], { description: 'To fetch roles of current user (id, name only)' })
+  async myRoles(@Ctx() context: ResolverContext): Promise<RoleBrief[]> {
     const { user, domain } = context.state
 
-    const qb: SelectQueryBuilder<User> = await getRepository(User).createQueryBuilder('USER')
-    const { roles }: User = await qb
-      .leftJoinAndSelect('USER.roles', 'ROLE')
+    const roles = await getRepository(Role)
+      .createQueryBuilder('ROLE')
+      .leftJoin('ROLE.users', 'USER')
       .leftJoin('ROLE.domain', 'ROLE_DOMAIN')
       .where('USER.id = :userId', { userId: user.id })
       .andWhere('ROLE_DOMAIN.id In(:...domainIds)', { domainIds: [domain.id, domain.parentId].filter(Boolean) })
-      .getOne()
+      .select(['ROLE.id', 'ROLE.name'])
+      .getMany()
 
-    return roles || []
+    return roles
   }
 
   @Query(returns => [Role], { description: 'To fetch the preset of role for new user' })
@@ -123,6 +124,7 @@ export class RoleQuery {
     return await getRepository(Domain).findOneBy({ id: role.domainId })
   }
 
+  @Directive('@privilege(category: "user", privilege: "query", domainOwnerGranted: true, superUserGranted: true)')
   @FieldResolver(type => [User])
   async users(@Root() role: Role) {
     return (

package/server/service/role/role-types.ts

@@ -47,6 +47,15 @@ export class RoleList {
   total?: number
 }
 
+@ObjectType()
+export class RoleBrief {
+  @Field({ nullable: true })
+  id?: string
+
+  @Field({ nullable: true })
+  name?: string
+}
+
 @ObjectType()
 export class RolePrivilege {
   @Field({ nullable: true })