@tomei/sso 0.44.2 → 0.45.0

package/package.json

@@ -1,89 +1,89 @@
-{
-  "name": "@tomei/sso",
-  "version": "0.44.2",
-  "description": "Tomei SSO Package",
-  "main": "dist/index.js",
-  "scripts": {
-    "start:dev": "tsc -w",
-    "build": "tsc",
-    "prepare": "husky install",
-    "format": "prettier --write \"src/**/*.ts\"",
-    "lint": "npx eslint . --fix",
-    "test": "jest --forceExit --detectOpenHandles --coverage"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@gitlab.com/tomei-package/sso.git"
-  },
-  "keywords": [
-    "tomei",
-    "sso"
-  ],
-  "author": "Tomei",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://gitlab.com/tomei-package/sso/issues"
-  },
-  "homepage": "https://gitlab.com/tomei-package/sso#readme",
-  "devDependencies": {
-    "@commitlint/cli": "^17.6.3",
-    "@commitlint/config-conventional": "^17.6.3",
-    "@tsconfig/node18": "^2.0.1",
-    "@types/bcrypt": "^5.0.0",
-    "@types/jest": "^29.5.2",
-    "@types/node": "^18.17.5",
-    "@types/redis": "^4.0.11",
-    "@types/validator": "^13.11.1",
-    "@typescript-eslint/eslint-plugin": "^5.33.0",
-    "@typescript-eslint/parser": "^5.0.0",
-    "dotenv": "^16.1.4",
-    "eslint": "^8.40.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "husky": "^8.0.3",
-    "jest": "^29.5.0",
-    "jest-mock-extended": "^3.0.4",
-    "jest-sonar-reporter": "^2.0.0",
-    "lint-staged": "^13.2.2",
-    "prettier": "^2.7.1",
-    "prisma": "^4.14.0",
-    "redis-mock": "^0.56.3",
-    "sequelize-cli": "^6.6.2",
-    "ts-jest": "^29.1.0",
-    "ts-node": "^10.9.1",
-    "tsc-watch": "^5.0.3",
-    "tsconfig-paths": "^4.0.0",
-    "tslint": "^6.1.3",
-    "typescript": "^4.7.4"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "peerDependencies": {
-    "@tomei/activity-history": "^0.2.19",
-    "@tomei/config": "^0.3.12",
-    "@tomei/general": "^0.15.2",
-    "@tomei/mailer": "^0.5.15",
-    "argon2": "^0.30.3",
-    "cls-hooked": "^4.2.2",
-    "cuid": "^3.0.0",
-    "nodemailer": "^6.9.3",
-    "redis": "^4.6.7",
-    "reflect-metadata": "^0.1.13",
-    "sequelize": "^6.37.3",
-    "sequelize-typescript": "^2.1.6",
-    "speakeasy": "^2.0.0",
-    "uuid": "^10.0.0"
-  },
-  "lint-staged": {
-    "*/**/*.{js,ts,tsx}": [
-      "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
-      "eslint \"{src,apps,libs,test}/**/*.ts\" --fix"
-    ]
-  },
-  "jestSonar": {
-    "reportPath": "coverage",
-    "reportFile": "test-report.xml",
-    "indent": 2
-  }
-}
+{
+  "name": "@tomei/sso",
+  "version": "0.45.0",
+  "description": "Tomei SSO Package",
+  "main": "dist/index.js",
+  "scripts": {
+    "start:dev": "tsc -w",
+    "build": "tsc",
+    "prepare": "husky install",
+    "format": "prettier --write \"src/**/*.ts\"",
+    "lint": "npx eslint . --fix",
+    "test": "jest --forceExit --detectOpenHandles --coverage"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@gitlab.com/tomei-package/sso.git"
+  },
+  "keywords": [
+    "tomei",
+    "sso"
+  ],
+  "author": "Tomei",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://gitlab.com/tomei-package/sso/issues"
+  },
+  "homepage": "https://gitlab.com/tomei-package/sso#readme",
+  "devDependencies": {
+    "@commitlint/cli": "^17.6.3",
+    "@commitlint/config-conventional": "^17.6.3",
+    "@tsconfig/node18": "^2.0.1",
+    "@types/bcrypt": "^5.0.0",
+    "@types/jest": "^29.5.2",
+    "@types/node": "^18.17.5",
+    "@types/redis": "^4.0.11",
+    "@types/validator": "^13.11.1",
+    "@typescript-eslint/eslint-plugin": "^5.33.0",
+    "@typescript-eslint/parser": "^5.0.0",
+    "dotenv": "^16.1.4",
+    "eslint": "^8.40.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "husky": "^8.0.3",
+    "jest": "^29.5.0",
+    "jest-mock-extended": "^3.0.4",
+    "jest-sonar-reporter": "^2.0.0",
+    "lint-staged": "^13.2.2",
+    "prettier": "^2.7.1",
+    "prisma": "^4.14.0",
+    "redis-mock": "^0.56.3",
+    "sequelize-cli": "^6.6.2",
+    "ts-jest": "^29.1.0",
+    "ts-node": "^10.9.1",
+    "tsc-watch": "^5.0.3",
+    "tsconfig-paths": "^4.0.0",
+    "tslint": "^6.1.3",
+    "typescript": "^4.7.4"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "peerDependencies": {
+    "@tomei/activity-history": "^0.2.19",
+    "@tomei/config": "^0.3.12",
+    "@tomei/general": "^0.15.2",
+    "@tomei/mailer": "^0.5.15",
+    "argon2": "^0.30.3",
+    "cls-hooked": "^4.2.2",
+    "cuid": "^3.0.0",
+    "nodemailer": "^6.9.3",
+    "redis": "^4.6.7",
+    "reflect-metadata": "^0.1.13",
+    "sequelize": "^6.37.3",
+    "sequelize-typescript": "^2.1.6",
+    "speakeasy": "^2.0.0",
+    "uuid": "^10.0.0"
+  },
+  "lint-staged": {
+    "*/**/*.{js,ts,tsx}": [
+      "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
+      "eslint \"{src,apps,libs,test}/**/*.ts\" --fix"
+    ]
+  },
+  "jestSonar": {
+    "reportPath": "coverage",
+    "reportFile": "test-report.xml",
+    "indent": 2
+  }
+}

