@drax/identity-back 0.1.4 → 0.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (115) hide show
  1. package/dist/middleware/apiKeyMiddleware.js +1 -1
  2. package/dist/repository/mongo/UserApiKeyMongoRepository.js +1 -1
  3. package/package.json +3 -4
  4. package/src/middleware/apiKeyMiddleware.ts +1 -1
  5. package/src/repository/mongo/UserApiKeyMongoRepository.ts +1 -1
  6. package/tsconfig.tsbuildinfo +1 -1
  7. package/types/config/IdentityConfig.d.ts +0 -12
  8. package/types/config/IdentityConfig.d.ts.map +0 -1
  9. package/types/errors/BadCredentialsError.d.ts +0 -6
  10. package/types/errors/BadCredentialsError.d.ts.map +0 -1
  11. package/types/errors/UnauthorizedError.d.ts +0 -6
  12. package/types/errors/UnauthorizedError.d.ts.map +0 -1
  13. package/types/factory/RoleServiceFactory.d.ts +0 -4
  14. package/types/factory/RoleServiceFactory.d.ts.map +0 -1
  15. package/types/factory/TenantServiceFactory.d.ts +0 -4
  16. package/types/factory/TenantServiceFactory.d.ts.map +0 -1
  17. package/types/factory/UserApiKeyServiceFactory.d.ts +0 -4
  18. package/types/factory/UserApiKeyServiceFactory.d.ts.map +0 -1
  19. package/types/factory/UserServiceFactory.d.ts +0 -4
  20. package/types/factory/UserServiceFactory.d.ts.map +0 -1
  21. package/types/graphql/index.d.ts +0 -6
  22. package/types/graphql/index.d.ts.map +0 -1
  23. package/types/graphql/resolvers/role.resolvers.d.ts +0 -52
  24. package/types/graphql/resolvers/role.resolvers.d.ts.map +0 -1
  25. package/types/graphql/resolvers/tenant.resolvers.d.ts +0 -49
  26. package/types/graphql/resolvers/tenant.resolvers.d.ts.map +0 -1
  27. package/types/graphql/resolvers/user-api-key.resolvers.d.ts +0 -37
  28. package/types/graphql/resolvers/user-api-key.resolvers.d.ts.map +0 -1
  29. package/types/graphql/resolvers/user.resolvers.d.ts +0 -67
  30. package/types/graphql/resolvers/user.resolvers.d.ts.map +0 -1
  31. package/types/index.d.ts +0 -35
  32. package/types/index.d.ts.map +0 -1
  33. package/types/interfaces/IRoleRepository.d.ts +0 -9
  34. package/types/interfaces/IRoleRepository.d.ts.map +0 -1
  35. package/types/interfaces/ITenantRepository.d.ts +0 -9
  36. package/types/interfaces/ITenantRepository.d.ts.map +0 -1
  37. package/types/interfaces/IUserApiKeyRepository.d.ts +0 -7
  38. package/types/interfaces/IUserApiKeyRepository.d.ts.map +0 -1
  39. package/types/interfaces/IUserRepository.d.ts +0 -10
  40. package/types/interfaces/IUserRepository.d.ts.map +0 -1
  41. package/types/middleware/apiKeyMiddleware.d.ts +0 -4
  42. package/types/middleware/apiKeyMiddleware.d.ts.map +0 -1
  43. package/types/middleware/jwtMiddleware.d.ts +0 -4
  44. package/types/middleware/jwtMiddleware.d.ts.map +0 -1
  45. package/types/middleware/rbacMiddleware.d.ts +0 -4
  46. package/types/middleware/rbacMiddleware.d.ts.map +0 -1
  47. package/types/models/RoleModel.d.ts +0 -16
  48. package/types/models/RoleModel.d.ts.map +0 -1
  49. package/types/models/TenantModel.d.ts +0 -16
  50. package/types/models/TenantModel.d.ts.map +0 -1
  51. package/types/models/UserApiKeyModel.d.ts +0 -16
  52. package/types/models/UserApiKeyModel.d.ts.map +0 -1
  53. package/types/models/UserGroupModel.d.ts +0 -16
  54. package/types/models/UserGroupModel.d.ts.map +0 -1
  55. package/types/models/UserModel.d.ts +0 -16
  56. package/types/models/UserModel.d.ts.map +0 -1
  57. package/types/permissions/IdentityPermissions.d.ts +0 -27
  58. package/types/permissions/IdentityPermissions.d.ts.map +0 -1
  59. package/types/rbac/Rbac.d.ts +0 -15
  60. package/types/rbac/Rbac.d.ts.map +0 -1
  61. package/types/repository/mongo/RoleMongoRepository.d.ts +0 -14
  62. package/types/repository/mongo/RoleMongoRepository.d.ts.map +0 -1
  63. package/types/repository/mongo/TenantMongoRepository.d.ts +0 -14
  64. package/types/repository/mongo/TenantMongoRepository.d.ts.map +0 -1
  65. package/types/repository/mongo/UserApiKeyMongoRepository.d.ts +0 -14
  66. package/types/repository/mongo/UserApiKeyMongoRepository.d.ts.map +0 -1
  67. package/types/repository/mongo/UserMongoRepository.d.ts +0 -17
  68. package/types/repository/mongo/UserMongoRepository.d.ts.map +0 -1
  69. package/types/repository/sqlite/RoleSqliteRepository.d.ts +0 -22
  70. package/types/repository/sqlite/RoleSqliteRepository.d.ts.map +0 -1
  71. package/types/repository/sqlite/TenantSqliteRepository.d.ts +0 -19
  72. package/types/repository/sqlite/TenantSqliteRepository.d.ts.map +0 -1
  73. package/types/repository/sqlite/UserApiKeySqliteRepository.d.ts +0 -19
  74. package/types/repository/sqlite/UserApiKeySqliteRepository.d.ts.map +0 -1
  75. package/types/repository/sqlite/UserSqliteRepository.d.ts +0 -25
  76. package/types/repository/sqlite/UserSqliteRepository.d.ts.map +0 -1
  77. package/types/routes/RoleRoutes.d.ts +0 -4
  78. package/types/routes/RoleRoutes.d.ts.map +0 -1
  79. package/types/routes/TenantRoutes.d.ts +0 -4
  80. package/types/routes/TenantRoutes.d.ts.map +0 -1
  81. package/types/routes/UserApiKeyRoutes.d.ts +0 -4
  82. package/types/routes/UserApiKeyRoutes.d.ts.map +0 -1
  83. package/types/routes/UserAvatarRoutes.d.ts +0 -4
  84. package/types/routes/UserRoutes.d.ts +0 -4
  85. package/types/routes/UserRoutes.d.ts.map +0 -1
  86. package/types/services/PermissionService.d.ts +0 -9
  87. package/types/services/PermissionService.d.ts.map +0 -1
  88. package/types/services/RoleService.d.ts +0 -16
  89. package/types/services/RoleService.d.ts.map +0 -1
  90. package/types/services/TenantService.d.ts +0 -16
  91. package/types/services/TenantService.d.ts.map +0 -1
  92. package/types/services/UserApiKeyService.d.ts +0 -15
  93. package/types/services/UserApiKeyService.d.ts.map +0 -1
  94. package/types/services/UserService.d.ts +0 -21
  95. package/types/services/UserService.d.ts.map +0 -1
  96. package/types/setup/CreateOrUpdateRole.d.ts +0 -5
  97. package/types/setup/CreateOrUpdateRole.d.ts.map +0 -1
  98. package/types/setup/CreateUserIfNotExist.d.ts +0 -5
  99. package/types/setup/CreateUserIfNotExist.d.ts.map +0 -1
  100. package/types/setup/LoadIdentityConfigFromEnv.d.ts +0 -4
  101. package/types/setup/LoadIdentityConfigFromEnv.d.ts.map +0 -1
  102. package/types/setup/LoadPermissions.d.ts +0 -4
  103. package/types/setup/LoadPermissions.d.ts.map +0 -1
  104. package/types/setup/RecoveryUserPassword.d.ts +0 -4
  105. package/types/setup/RecoveryUserPassword.d.ts.map +0 -1
  106. package/types/utils/AuthUtils.d.ts +0 -18
  107. package/types/utils/AuthUtils.d.ts.map +0 -1
  108. package/types/zod/RoleZod.d.ts +0 -10
  109. package/types/zod/RoleZod.d.ts.map +0 -1
  110. package/types/zod/TenantZod.d.ts +0 -10
  111. package/types/zod/TenantZod.d.ts.map +0 -1
  112. package/types/zod/UserApiKeyZod.d.ts +0 -16
  113. package/types/zod/UserApiKeyZod.d.ts.map +0 -1
  114. package/types/zod/UserZod.d.ts +0 -53
  115. package/types/zod/UserZod.d.ts.map +0 -1
