@drax/identity-back 0.0.13 → 0.0.14

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 (68) hide show
  1. package/dist/config/IdentityConfig.js +12 -0
  2. package/dist/factory/RoleServiceFactory.js +16 -13
  3. package/dist/factory/UserServiceFactory.js +16 -14
  4. package/dist/graphql/resolvers/role.resolvers.js +1 -1
  5. package/dist/graphql/resolvers/user.resolvers.js +1 -1
  6. package/dist/index.js +11 -1
  7. package/dist/middleware/rbacMiddleware.js +4 -3
  8. package/dist/routes/RoleRoutes.js +1 -1
  9. package/dist/routes/UserRoutes.js +1 -1
  10. package/dist/setup/CreateOrUpdateRole.js +15 -0
  11. package/dist/setup/CreateUserIfNotExist.js +17 -0
  12. package/dist/setup/LoadConfigFromEnv.js +12 -0
  13. package/dist/setup/LoadPermissions.js +8 -0
  14. package/dist/setup/RecoveryUserPassword.js +9 -0
  15. package/dist/utils/AuthUtils.js +9 -5
  16. package/dist/utils/DbSetupUtils.js +10 -8
  17. package/package.json +2 -2
  18. package/src/config/IdentityConfig.ts +17 -0
  19. package/src/factory/RoleServiceFactory.ts +19 -13
  20. package/src/factory/UserServiceFactory.ts +18 -14
  21. package/src/graphql/resolvers/role.resolvers.ts +1 -1
  22. package/src/graphql/resolvers/user.resolvers.ts +1 -1
  23. package/src/index.ts +18 -1
  24. package/src/middleware/rbacMiddleware.ts +4 -3
  25. package/src/routes/RoleRoutes.ts +1 -1
  26. package/src/routes/UserRoutes.ts +1 -1
  27. package/src/setup/CreateOrUpdateRole.ts +19 -0
  28. package/src/setup/CreateUserIfNotExist.ts +21 -0
  29. package/src/setup/LoadConfigFromEnv.ts +16 -0
  30. package/src/setup/LoadPermissions.ts +12 -0
  31. package/src/setup/RecoveryUserPassword.ts +13 -0
  32. package/src/utils/AuthUtils.ts +10 -5
  33. package/src/utils/DbSetupUtils.ts +10 -8
  34. package/tsconfig.tsbuildinfo +1 -1
  35. package/types/config/IdentityConfig.d.ts +12 -0
  36. package/types/config/IdentityConfig.d.ts.map +1 -0
  37. package/types/factory/RoleServiceFactory.d.ts +2 -2
  38. package/types/factory/RoleServiceFactory.d.ts.map +1 -1
  39. package/types/factory/UserServiceFactory.d.ts +2 -2
  40. package/types/factory/UserServiceFactory.d.ts.map +1 -1
  41. package/types/index.d.ts +7 -1
  42. package/types/index.d.ts.map +1 -1
  43. package/types/interfaces/IID.d.ts +1 -1
  44. package/types/middleware/rbacMiddleware.d.ts.map +1 -1
  45. package/types/routes/UserRoutes.d.ts +1 -1
  46. package/types/setup/CreateOrUpdateRole.d.ts +5 -0
  47. package/types/setup/CreateOrUpdateRole.d.ts.map +1 -0
  48. package/types/setup/CreateUserIfNotExist.d.ts +5 -0
  49. package/types/setup/CreateUserIfNotExist.d.ts.map +1 -0
  50. package/types/setup/LoadConfigFromEnv.d.ts +4 -0
  51. package/types/setup/LoadConfigFromEnv.d.ts.map +1 -0
  52. package/types/setup/LoadPermissions.d.ts +4 -0
  53. package/types/setup/LoadPermissions.d.ts.map +1 -0
  54. package/types/setup/RecoveryUserPassword.d.ts +4 -0
  55. package/types/setup/RecoveryUserPassword.d.ts.map +1 -0
  56. package/types/utils/AuthUtils.d.ts.map +1 -1
  57. package/types/utils/DbSetupUtils.d.ts +1 -1
  58. package/types/utils/DbSetupUtils.d.ts.map +1 -1
  59. package/types/zod/UserZod.d.ts +6 -6
  60. package/dist/i18n/messages/validation-i18n.js +0 -21
  61. package/dist/routes/authRoutes.js +0 -29
  62. package/dist/services/AuthService.js +0 -6
  63. package/types/i18n/messages/validation-i18n.d.ts +0 -4
  64. package/types/i18n/messages/validation-i18n.d.ts.map +0 -1
  65. package/types/routes/authRoutes.d.ts +0 -4
  66. package/types/routes/authRoutes.d.ts.map +0 -1
  67. package/types/services/AuthService.d.ts +0 -7
  68. package/types/services/AuthService.d.ts.map +0 -1