package/sampledotenv

@@ -1,8 +1,8 @@
-DATABASE_URL=
-SHADOW_DATABASE_URL=
-REDIS_URL=
-REDIS_PASSWORD=
-SMTP_HOST=
-SMTP_PORT=
-EMAIL_SENDER=
+DATABASE_URL=
+SHADOW_DATABASE_URL=
+REDIS_URL=
+REDIS_PASSWORD=
+SMTP_HOST=
+SMTP_PORT=
+EMAIL_SENDER=
 EMAIL_PASSWORD=

package/sonar-project.properties

@@ -1,23 +1,23 @@
-sonar.projectKey=all-tomei-projects_sso
-sonar.organization=all-tomei-projects
-sonar.exclusions=**/*.js,test-data,dist,coverage, node_modules, __tests__, **/*.spec.ts, __mocks__
-sonar.scm.provider=git
-
-sonar.sources=src
-sonar.test=__tests__
-sonar.test.inclusions=src/**/*.spec.ts
-
-sonar.javascript.lcov.reportPaths=./coverage/lcov.info
-sonar.testExecutionReportPaths=coverage/test-report.xml
-sonar.sourceEnconding=UTF-8
-
-# This is the name and version displayed in the SonarCloud UI.
-#sonar.projectName=sso
-#sonar.projectVersion=1.0
-
-
-# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
-#sonar.sources=.
-
-# Encoding of the source code. Default is default system encoding
+sonar.projectKey=all-tomei-projects_sso
+sonar.organization=all-tomei-projects
+sonar.exclusions=**/*.js,test-data,dist,coverage, node_modules, __tests__, **/*.spec.ts, __mocks__
+sonar.scm.provider=git
+
+sonar.sources=src
+sonar.test=__tests__
+sonar.test.inclusions=src/**/*.spec.ts
+
+sonar.javascript.lcov.reportPaths=./coverage/lcov.info
+sonar.testExecutionReportPaths=coverage/test-report.xml
+sonar.sourceEnconding=UTF-8
+
+# This is the name and version displayed in the SonarCloud UI.
+#sonar.projectName=sso
+#sonar.projectVersion=1.0
+
+
+# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
+#sonar.sources=.
+
+# Encoding of the source code. Default is default system encoding
 #sonar.sourceEncoding=UTF-8

package/src/components/group/group.ts

@@ -5,7 +5,7 @@ import { GroupTypeEnum } from 'enum';
 import { LoginUser } from '../login-user/login-user';
 import { IGroupSearchAttr } from '../../interfaces/group-search-attr.interface';
 import { ApplicationConfig } from '@tomei/config';