package/dist/middleware/apiKeyMiddleware.js CHANGED
@@ -16,7 +16,7 @@ async function apiKeyMiddleware(request, reply) {
16
16
  if (userApiKey && userApiKey.user) {
17
17
  request.authUser = userApiKey.user;
18
18
  request.authUser.roleId = userApiKey.user.role.id;
19
- request.authUser.tenantId = userApiKey.user.tenant.id;
19
+ request.authUser.tenantId = userApiKey.user?.tenant?.id;
20
20
  }
21
21
  }
22
22
  return;
package/dist/repository/mongo/UserApiKeyMongoRepository.js CHANGED
@@ -44,7 +44,7 @@ class UserMongoRepository {
44
44
  return userApiKey;
45
45
  }
46
46
  async findBySecret(secret) {
47
- const userApiKey = await UserApiKeyModel.findOne({ secret: secret }).populate({ path: 'user', populate: { path: 'tenant role' } }).exec();
47
+ const userApiKey = await UserApiKeyModel.findOne({ secret: { $eq: secret }, deleted: { $ne: true } }).populate({ path: 'user', populate: { path: 'tenant role' } }).exec();
48
48
  return userApiKey;
49
49
  }
50
50
  async paginate({ page = 1, limit = 5, orderBy = '', orderDesc = false, search = '', filters = [] }) {
package/package.json CHANGED
@@ -3,13 +3,12 @@
3
3
  "publishConfig": {
4
4
  "access": "public"
5
5
  },
6
- "version": "0.1.4",
6
+ "version": "0.1.6",
7
7
  "description": "Identity module for user management, authentication and authorization.",
8
8
  "main": "dist/index.js",
9
9
  "types": "types/index.d.ts",
10
10
  "type": "module",
11
11
  "scripts": {
12
- "serve": "nodemon --exec node --loader ts-node/esm src/index.ts",
13
12
  "prepublish": "tsc && npm run copygql",
14
13
  "clean": "rm -rf dist",
15
14
  "copygql": "copyfiles -u 1 ./**/*.graphql dist/",
@@ -29,7 +28,7 @@
29
28
  "dependencies": {
30
29
  "@drax/common-back": "^0.1.0",
31
30
  "@drax/common-share": "^0.1.0",
32
- "@drax/identity-share": "^0.1.0",
31
+ "@drax/identity-share": "^0.1.6",
33
32
  "bcryptjs": "^2.4.3",
34
33
  "express-jwt": "^8.4.1",
35
34
  "graphql": "^16.8.2",
@@ -60,5 +59,5 @@
60
59
  "debug": "0"
61
60
  }
62
61
  },
63
- "gitHead": "c9b0f92abc19463226d7faa8aa5c4f6631910740"
62
+ "gitHead": "7f3a48c237eab6837d6b620ac8bfb0dc395c9fa6"
64
63
  }
