@things-factory/auth-base 6.1.118 → 6.1.123

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/auth-base",
-  "version": "6.1.118",
+  "version": "6.1.123",
   "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": "ea96bacb831bdc751bd1962a9d73a7d8abf0e304"
+  "gitHead": "b1440f932f519e74aca05dabf2dd7f6690fcb3cf"
 }

package/server/service/user/user.ts

@@ -36,7 +36,7 @@ export enum UserStatus {
 
 @Entity()
 @Index('ix_user_0', (user: User) => [user.email], { unique: true })
-@Index('ix_user_1', (user: User) => [user.id], { unique: true })
+//@Index('ix_user_1', (user: User) => [user.id], { unique: true })
 @ObjectType()
 export class User {
   @PrimaryGeneratedColumn('uuid')
@@ -250,17 +250,18 @@ export class User {
 
   static async hasPrivilege(name: string, category: string, domain: Domain, user: User) {
     const result = await getRepository(User).query(
-      `SELECT COUNT(1) AS has_privilege FROM privileges
-       WHERE category = '${category}'
-        AND name = '${name}'
-        AND id IN (
-          SELECT RP.privileges_id
-          FROM users_roles UR
-          INNER JOIN roles_privileges RP ON UR.roles_id = RP.roles_id
-          LEFT JOIN roles R ON R.id = UR.roles_id
-          WHERE UR.users_id = '${user?.id}'
-          AND R.domain_id = '${domain?.id}'
-        )
+      `
+      SELECT COUNT(1) AS "has_privilege" FROM "privileges" "PRIVILEGES"
+      WHERE "PRIVILEGES"."category" = '${category}'
+      AND "PRIVILEGES"."name" = '${name}'
+      AND "PRIVILEGES"."id" IN (
+        SELECT "RP"."privileges_id"
+        FROM "users_roles" "UR"
+        INNER JOIN "roles_privileges" "RP" ON "UR"."roles_id" = "RP"."roles_id"
+        LEFT JOIN "roles" "R" ON "R"."id" = "UR"."roles_id"
+        WHERE "UR"."users_id" = '${user?.id}'
+        AND "R"."domain_id" = '${domain?.id}'
+      )
       `
     )