-import { Op } from 'sequelize';
+import { Op, Transaction } from 'sequelize';
 import { ActionEnum, Activity } from '@tomei/activity-history';
 import { GroupSystemAccessRepository } from '../group-system-access/group-system-access.repository';
 import SystemModel from '../../models/system.entity';
@@ -18,6 +18,10 @@ import GroupPrivilegeModel from '../../models/group-privilege.entity';
 import { GroupObjectPrivilegeRepository } from '../group-object-privilege/group-object-privilege.repository';
 import { GroupObjectPrivilege } from '../group-object-privilege/group-object-privilege';
 import { GroupPrivilege } from '../group-privilege/group-privilege';
+import { User } from '../login-user/user';
+import GroupReportingUserModel from '../../models/group-reporting-user.entity';
+import GroupModel from '../../models/group.entity';
+import UserModel from '../../models/user.entity';
 
 export class Group extends TreeNodeBase<Group> {
   ObjectId: string;
@@ -1900,4 +1904,62 @@ export class Group extends TreeNodeBase<Group> {
       return tree;
     }
   }
+
+  public static async getGroupsWithReportingUser(
+    loginUser: User, //The user performing the action.
+    dbTransaction: Transaction, //Active database transaction.
+    whereOptions: any, //The filter criteria for selecting groups.
+  ) {
+    try {
+      // Part 1: Privilege Checking
+      // Call loginUser.checkPrivileges() by passing:
+      // SystemCode: Retrieve from app config.
+      // PrivilegeCode: 'GROUP_VIEW'.
+      const systemCode =
+        ApplicationConfig.getComponentConfigValue('system-code');
+      const isPrivileged = await loginUser.checkPrivileges(
+        systemCode,
+        'GROUP_VIEW',
+      );
+      if (!isPrivileged) {
+        throw new ClassError(
+          'Group',
+          'GroupErrMsg04',
+          'User is not privileged to view group',
+        );
+      }
+      // Part 2: Prepare Group Query
+      // Call Group._Repo.findAll() to fetch groups from the sso_Group table by passing:
+      // where: whereOptions
+      // include:
+      // Model: sso_GroupReportingUsers
+      // where: { Status: 'Active' }
+      // include:
+      // Model: sso_User
+      // attributes: ['UserId', 'FullName']
+      // attributes: ['GroupCode', 'UserId', 'Rank']
+      const options = {
+        where: whereOptions,
+        include: [
+          {
+            model: GroupReportingUserModel,
+            where: { Status: 'Active' },
+            include: [
+              {
+                model: UserModel,
+                attributes: ['UserId', 'FullName'],
+              },
+            ],
+          },
+        ],
+        transaction: dbTransaction,
+      };
+      const groups = await Group._Repo.findAll(options);
+      // Part 3: Retrieve and Return
+      // Return the list of groups with nested reporting users.
+      return groups;
+    } catch (error) {
+      throw error;
+    }
+  }
 }

package/tsconfig.build.json

@@ -1,6 +1,6 @@
-{
-  "extends": "./tsconfig.json",
-  "include": ["**/*.ts"],
-  "exclude": ["node_modules", "__tests__", "dist", "**/*spec.ts"]
-}
+{
+  "extends": "./tsconfig.json",
+  "include": ["**/*.ts"],
+  "exclude": ["node_modules", "__tests__", "dist", "**/*spec.ts"]
+}
   

package/tsconfig.json

@@ -1,23 +1,23 @@
-{
-  "compilerOptions": {
-    "module": "commonjs",
-    "declaration": true,
-    "removeComments": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "allowSyntheticDefaultImports": true,
-    "moduleResolution": "node",
-    "target": "es6",
-    "sourceMap": true,
-    "outDir": "./dist",
-    "baseUrl": "./src",
-    "rootDir": "./",
-    "incremental": true,
-    "skipLibCheck": true,
-    "noImplicitAny": false,
-    "strictBindCallApply": false,
-    "forceConsistentCasingInFileNames": false,
-    "noFallthroughCasesInSwitch": false,
-    "strictNullChecks": false,
-  },
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "declaration": true,
+    "removeComments": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true,
+    "moduleResolution": "node",
+    "target": "es6",
+    "sourceMap": true,
+    "outDir": "./dist",
+    "baseUrl": "./src",
+    "rootDir": "./",
+    "incremental": true,
+    "skipLibCheck": true,
+    "noImplicitAny": false,
+    "strictBindCallApply": false,
+    "forceConsistentCasingInFileNames": false,
+    "noFallthroughCasesInSwitch": false,
+    "strictNullChecks": false,
+  },
 }