package/src/middleware/apiKeyMiddleware.ts CHANGED
@@ -21,7 +21,7 @@ async function apiKeyMiddleware (request, reply) {
21
21
  if(userApiKey && userApiKey.user){
22
22
  request.authUser = userApiKey.user
23
23
  request.authUser.roleId = userApiKey.user.role.id
24
- request.authUser.tenantId = userApiKey.user.tenant.id
24
+ request.authUser.tenantId = userApiKey.user?.tenant?.id
25
25
  }
26
26
  }
27
27
  return
package/src/repository/mongo/UserApiKeyMongoRepository.ts CHANGED
@@ -61,7 +61,7 @@ class UserMongoRepository implements IUserApiKeyRepository {
61
61
  }
62
62
 
63
63
  async findBySecret(secret: string): Promise<IUserApiKey> {
64
- const userApiKey: mongoose.HydratedDocument<IUserApiKey> = await UserApiKeyModel.findOne({secret: secret}).populate({path: 'user', populate: {path: 'tenant role'}}).exec()
64
+ const userApiKey: mongoose.HydratedDocument<IUserApiKey> = await UserApiKeyModel.findOne({secret: {$eq: secret}, deleted: {$ne: true} }).populate({path: 'user', populate: {path: 'tenant role'}}).exec()
65
65
  return userApiKey
66
66
  }
67
67