@@ -0,0 +1,12 @@
1
+ var IdentityConfig;
2
+ (function (IdentityConfig) {
3
+ IdentityConfig["DbEngine"] = "DB_ENGINE";
4
+ IdentityConfig["SqliteDbFile"] = "SQLITE_FILE";
5
+ IdentityConfig["MongoDbUri"] = "MONGO_URI";
6
+ IdentityConfig["JwtSecret"] = "JWT_SECRET";
7
+ IdentityConfig["JwtExpiration"] = "JWT_EXPIRATION";
8
+ IdentityConfig["JwtIssuer"] = "JWT_ISSUER";
9
+ IdentityConfig["RbacCacheTTL"] = "RBAC_CACHE_TTL";
10
+ })(IdentityConfig || (IdentityConfig = {}));
11
+ export default IdentityConfig;
12
+ export { IdentityConfig };
@@ -2,20 +2,23 @@ import RoleService from "../services/RoleService.js";
2
2
  import RoleMongoRepository from "../repository/mongo/RoleMongoRepository.js";
3
3
  import RoleSqliteRepository from "../repository/sqlite/RoleSqliteRepository.js";
4
4
  import { DbSetupUtils, DbEngine } from "../utils/DbSetupUtils.js";
5
+ let roleService;
5
6
  const RoleServiceFactory = () => {
6
- let roleRepository;
7
- switch (DbSetupUtils.getDbEngine()) {
8
- case DbEngine.Mongo:
9
- console.log("RoleServiceFactory DB ENGINE MONGODB");
10
- roleRepository = new RoleMongoRepository();
11
- break;
12
- case DbEngine.Sqlite:
13
- console.log("RoleServiceFactory DB ENGINE SQLITE");
14
- roleRepository = new RoleSqliteRepository(process.env.SQLITE_DATABASE, false);
15
- roleRepository.table();
16
- break;
7
+ if (!roleService) {
8
+ let roleRepository;
9
+ switch (DbSetupUtils.getDbEngine()) {
10
+ case DbEngine.Mongo:
11
+ console.log("RoleServiceFactory DB ENGINE MONGODB");
12
+ roleRepository = new RoleMongoRepository();
13
+ break;
14
+ case DbEngine.Sqlite:
15
+ console.log("RoleServiceFactory DB ENGINE SQLITE");
16
+ roleRepository = new RoleSqliteRepository(DbSetupUtils.getDbConfig(), false);
17
+ roleRepository.table();
18
+ break;
19
+ }
20
+ roleService = new RoleService(roleRepository);
17
21
  }
18
- const roleService = new RoleService(roleRepository);
19
22
  return roleService;
20
23
  };
21
- export default RoleServiceFactory();
24
+ export default RoleServiceFactory;
@@ -1,22 +1,24 @@
1
1
  import UserMongoRepository from "../repository/mongo/UserMongoRepository.js";
2
2
  import UserService from "../services/UserService.js";
3
3
  import UserSqliteRepository from "../repository/sqlite/UserSqliteRepository.js";
4
- import process from "node:process";
5
4
  import { DbEngine, DbSetupUtils } from "../utils/DbSetupUtils.js";
5
+ let userService;
6
6
  const UserServiceFactory = () => {
7
- let userRepository;
8
- switch (DbSetupUtils.getDbEngine()) {
9
- case DbEngine.Mongo:
10
- console.log("UserServiceFactory DB ENGINE MONGODB");
11
- userRepository = new UserMongoRepository();
12
- break;
13
- case DbEngine.Sqlite:
14
- console.log("UserServiceFactory DB ENGINE SQLITE");
15
- userRepository = new UserSqliteRepository(process.env.SQLITE_DATABASE, false);
16
- userRepository.table();
17
- break;
7
+ if (!userService) {
8
+ let userRepository;
9
+ switch (DbSetupUtils.getDbEngine()) {
10
+ case DbEngine.Mongo:
11
+ console.log("UserServiceFactory DB ENGINE MONGODB");
12
+ userRepository = new UserMongoRepository();
13
+ break;
14
+ case DbEngine.Sqlite:
15
+ console.log("UserServiceFactory DB ENGINE SQLITE");
16
+ userRepository = new UserSqliteRepository(DbSetupUtils.getDbConfig(), false);
17
+ userRepository.table();
18
+ break;
19
+ }
20
+ userService = new UserService(userRepository);
18
21
  }
19
- const userService = new UserService(userRepository);
20
22
  return userService;
21
23
  };
22
- export default UserServiceFactory();
24
+ export default UserServiceFactory;
@@ -4,7 +4,7 @@ import { ValidationError, ValidationErrorToGraphQLError } from "@drax/common-bac
4
4
  import { GraphQLError } from "graphql";
5
5
  import { PermissionService } from "../../services/PermissionService.js";
6
6
  import UnauthorizedError from "../../errors/UnauthorizedError.js";
7
- const roleService = RoleServiceFactory;
7
+ const roleService = RoleServiceFactory();
8
8
  export default {
9
9
  Query: {
10
10
  findRoleById: async (_, { id }, { rbac }) => {
@@ -4,7 +4,7 @@ import { ValidationErrorToGraphQLError, ValidationError } from "@drax/common-bac
4
4
  import { IdentityPermissions } from "../../permissions/IdentityPermissions.js";
5
5
  import UnauthorizedError from "../../errors/UnauthorizedError.js";
6
6
  import BadCredentialsError from "../../errors/BadCredentialsError.js";
7
- const userService = UserServiceFactory;
7
+ const userService = UserServiceFactory();
8
8
  export default {
9
9
  Query: {
10
10
  me: async (_, {}, { authUser }) => {
package/dist/index.js CHANGED
@@ -11,8 +11,14 @@ import AuthUtils from "./utils/AuthUtils.js";
11
11
  import { jwtMiddleware } from "./middleware/jwtMiddleware.js";
12
12
  import { rbacMiddleware } from "./middleware/rbacMiddleware.js";
13
13
  import IdentityPermissions from "./permissions/IdentityPermissions.js";
14
+ import IdentityConfig from "./config/IdentityConfig.js";
14
15
  import UnauthorizedError from "./errors/UnauthorizedError.js";
15
16
  import BadCredentialsError from "./errors/BadCredentialsError.js";
17
+ import CreateUserIfNotExist from "./setup/CreateUserIfNotExist.js";
18
+ import CreateOrUpdateRole from "./setup/CreateOrUpdateRole.js";
19
+ import LoadPermissions from "./setup/LoadPermissions.js";
20
+ import LoadConfigFromEnv from "./setup/LoadConfigFromEnv.js";
21
+ import RecoveryUserPassword from "./setup/RecoveryUserPassword.js";
16
22
  const graphqlMergeResult = await GraphqlMerge();
17
23
  const identityTypeDefs = await graphqlMergeResult.typeDefs;
18
24
  const identityResolvers = await graphqlMergeResult.resolvers;
@@ -29,6 +35,10 @@ UserRoutes, RoleRoutes, AuthUtils,
29
35
  jwtMiddleware, rbacMiddleware,
30
36
  //Permissions
31
37
  IdentityPermissions,
38
+ //Config
39
+ IdentityConfig,
32
40
  //Errors
33
- UnauthorizedError, BadCredentialsError };
41
+ UnauthorizedError, BadCredentialsError,
42
+ //Setup
43
+ LoadConfigFromEnv, LoadPermissions, CreateOrUpdateRole, CreateUserIfNotExist, RecoveryUserPassword };
34
44
  /// <reference types="index.d.ts" />
@@ -1,9 +1,10 @@
1
- import { DraxCache } from "@drax/common-back";
1
+ import { DraxCache, DraxConfig } from "@drax/common-back";
2
2
  import RoleServiceFactory from "../factory/RoleServiceFactory.js";
3
3
  import Rbac from "../rbac/Rbac.js";
4
- const cacheTTL = process.env.RBAC_CACHE_TTL ? parseInt(process.env.RBAC_CACHE_TTL) : 10000;
4
+ import IdentityConfig from "../config/IdentityConfig.js";
5
+ const cacheTTL = DraxConfig.getOrLoad(IdentityConfig.RbacCacheTTL) ? parseInt(DraxConfig.getOrLoad(IdentityConfig.RbacCacheTTL)) : 10000;
5
6
  const draxCache = new DraxCache(cacheTTL);
6
- const roleService = RoleServiceFactory;
7
+ const roleService = RoleServiceFactory();
7
8
  async function roleLoader(k) {
8
9
  const role = await roleService.findById(k);
9
10
  if (role) {
@@ -3,7 +3,7 @@ import RoleServiceFactory from "../factory/RoleServiceFactory.js";
3
3
  import { IdentityPermissions } from "../permissions/IdentityPermissions.js";
4
4
  import { PermissionService } from "../services/PermissionService.js";
5
5
  import UnauthorizedError from "../errors/UnauthorizedError.js";
6
- const roleService = RoleServiceFactory;
6
+ const roleService = RoleServiceFactory();
7
7
  async function RoleRoutes(fastify, options) {
8
8
  fastify.get('/api/permissions', async (request, reply) => {
9
9
  try {
@@ -3,7 +3,7 @@ import { ValidationError } from "@drax/common-back";
3
3
  import { IdentityPermissions } from "../permissions/IdentityPermissions.js";
4
4
  import UnauthorizedError from "../errors/UnauthorizedError.js";
5
5
  import BadCredentialsError from "../errors/BadCredentialsError.js";
6
- const userService = UserServiceFactory;
6
+ const userService = UserServiceFactory();
7
7
  async function UserRoutes(fastify, options) {
8
8
  fastify.post('/api/auth', async (request, reply) => {
9
9
  try {
@@ -0,0 +1,15 @@
1
+ import RoleServiceFactory from "../factory/RoleServiceFactory.js";
2
+ async function CreateOrUpdateRole(roleData) {
3
+ const roleService = RoleServiceFactory();
4
+ const role = await roleService.findByName(roleData.name);
5
+ if (role) {
6
+ const r = await roleService.update(role.id, roleData);
7
+ console.log("Role Updated. Name: " + roleData.name);
8
+ }
9
+ else {
10
+ const r = await roleService.create(roleData);
11
+ console.log("Role Created. Name: " + roleData.name);
12
+ }
13
+ }
14
+ export default CreateOrUpdateRole;
15
+ export { CreateOrUpdateRole };
@@ -0,0 +1,17 @@
1
+ import RoleServiceFactory from "../factory/RoleServiceFactory.js";
2
+ import UserServiceFactory from "../factory/UserServiceFactory.js";
3
+ async function CreateUserIfNotExist(userData) {
4
+ const userService = UserServiceFactory();
5
+ const roleService = RoleServiceFactory();
6
+ const user = await userService.findByUsername(userData.username);
7
+ if (user) {
8
+ }
9
+ else {
10
+ const role = await roleService.findByName(userData.role);
11
+ userData.role = role.id;
12
+ const r = await userService.create(userData);
13
+ console.log("User Created. Username: " + userData.username);
14
+ }
15
+ }
16
+ export default CreateUserIfNotExist;
17
+ export { CreateUserIfNotExist };
@@ -0,0 +1,12 @@
1
+ import { DraxConfig } from "@drax/common-back";
2
+ import IdentityConfig from "../config/IdentityConfig.js";
3
+ function LoadConfigFromEnv() {
4
+ DraxConfig.set(IdentityConfig.DbEngine, process.env[IdentityConfig.DbEngine]);
5
+ DraxConfig.set(IdentityConfig.SqliteDbFile, process.env[IdentityConfig.SqliteDbFile]);
6
+ DraxConfig.set(IdentityConfig.MongoDbUri, process.env[IdentityConfig.MongoDbUri]);
7
+ DraxConfig.set(IdentityConfig.JwtSecret, process.env[IdentityConfig.JwtSecret]);
8
+ DraxConfig.set(IdentityConfig.JwtExpiration, process.env[IdentityConfig.JwtExpiration]);
9
+ DraxConfig.set(IdentityConfig.JwtIssuer, process.env[IdentityConfig.JwtIssuer]);
10
+ }
11
+ export default LoadConfigFromEnv;
12
+ export { LoadConfigFromEnv };
@@ -0,0 +1,8 @@
1
+ import { PermissionService } from "../services/PermissionService.js";
2
+ function LoadPermissions(permissions) {
3
+ for (const permission of permissions) {
4
+ PermissionService.addPermission(permission);
5
+ }
6
+ }
7
+ export default LoadPermissions;
8
+ export { LoadPermissions };
@@ -0,0 +1,9 @@
1
+ import UserServiceFactory from "../factory/UserServiceFactory.js";
2
+ async function RecoveryUserPassword(username, password) {
3
+ const userService = UserServiceFactory();
4
+ const user = await userService.findByUsername(username);
5
+ const r = await userService.changeUserPassword(user.id, password);
6
+ console.log("User password recovered. Username: " + username);
7
+ }
8
+ export default RecoveryUserPassword;
9
+ export { RecoveryUserPassword };
@@ -1,10 +1,12 @@
1
1
  import bcryptjs from "bcryptjs";
2
2
  import jsonwebtoken from "jsonwebtoken";
3
+ import { DraxConfig } from "@drax/common-back";
4
+ import IdentityConfig from "../config/IdentityConfig.js";
3
5
  class AuthUtils {
4
6
  static verifyToken(token) {
5
- const JWT_SECRET = process.env.JWT_SECRET;
7
+ const JWT_SECRET = DraxConfig.getOrLoad(IdentityConfig.JwtSecret);
6
8
  if (!JWT_SECRET) {
7
- throw new Error("JWT_SECRET ENV must be provided");
9
+ throw new Error("DraxConfig.JWT_SECRET must be provided");
8
10
  }
9
11
  const options = {
10
12
  algorithms: ['HS256'],
@@ -32,16 +34,18 @@ class AuthUtils {
32
34
  }
33
35
  static generateToken(userId, username, roleId, session) {
34
36
  const payload = AuthUtils.tokenSignPayload(userId, username, roleId, session);
35
- const JWT_SECRET = process.env.JWT_SECRET;
37
+ const JWT_SECRET = DraxConfig.getOrLoad(IdentityConfig.JwtSecret);
36
38
  if (!JWT_SECRET) {
37
39
  throw new Error("JWT_SECRET ENV must be provided");
38
40
  }
41
+ const JWT_EXPIRATION = DraxConfig.getOrLoad(IdentityConfig.JwtExpiration) || '1h';
42
+ const JWT_ISSUER = DraxConfig.getOrLoad(IdentityConfig.JwtIssuer) || 'DRAX';
39
43
  const options = {
40
- expiresIn: process.env.JWT_EXPIRATION || '1h',
44
+ expiresIn: JWT_EXPIRATION,
41
45
  jwtid: userId,
42
46
  algorithm: 'HS256',
43
47
  audience: username,
44
- issuer: process.env.JWT_ISSUER ? process.env.JWT_ISSUER : 'drax'
48
+ issuer: JWT_ISSUER
45
49
  };
46
50
  let token = jsonwebtoken.sign(payload, JWT_SECRET, options);
47
51
  return token;
@@ -1,3 +1,5 @@
1
+ import IdentityConfig from "../config/IdentityConfig.js";
2
+ import { DraxConfig } from "@drax/common-back";
1
3
  var DbEngine;
2
4
  (function (DbEngine) {
3
5
  DbEngine["Sqlite"] = "sqlite";
@@ -5,23 +7,23 @@ var DbEngine;
5
7
  })(DbEngine || (DbEngine = {}));
6
8
  class DbSetupUtils {
7
9
  static getDbEngine() {
8
- if (!process.env.DB_ENGINE) {
9
- throw new Error("process.env.DB_ENGINE is not defined");
10
+ if (!DraxConfig.getOrLoad(IdentityConfig.DbEngine)) {
11
+ throw new Error("DraxConfig.DB_ENGINE is not defined");
10
12
  }
11
- const dbEngine = process.env.DB_ENGINE;
13
+ const dbEngine = DraxConfig.getOrLoad(IdentityConfig.DbEngine);
12
14
  if (!Object.values(DbEngine).includes(dbEngine)) {
13
- throw new Error("process.env.DB_ENGINE must be one of " + Object.values(DbEngine).join(", "));
15
+ throw new Error("DraxConfig.DB_ENGINE must be one of " + Object.values(DbEngine).join(", "));
14
16
  }
15
17
  return dbEngine;
16
18
  }
17
- static getDbUri() {
19
+ static getDbConfig() {
18
20
  switch (DbSetupUtils.getDbEngine()) {
19
21
  case DbEngine.Mongo:
20
- return process.env.MONGO_URI;
22
+ return DraxConfig.getOrLoad(IdentityConfig.MongoDbUri);
21
23
  case DbEngine.Sqlite:
22
- return process.env.SQLITE_DATABASE;
24
+ return DraxConfig.getOrLoad(IdentityConfig.SqliteDbFile);
23
25
  default:
24
- throw new Error("process.env.DB_ENGINE must be one of " + Object.values(DbEngine).join(", "));
26
+ throw new Error("DraxConfig.DB_ENGINE must be one of " + Object.values(DbEngine).join(", "));
25
27
  }
26
28
  }
27
29
  }
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "publishConfig": {
4
4
  "access": "public"
5
5
  },
6
- "version": "0.0.13",
6
+ "version": "0.0.14",
7
7
  "description": "Identity module for user management, authentication and authorization.",
8
8
  "main": "dist/index.js",
9
9
  "types": "types/index.d.ts",
@@ -56,5 +56,5 @@
56
56
  "debug": "0"
57
57
  }
58
58
  },
59
- "gitHead": "ef1c27d0173392ba03038b2a588e657061b9f9eb"
59
+ "gitHead": "ef0b07b3396f6eeb1f045ef430b4ec3856896f7e"
60
60
  }
@@ -0,0 +1,17 @@
1
+ enum IdentityConfig {
2
+
3
+ DbEngine = "DB_ENGINE",
4
+ SqliteDbFile = "SQLITE_FILE",
5
+ MongoDbUri = "MONGO_URI",
6
+
7
+ JwtSecret = "JWT_SECRET",
8
+ JwtExpiration = "JWT_EXPIRATION",
9
+ JwtIssuer = "JWT_ISSUER",
10
+
11
+ RbacCacheTTL = "RBAC_CACHE_TTL",
12
+
13
+
14
+ }
15
+
16
+ export default IdentityConfig;
17
+ export {IdentityConfig};
@@ -1,27 +1,33 @@
1
+ import {DraxConfig} from "@drax/common-back"
1
2
  import RoleService from "../services/RoleService.js";
2
3
  import RoleMongoRepository from "../repository/mongo/RoleMongoRepository.js";
3
4
  import RoleSqliteRepository from "../repository/sqlite/RoleSqliteRepository.js";
4
5
  import {DbSetupUtils, DbEngine} from "../utils/DbSetupUtils.js";
5
6
  import type {IRoleRepository} from "../interfaces/IRoleRepository";
6
7
 
8
+ let roleService: RoleService
9
+
7
10
  const RoleServiceFactory = () : RoleService => {
8
11
 
9
- let roleRepository: IRoleRepository
12
+ if(!roleService){
13
+ let roleRepository: IRoleRepository
14
+
15
+ switch (DbSetupUtils.getDbEngine()) {
16
+ case DbEngine.Mongo:
17
+ console.log("RoleServiceFactory DB ENGINE MONGODB")
18
+ roleRepository = new RoleMongoRepository()
19
+ break;
20
+ case DbEngine.Sqlite:
21
+ console.log("RoleServiceFactory DB ENGINE SQLITE")
22
+ roleRepository = new RoleSqliteRepository(DbSetupUtils.getDbConfig(), false)
23
+ roleRepository.table()
24
+ break;
25
+ }
10
26
 
11
- switch (DbSetupUtils.getDbEngine()) {
12
- case DbEngine.Mongo:
13
- console.log("RoleServiceFactory DB ENGINE MONGODB")
14
- roleRepository = new RoleMongoRepository()
15
- break;
16
- case DbEngine.Sqlite:
17
- console.log("RoleServiceFactory DB ENGINE SQLITE")
18
- roleRepository = new RoleSqliteRepository(process.env.SQLITE_DATABASE, false)
19
- roleRepository.table()
20
- break;
27
+ roleService = new RoleService(roleRepository)
21
28
  }
22
29
 
23
- const roleService = new RoleService(roleRepository)
24
30
  return roleService
25
31
  }
26
32
 
27
- export default RoleServiceFactory()
33
+ export default RoleServiceFactory
@@ -1,27 +1,31 @@
1
1
  import UserMongoRepository from "../repository/mongo/UserMongoRepository.js";
2
2
  import UserService from "../services/UserService.js";
3
3
  import UserSqliteRepository from "../repository/sqlite/UserSqliteRepository.js";
4
- import process from "node:process";
5
4
  import {DbEngine, DbSetupUtils} from "../utils/DbSetupUtils.js";
6
5
  import {IUserRepository} from "../interfaces/IUserRepository";
7
6
 
7
+ let userService: UserService
8
+
8
9
  const UserServiceFactory = () : UserService => {
9
10
 
10
- let userRepository: IUserRepository
11
- switch (DbSetupUtils.getDbEngine()) {
12
- case DbEngine.Mongo:
13
- console.log("UserServiceFactory DB ENGINE MONGODB")
14
- userRepository = new UserMongoRepository()
15
- break;
16
- case DbEngine.Sqlite:
17
- console.log("UserServiceFactory DB ENGINE SQLITE")
18
- userRepository = new UserSqliteRepository(process.env.SQLITE_DATABASE,false)
19
- userRepository.table()
20
- break;
11
+ if(!userService){
12
+ let userRepository: IUserRepository
13
+ switch (DbSetupUtils.getDbEngine()) {
14
+ case DbEngine.Mongo:
15
+ console.log("UserServiceFactory DB ENGINE MONGODB")
16
+ userRepository = new UserMongoRepository()
17
+ break;
18
+ case DbEngine.Sqlite:
19
+ console.log("UserServiceFactory DB ENGINE SQLITE")
20
+ userRepository = new UserSqliteRepository(DbSetupUtils.getDbConfig(),false)
21
+ userRepository.table()
22
+ break;
23
+ }
24
+
25
+ userService = new UserService(userRepository)
21
26
  }
22
27
 
23
- const userService = new UserService(userRepository)
24
28
  return userService
25
29
  }
26
30
 
27
- export default UserServiceFactory()
31
+ export default UserServiceFactory
@@ -5,7 +5,7 @@ import {GraphQLError} from "graphql";
5
5
  import {PermissionService} from "../../services/PermissionService.js";
6
6
  import UnauthorizedError from "../../errors/UnauthorizedError.js";
7
7
 
8
- const roleService = RoleServiceFactory
8
+ const roleService = RoleServiceFactory()
9
9
  export default {
10
10
  Query: {
11
11
  findRoleById: async (_, {id}, {rbac}) => {
@@ -5,7 +5,7 @@ import {IdentityPermissions} from "../../permissions/IdentityPermissions.js";
5
5
  import UnauthorizedError from "../../errors/UnauthorizedError.js";
6
6
  import BadCredentialsError from "../../errors/BadCredentialsError.js";
7
7
 
8
- const userService = UserServiceFactory
8
+ const userService = UserServiceFactory()
9
9
 
10
10
  export default {
11
11
  Query: {
package/src/index.ts CHANGED
@@ -12,9 +12,16 @@ import {jwtMiddleware} from "./middleware/jwtMiddleware.js";
12
12
  import {rbacMiddleware} from "./middleware/rbacMiddleware.js";
13
13
 
14
14
  import IdentityPermissions from "./permissions/IdentityPermissions.js";
15
+ import IdentityConfig from "./config/IdentityConfig.js";
15
16
  import UnauthorizedError from "./errors/UnauthorizedError.js";
16
17
  import BadCredentialsError from "./errors/BadCredentialsError.js";
17
18
 
19
+ import CreateUserIfNotExist from "./setup/CreateUserIfNotExist.js";
20
+ import CreateOrUpdateRole from "./setup/CreateOrUpdateRole.js";
21
+ import LoadPermissions from "./setup/LoadPermissions.js";
22
+ import LoadConfigFromEnv from "./setup/LoadConfigFromEnv.js";
23
+ import RecoveryUserPassword from "./setup/RecoveryUserPassword.js";
24
+
18
25
  import type {IJwtUser} from "./interfaces/IJwtUser";
19
26
  import type {IRole, IRoleBase} from "./interfaces/IRole";
20
27
  import type {IUser, IUserCreate, IUserUpdate} from "./interfaces/IUser";
@@ -62,9 +69,19 @@ export {
62
69
  //Permissions
63
70
  IdentityPermissions,
64
71
 
72
+ //Config
73
+ IdentityConfig,
74
+
65
75
  //Errors
66
76
  UnauthorizedError,
67
- BadCredentialsError
77
+ BadCredentialsError,
78
+
79
+ //Setup
80
+ LoadConfigFromEnv,
81
+ LoadPermissions,
82
+ CreateOrUpdateRole,
83
+ CreateUserIfNotExist,
84
+ RecoveryUserPassword
68
85
  }
69
86
 
70
87
 
@@ -1,12 +1,13 @@
1
1
  import type {IJwtUser} from "../interfaces/IJwtUser";
2
2
  import type {IRole, IRoleBase} from "../interfaces/IRole";
3
- import {DraxCache} from "@drax/common-back";
3
+ import {DraxCache, DraxConfig} from "@drax/common-back";
4
4
  import RoleServiceFactory from "../factory/RoleServiceFactory.js";
5
5
  import Rbac from "../rbac/Rbac.js";
6
+ import IdentityConfig from "../config/IdentityConfig.js";
6
7
 
7
- const cacheTTL = process.env.RBAC_CACHE_TTL ? parseInt(process.env.RBAC_CACHE_TTL) : 10000;
8
+ const cacheTTL = DraxConfig.getOrLoad(IdentityConfig.RbacCacheTTL) ? parseInt(DraxConfig.getOrLoad(IdentityConfig.RbacCacheTTL)) : 10000;
8
9
  const draxCache = new DraxCache<IRoleBase>(cacheTTL);
9
- const roleService = RoleServiceFactory
10
+ const roleService = RoleServiceFactory()
10
11
 
11
12
  async function roleLoader(k):Promise<IRoleBase | null> {
12
13
  const role: IRole = await roleService.findById(k)
@@ -5,7 +5,7 @@ import {IdentityPermissions} from "../permissions/IdentityPermissions.js";
5
5
  import {PermissionService} from "../services/PermissionService.js";
6
6
  import UnauthorizedError from "../errors/UnauthorizedError.js";
7
7
 
8
- const roleService = RoleServiceFactory
8
+ const roleService = RoleServiceFactory()
9
9
 
10
10
  async function RoleRoutes(fastify, options) {
11
11
 
@@ -5,7 +5,7 @@ import {IdentityPermissions} from "../permissions/IdentityPermissions.js";
5
5
  import UnauthorizedError from "../errors/UnauthorizedError.js";
6
6
  import BadCredentialsError from "../errors/BadCredentialsError.js";
7
7
 
8
- const userService = UserServiceFactory
8
+ const userService = UserServiceFactory()
9
9
 
10
10
  async function UserRoutes(fastify, options) {
11
11
  fastify.post('/api/auth', async (request, reply) => {
@@ -0,0 +1,19 @@
1
+ import type {IRole} from "../interfaces/IRole"
2
+ import RoleServiceFactory from "../factory/RoleServiceFactory.js"
3
+
4
+ async function CreateOrUpdateRole(roleData: IRole) {
5
+ const roleService = RoleServiceFactory()
6
+ const role = await roleService.findByName(roleData.name)
7
+ if(role){
8
+ const r = await roleService.update(role.id, roleData)
9
+ console.log("Role Updated. Name: "+ roleData.name)
10
+ }else{
11
+ const r = await roleService.create(roleData)
12
+ console.log("Role Created. Name: "+ roleData.name)
13
+ }
14
+ }
15
+
16
+ export default CreateOrUpdateRole
17
+ export {
18
+ CreateOrUpdateRole
19
+ }
@@ -0,0 +1,21 @@
1
+ import RoleServiceFactory from "../factory/RoleServiceFactory.js"
2
+ import UserServiceFactory from "../factory/UserServiceFactory.js"
3
+ import {IUserCreate} from "../interfaces/IUser";
4
+
5
+ async function CreateUserIfNotExist(userData: IUserCreate) {
6
+ const userService = UserServiceFactory()
7
+ const roleService = RoleServiceFactory()
8
+ const user = await userService.findByUsername(userData.username)
9
+ if (user) {
10
+ } else {
11
+ const role = await roleService.findByName(userData.role as string)
12
+ userData.role = role.id as string
13
+ const r = await userService.create(userData)
14
+ console.log("User Created. Username: " + userData.username)
15
+ }
16
+ }
17
+
18
+ export default CreateUserIfNotExist
19
+ export {
20
+ CreateUserIfNotExist
21
+ }
@@ -0,0 +1,16 @@
1
+ import {DraxConfig} from "@drax/common-back";
2
+ import IdentityConfig from "../config/IdentityConfig.js";
3
+
4
+ function LoadConfigFromEnv() {
5
+ DraxConfig.set(IdentityConfig.DbEngine, process.env[IdentityConfig.DbEngine])
6
+ DraxConfig.set(IdentityConfig.SqliteDbFile, process.env[IdentityConfig.SqliteDbFile])
7
+ DraxConfig.set(IdentityConfig.MongoDbUri, process.env[IdentityConfig.MongoDbUri])
8
+ DraxConfig.set(IdentityConfig.JwtSecret, process.env[IdentityConfig.JwtSecret])
9
+ DraxConfig.set(IdentityConfig.JwtExpiration, process.env[IdentityConfig.JwtExpiration])
10
+ DraxConfig.set(IdentityConfig.JwtIssuer, process.env[IdentityConfig.JwtIssuer])
11
+ }
12
+
13
+ export default LoadConfigFromEnv
14
+ export {
15
+ LoadConfigFromEnv
16
+ }
@@ -0,0 +1,12 @@
1
+ import {PermissionService} from "../services/PermissionService.js";
2
+
3
+ function LoadPermissions(permissions: string[]) {
4
+ for(const permission of permissions){
5
+ PermissionService.addPermission(permission)
6
+ }
7
+ }
8
+
9
+ export default LoadPermissions
10
+ export {
11
+ LoadPermissions
12
+ }
@@ -0,0 +1,13 @@
1
+ import UserServiceFactory from "../factory/UserServiceFactory.js"
2
+
3
+ async function RecoveryUserPassword(username:string, password:string) {
4
+ const userService = UserServiceFactory()
5
+ const user = await userService.findByUsername(username)
6
+ const r = await userService.changeUserPassword(user.id as string, password)
7
+ console.log("User password recovered. Username: " + username)
8
+ }
9
+
10
+ export default RecoveryUserPassword
11
+ export {
12
+ RecoveryUserPassword
13
+ }