@things-factory/auth-base 6.1.145 → 6.1.146

package/dist-server/utils/get-user-domains.d.ts

@@ -2,4 +2,5 @@ import { Domain } from '@things-factory/shell';
 import { User } from '../service/user/user';
 export declare function getUserDomains(user: User): Promise<Domain[]>;
 export declare function getRoleBasedDomains(user: User): Promise<Domain[]>;
+export declare function getDomainsWithPrivilege(user: User, privilege: string, category: string): Promise<Domain[]>;
 export declare function getDomainsAsOwner(user: User): Promise<Domain[]>;

package/dist-server/utils/get-user-domains.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDomainsAsOwner = exports.getRoleBasedDomains = exports.getUserDomains = void 0;
+exports.getDomainsAsOwner = exports.getDomainsWithPrivilege = exports.getRoleBasedDomains = exports.getUserDomains = void 0;
 const shell_1 = require("@things-factory/shell");
 const user_1 = require("../service/user/user");
 async function getUserDomains(user) {
@@ -49,6 +49,37 @@ async function getRoleBasedDomains(user) {
         .getMany();
 }
 exports.getRoleBasedDomains = getRoleBasedDomains;
+async function getDomainsWithPrivilege(user, privilege, category) {
+    return await (0, shell_1.getRepository)(shell_1.Domain)
+        .createQueryBuilder('DOMAIN')
+        .where(qb => {
+        const subQuery = qb
+            .subQuery()
+            .distinct(true)
+            .select('DOMAIN.id')
+            .from(user_1.User, 'USER')
+            .leftJoin('USER.roles', 'ROLE')
+            .leftJoin('ROLE.domain', 'DOMAIN')
+            .leftJoin('ROLE.privileges', 'PRIVILEGE')
+            .where('USER.id = :userId', { userId: user.id })
+            .andWhere('PRIVILEGE.name = :privilege', { privilege })
+            .andWhere('PRIVILEGE.category = :category', { category })
+            .getQuery();
+        return 'DOMAIN.id IN ' + subQuery;
+    })
+        .orWhere(qb => {
+        const subQuery = qb
+            .subQuery()
+            .select('DOMAIN.id')
+            .from(shell_1.Domain, 'DOMAIN')
+            .where('DOMAIN.owner = :userId', { userId: user.id })
+            .getQuery();
+        return 'DOMAIN.id IN ' + subQuery;
+    })
+        .orderBy('DOMAIN.name', 'ASC')
+        .getMany();
+}
+exports.getDomainsWithPrivilege = getDomainsWithPrivilege;
 async function getDomainsAsOwner(user) {
     return await (0, shell_1.getRepository)(shell_1.Domain).find({
         where: { owner: user.id }

package/dist-server/utils/get-user-domains.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-user-domains.js","sourceRoot":"","sources":["../../server/utils/get-user-domains.ts"],"names":[],"mappings":";;;AAEA,iDAA6D;AAE7D,+CAA2C;AAEpC,KAAK,UAAU,cAAc,CAAC,IAAU;IAE7C,OAAO,MAAM,IAAA,qBAAa,EAAC,cAAM,CAAC;SAC/B,kBAAkB,CAAC,QAAQ,CAAC;SAC5B,KAAK,CAAC,EAAE,CAAC,EAAE;QACV,MAAM,QAAQ,GAAG,EAAE;aAChB,QAAQ,EAAE;aACV,QAAQ,CAAC,IAAI,CAAC;aACd,MAAM,CAAC,WAAW,CAAC;aACnB,IAAI,CAAC,WAAI,EAAE,MAAM,CAAC;aAClB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;aAC9B,QAAQ,CAAC,aAAa,EAAE,QAAQ,CAAC;aACjC,KAAK,CAAC,mBAAmB,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;aAC/C,QAAQ,EAAE,CAAA;QACb,OAAO,eAAe,GAAG,QAAQ,CAAA;IACnC,CAAC,CAAC;SACD,OAAO,CAAC,EAAE,CAAC,EAAE;QACZ,MAAM,QAAQ,GAAG,EAAE;aAChB,QAAQ,EAAE;aACV,MAAM,CAAC,WAAW,CAAC;aACnB,IAAI,CAAC,cAAM,EAAE,QAAQ,CAAC;aACtB,KAAK,CAAC,wBAAwB,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;aACpD,QAAQ,EAAE,CAAA;QACb,OAAO,eAAe,GAAG,QAAQ,CAAA;IACnC,CAAC,CAAC;SACD,OAAO,CAAC,aAAa,EAAC,KAAK,CAAC;SAC5B,OAAO,EAAE,CAAA;AACd,CAAC;AA3BD,wCA2BC;AAEM,KAAK,UAAU,mBAAmB,CAAC,IAAU;IAClD,OAAO,MAAM,IAAA,qBAAa,EAAC,cAAM,CAAC;SAC/B,kBAAkB,CAAC,QAAQ,CAAC;SAC5B,KAAK,CAAC,EAAE,CAAC,EAAE;QACV,MAAM,QAAQ,GAAG,EAAE;aAChB,QAAQ,EAAE;aACV,QAAQ,CAAC,IAAI,CAAC;aACd,MAAM,CAAC,WAAW,CAAC;aACnB,IAAI,CAAC,WAAI,EAAE,MAAM,CAAC;aAClB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;aAC9B,QAAQ,CAAC,aAAa,EAAE,QAAQ,CAAC;aACjC,KAAK,CAAC,mBAAmB,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;aAC/C,QAAQ,EAAE,CAAA;QACb,OAAO,eAAe,GAAG,QAAQ,CAAA;IACnC,CAAC,CAAC;SACD,OAAO,EAAE,CAAA;AACd,CAAC;AAhBD,kDAgBC;AAEM,KAAK,UAAU,iBAAiB,CAAC,IAAU;IAChD,OAAO,MAAM,IAAA,qBAAa,EAAC,cAAM,CAAC,CAAC,IAAI,CAAC;QACtC,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE;KAC1B,CAAC,CAAA;AACJ,CAAC;AAJD,8CAIC","sourcesContent":["import { In } from 'typeorm'\n\nimport { Domain, getRepository } from '@things-factory/shell'\n\nimport { User } from '../service/user/user'\n\nexport async function getUserDomains(user: User): Promise<Domain[]> {\n  \n  return await getRepository(Domain)\n    .createQueryBuilder('DOMAIN')\n    .where(qb => {\n      const subQuery = qb\n        .subQuery()\n        .distinct(true)\n        .select('DOMAIN.id')\n        .from(User, 'USER')\n        .leftJoin('USER.roles', 'ROLE')\n        .leftJoin('ROLE.domain', 'DOMAIN')\n        .where('USER.id = :userId', { userId: user.id })\n        .getQuery()\n      return 'DOMAIN.id IN ' + subQuery\n    })\n    .orWhere(qb => {\n      const subQuery = qb\n        .subQuery()\n        .select('DOMAIN.id')\n        .from(Domain, 'DOMAIN')\n        .where('DOMAIN.owner = :userId', { userId: user.id })\n        .getQuery()\n      return 'DOMAIN.id IN ' + subQuery\n    })\n    .orderBy('DOMAIN.name','ASC')\n    .getMany()\n}\n\nexport async function getRoleBasedDomains(user: User): Promise<Domain[]> {\n  return await getRepository(Domain)\n    .createQueryBuilder('DOMAIN')\n    .where(qb => {\n      const subQuery = qb\n        .subQuery()\n        .distinct(true)\n        .select('DOMAIN.id')\n        .from(User, 'USER')\n        .leftJoin('USER.roles', 'ROLE')\n        .leftJoin('ROLE.domain', 'DOMAIN')\n        .where('USER.id = :userId', { userId: user.id })\n        .getQuery()\n      return 'DOMAIN.id IN ' + subQuery\n    })\n    .getMany()\n}\n\nexport async function getDomainsAsOwner(user: User): Promise<Domain[]> {\n  return await getRepository(Domain).find({\n    where: { owner: user.id }\n  })\n}\n"]}
+{"version":3,"file":"get-user-domains.js","sourceRoot":"","sources":["../../server/utils/get-user-domains.ts"],"names":[],"mappings":"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","sourcesContent":["import { In } from 'typeorm'\n\nimport { Domain, getRepository } from '@things-factory/shell'\n\nimport { User } from '../service/user/user'\n\nexport async function getUserDomains(user: User): Promise<Domain[]> {\n  return await getRepository(Domain)\n    .createQueryBuilder('DOMAIN')\n    .where(qb => {\n      const subQuery = qb\n        .subQuery()\n        .distinct(true)\n        .select('DOMAIN.id')\n        .from(User, 'USER')\n        .leftJoin('USER.roles', 'ROLE')\n        .leftJoin('ROLE.domain', 'DOMAIN')\n        .where('USER.id = :userId', { userId: user.id })\n        .getQuery()\n      return 'DOMAIN.id IN ' + subQuery\n    })\n    .orWhere(qb => {\n      const subQuery = qb\n        .subQuery()\n        .select('DOMAIN.id')\n        .from(Domain, 'DOMAIN')\n        .where('DOMAIN.owner = :userId', { userId: user.id })\n        .getQuery()\n      return 'DOMAIN.id IN ' + subQuery\n    })\n    .orderBy('DOMAIN.name', 'ASC')\n    .getMany()\n}\n\nexport async function getRoleBasedDomains(user: User): Promise<Domain[]> {\n  return await getRepository(Domain)\n    .createQueryBuilder('DOMAIN')\n    .where(qb => {\n      const subQuery = qb\n        .subQuery()\n        .distinct(true)\n        .select('DOMAIN.id')\n        .from(User, 'USER')\n        .leftJoin('USER.roles', 'ROLE')\n        .leftJoin('ROLE.domain', 'DOMAIN')\n        .where('USER.id = :userId', { userId: user.id })\n        .getQuery()\n      return 'DOMAIN.id IN ' + subQuery\n    })\n    .getMany()\n}\n\nexport async function getDomainsWithPrivilege(user: User, privilege: string, category: string): Promise<Domain[]> {\n  return await getRepository(Domain)\n    .createQueryBuilder('DOMAIN')\n    .where(qb => {\n      const subQuery = qb\n        .subQuery()\n        .distinct(true)\n        .select('DOMAIN.id')\n        .from(User, 'USER')\n        .leftJoin('USER.roles', 'ROLE')\n        .leftJoin('ROLE.domain', 'DOMAIN')\n        .leftJoin('ROLE.privileges', 'PRIVILEGE')\n        .where('USER.id = :userId', { userId: user.id })\n        .andWhere('PRIVILEGE.name = :privilege', { privilege })\n        .andWhere('PRIVILEGE.category = :category', { category })\n        .getQuery()\n      return 'DOMAIN.id IN ' + subQuery\n    })\n    .orWhere(qb => {\n      const subQuery = qb\n        .subQuery()\n        .select('DOMAIN.id')\n        .from(Domain, 'DOMAIN')\n        .where('DOMAIN.owner = :userId', { userId: user.id })\n        .getQuery()\n      return 'DOMAIN.id IN ' + subQuery\n    })\n    .orderBy('DOMAIN.name', 'ASC')\n    .getMany()\n}\n\nexport async function getDomainsAsOwner(user: User): Promise<Domain[]> {\n  return await getRepository(Domain).find({\n    where: { owner: user.id }\n  })\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/auth-base",
-  "version": "6.1.145",
+  "version": "6.1.146",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -43,5 +43,5 @@
     "passport-jwt": "^4.0.0",
     "passport-local": "^1.0.0"
   },
-  "gitHead": "615af7d8a649cb70f13c13dfafdf6cb84db13b9b"
+  "gitHead": "aa259261bbad566fd57b59848372675ca09329ce"
 }

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

@@ -1,5 +1,5 @@
 import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
+import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 
 import { Role } from '../role/role'
 import { User } from '../user/user'
@@ -38,6 +38,16 @@ export class PrivilegeQuery {
     return await User.hasPrivilege(name, category, domain, user)
   }
 
+  @Query(returns => [Domain], { description: 'To fetch domains with given privilege for user' })
+  async domainsWithPrivilege(
+    @Arg('name') name: string,
+    @Arg('category') category: string,
+    @Ctx() context: ResolverContext
+  ): Promise<Domain[]> {
+    const { user } = context.state
+    return await User.getDomainsWithPrivilege(name, category, user)
+  }
+
   @FieldResolver(type => String)
   async description(@Root() privilege: Privilege, @Ctx() context: ResolverContext) {
     const { t } = context

package/server/service/user/user.ts

@@ -21,6 +21,7 @@ import { validatePasswordByRule } from '../../controllers/utils/password-rule'
 import { AuthError } from '../../errors/auth-error'
 import { SECRET } from '../../utils/get-secret'
 import { Role } from '../role/role'
+import { getDomainsWithPrivilege } from '../../utils/get-user-domains'
 
 const ORMCONFIG = config.get('ormconfig', {})
 const DATABASE_TYPE = ORMCONFIG.type
@@ -267,4 +268,8 @@ export class User {
 
     return result[0].has_privilege > 0
   }
+
+  static async getDomainsWithPrivilege(name: string, category: string, user: User) {
+    return getDomainsWithPrivilege(user, name, category)
+  }
 }

package/server/utils/get-user-domains.ts

@@ -5,7 +5,6 @@ import { Domain, getRepository } from '@things-factory/shell'
 import { User } from '../service/user/user'
 
 export async function getUserDomains(user: User): Promise<Domain[]> {
-  
   return await getRepository(Domain)
     .createQueryBuilder('DOMAIN')
     .where(qb => {
@@ -29,7 +28,7 @@ export async function getUserDomains(user: User): Promise<Domain[]> {
         .getQuery()
       return 'DOMAIN.id IN ' + subQuery
     })
-    .orderBy('DOMAIN.name','ASC')
+    .orderBy('DOMAIN.name', 'ASC')
     .getMany()
 }
 
@@ -51,6 +50,37 @@ export async function getRoleBasedDomains(user: User): Promise<Domain[]> {
     .getMany()
 }
 
+export async function getDomainsWithPrivilege(user: User, privilege: string, category: string): Promise<Domain[]> {
+  return await getRepository(Domain)
+    .createQueryBuilder('DOMAIN')
+    .where(qb => {
+      const subQuery = qb
+        .subQuery()
+        .distinct(true)
+        .select('DOMAIN.id')
+        .from(User, 'USER')
+        .leftJoin('USER.roles', 'ROLE')
+        .leftJoin('ROLE.domain', 'DOMAIN')
+        .leftJoin('ROLE.privileges', 'PRIVILEGE')
+        .where('USER.id = :userId', { userId: user.id })
+        .andWhere('PRIVILEGE.name = :privilege', { privilege })
+        .andWhere('PRIVILEGE.category = :category', { category })
+        .getQuery()
+      return 'DOMAIN.id IN ' + subQuery
+    })
+    .orWhere(qb => {
+      const subQuery = qb
+        .subQuery()
+        .select('DOMAIN.id')
+        .from(Domain, 'DOMAIN')
+        .where('DOMAIN.owner = :userId', { userId: user.id })
+        .getQuery()
+      return 'DOMAIN.id IN ' + subQuery
+    })
+    .orderBy('DOMAIN.name', 'ASC')
+    .getMany()
+}
+
 export async function getDomainsAsOwner(user: User): Promise<Domain[]> {
   return await getRepository(Domain).find({
     where: { owner: user.id }