@tomei/sso 0.33.2 → 0.33.4

package/migrations/20240528063051-create-group-object-privilege-table.js

@@ -1,84 +1,84 @@
-'use strict';
-
-/** @type {import('sequelize-cli').Migration} */
-module.exports = {
-  async up(queryInterface, Sequelize) {
-    await queryInterface.createTable('sso_GroupObjectPrivilege', {
-      GroupObjectPrivilegeId: {
-        primaryKey: true,
-        type: Sequelize.INTEGER,
-        allowNull: false,
-        autoIncrement: true,
-      },
-      GroupCode: {
-        type: Sequelize.STRING(10),
-        allowNull: true,
-        references: {
-          model: 'sso_Group',
-          key: 'GroupCode',
-        },
-        onDelete: 'CASCADE',
-        onUpdate: 'CASCADE',
-      },
-      PrivilegeCode: {
-        type: Sequelize.STRING(10),
-        allowNull: false,
-        references: {
-          model: 'sso_SystemPrivilege',
-          key: 'PrivilegeCode',
-        },
-        onDelete: 'CASCADE',
-        onUpdate: 'CASCADE',
-      },
-      ObjectId: {
-        type: Sequelize.STRING,
-        allowNull: false,
-      },
-      ObjectType: {
-        type: Sequelize.STRING,
-        allowNull: false,
-      },
-      Status: {
-        type: Sequelize.STRING(10),
-        defaultValue: 'Active',
-        allowNull: false,
-      },
-      CreatedAt: {
-        allowNull: false,
-        defaultValue: Sequelize.literal('CURRENT_TIMESTAMP(3)'),
-        type: Sequelize.DATE,
-      },
-      CreatedById: {
-        type: Sequelize.INTEGER,
-        allowNull: true,
-        references: {
-          model: 'sso_User',
-          key: 'UserId',
-        },
-        onDelete: 'CASCADE',
-        onUpdate: 'CASCADE',
-      },
-      UpdatedAt: {
-        allowNull: false,
-        defaultValue: Sequelize.literal(
-          'CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)',
-        ),
-        type: Sequelize.DATE,
-      },
-      UpdatedById: {
-        type: Sequelize.INTEGER,
-        allowNull: true,
-        references: {
-          model: 'sso_User',
-          key: 'UserId',
-        },
-        onDelete: 'CASCADE',
-        onUpdate: 'CASCADE',
-      },
-    });
-  },
-
-  async down(queryInterface, Sequelize) {
-    await queryInterface.dropTable('sso_GroupObjectPrivilege');
-  },
-};
+'use strict';
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    await queryInterface.createTable('sso_GroupObjectPrivilege', {
+      GroupObjectPrivilegeId: {
+        primaryKey: true,
+        type: Sequelize.INTEGER,
+        allowNull: false,
+        autoIncrement: true,
+      },
+      GroupCode: {
+        type: Sequelize.STRING(10),
+        allowNull: true,
+        references: {
+          model: 'sso_Group',
+          key: 'GroupCode',
+        },
+        onDelete: 'CASCADE',
+        onUpdate: 'CASCADE',
+      },
+      PrivilegeCode: {
+        type: Sequelize.STRING(10),
+        allowNull: false,
+        references: {
+          model: 'sso_SystemPrivilege',
+          key: 'PrivilegeCode',
+        },
+        onDelete: 'CASCADE',
+        onUpdate: 'CASCADE',
+      },
+      ObjectId: {
+        type: Sequelize.STRING,
+        allowNull: false,
+      },
+      ObjectType: {
+        type: Sequelize.STRING,
+        allowNull: false,
+      },
+      Status: {
+        type: Sequelize.STRING(10),
+        defaultValue: 'Active',
+        allowNull: false,
+      },
+      CreatedAt: {
+        allowNull: false,
+        defaultValue: Sequelize.literal('CURRENT_TIMESTAMP(3)'),
+        type: Sequelize.DATE,
+      },
+      CreatedById: {
+        type: Sequelize.INTEGER,
+        allowNull: true,
+        references: {
+          model: 'sso_User',
+          key: 'UserId',
+        },
+        onDelete: 'CASCADE',
+        onUpdate: 'CASCADE',
+      },
+      UpdatedAt: {
+        allowNull: false,
+        defaultValue: Sequelize.literal(
+          'CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)',
+        ),
+        type: Sequelize.DATE,
+      },
+      UpdatedById: {
+        type: Sequelize.INTEGER,
+        allowNull: true,
+        references: {
+          model: 'sso_User',
+          key: 'UserId',
+        },
+        onDelete: 'CASCADE',
+        onUpdate: 'CASCADE',
+      },
+    });
+  },
+
+  async down(queryInterface, Sequelize) {
+    await queryInterface.dropTable('sso_GroupObjectPrivilege');
+  },
+};

package/migrations/20240528063107-create-user-object-privilege-table.js

@@ -1,83 +1,83 @@
-'use strict';
-
-/** @type {import('sequelize-cli').Migration} */
-module.exports = {
-  async up(queryInterface, Sequelize) {
-    await queryInterface.createTable('sso_UserObjectPrivilege', {
-      ObjectPrivilegeId: {
-        primaryKey: true,
-        type: Sequelize.INTEGER,
-        allowNull: false,
-        autoIncrement: true,
-      },
-      UserId: {
-        type: Sequelize.INTEGER,
-        allowNull: true,
-        references: {
-          model: 'sso_User',
-          key: 'UserId',
-        },
-        onDelete: 'CASCADE',
-        onUpdate: 'CASCADE',
-      },
-      PrivilegeCode: {
-        type: Sequelize.STRING(10),
-        allowNull: false,
-        references: {
-          model: 'sso_SystemPrivilege',
-          key: 'PrivilegeCode',
-        },
-        onDelete: 'CASCADE',
-        onUpdate: 'CASCADE',
-      },
-      ObjectId: {
-        type: Sequelize.STRING,
-        allowNull: false,
-      },
-      ObjectType: {
-        type: Sequelize.STRING,
-        allowNull: false,
-      },
-      Status: {
-        type: Sequelize.STRING(10),
-        defaultValue: 'Active',
-        allowNull: false,
-      },
-      CreatedAt: {
-        allowNull: false,
-        defaultValue: Sequelize.literal('CURRENT_TIMESTAMP(3)'),
-        type: Sequelize.DATE,
-      },
-      CreatedById: {
-        type: Sequelize.INTEGER,
-        allowNull: true,
-        references: {
-          model: 'sso_User',
-          key: 'UserId',
-        },
-        onDelete: 'CASCADE',
-        onUpdate: 'CASCADE',
-      },
-      UpdatedAt: {
-        allowNull: false,
-        defaultValue: Sequelize.literal('CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)'),
-        type: Sequelize.DATE,
-      },
-      UpdatedById: {
-        type: Sequelize.INTEGER,
-        allowNull: true,
-        references: {
-          model: 'sso_User',
-          key: 'UserId',
-        },
-        onDelete: 'CASCADE',
-        onUpdate: 'CASCADE',
-      },
-
-    });
-  },
-
-  async down(queryInterface, Sequelize) {
-    await queryInterface.dropTable('sso_UserObjectPrivilege');
-  }
-};
+'use strict';
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    await queryInterface.createTable('sso_UserObjectPrivilege', {
+      ObjectPrivilegeId: {
+        primaryKey: true,
+        type: Sequelize.INTEGER,
+        allowNull: false,
+        autoIncrement: true,
+      },
+      UserId: {
+        type: Sequelize.INTEGER,
+        allowNull: true,
+        references: {
+          model: 'sso_User',
+          key: 'UserId',
+        },
+        onDelete: 'CASCADE',
+        onUpdate: 'CASCADE',
+      },
+      PrivilegeCode: {
+        type: Sequelize.STRING(10),
+        allowNull: false,
+        references: {
+          model: 'sso_SystemPrivilege',
+          key: 'PrivilegeCode',
+        },
+        onDelete: 'CASCADE',
+        onUpdate: 'CASCADE',
+      },
+      ObjectId: {
+        type: Sequelize.STRING,
+        allowNull: false,
+      },
+      ObjectType: {
+        type: Sequelize.STRING,
+        allowNull: false,
+      },
+      Status: {
+        type: Sequelize.STRING(10),
+        defaultValue: 'Active',
+        allowNull: false,
+      },
+      CreatedAt: {
+        allowNull: false,
+        defaultValue: Sequelize.literal('CURRENT_TIMESTAMP(3)'),
+        type: Sequelize.DATE,
+      },
+      CreatedById: {
+        type: Sequelize.INTEGER,
+        allowNull: true,
+        references: {
+          model: 'sso_User',
+          key: 'UserId',
+        },
+        onDelete: 'CASCADE',
+        onUpdate: 'CASCADE',
+      },
+      UpdatedAt: {
+        allowNull: false,
+        defaultValue: Sequelize.literal('CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)'),
+        type: Sequelize.DATE,
+      },
+      UpdatedById: {
+        type: Sequelize.INTEGER,
+        allowNull: true,
+        references: {
+          model: 'sso_User',
+          key: 'UserId',
+        },
+        onDelete: 'CASCADE',
+        onUpdate: 'CASCADE',
+      },
+
+    });
+  },
+
+  async down(queryInterface, Sequelize) {
+    await queryInterface.dropTable('sso_UserObjectPrivilege');
+  }
+};

package/package.json

@@ -1,89 +1,89 @@
-{
-  "name": "@tomei/sso",
-  "version": "0.33.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",
-    "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.15",
-    "@tomei/config": "^0.3.10",
-    "@tomei/general": "^0.11.8",
-    "@tomei/mailer": "^0.5.13",
-    "@types/jest": "^29.5.2",
-    "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.32.1",
-    "sequelize-typescript": "^2.1.5",
-    "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.33.4",
+  "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",
+    "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.15",
+    "@tomei/config": "^0.3.10",
+    "@tomei/general": "^0.11.8",
+    "@tomei/mailer": "^0.5.13",
+    "@types/jest": "^29.5.2",
+    "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.32.1",
+    "sequelize-typescript": "^2.1.5",
+    "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

@@ -485,9 +485,7 @@ export class Group extends ObjectBase {
 
       if (Search) {
         Object.entries(Search).forEach(([key, value]) => {
-          queryObj[key] = {
-            [Op.eq]: value,
-          };
+          queryObj[key] = value;
         });
       }
 
@@ -502,14 +500,13 @@ export class Group extends ObjectBase {
           ...options,
           limit: Rows,
           offset: Rows * (Page - 1),
-          order: [
-            ['CreatedAt', 'DESC'],
-            ['Status', 'Active'],
-          ],
+          order: [['CreatedAt', 'DESC']],
         };
       }
 
-      const systemAccess = await Group._GroupSystemAccessRepo.findAndCountAll();
+      const systemAccess = await Group._GroupSystemAccessRepo.findAndCountAll(
+        options,
+      );
       return systemAccess;
     } catch (error) {
       return error;
@@ -620,20 +617,19 @@ export class Group extends ObjectBase {
             Number.MAX_SAFE_INTEGER,
             { SystemCode: SystemCodes[i] },
           );
-          console.log(CurrentGroupSystemAccess);
 
-          // if (false) {
-          //   throw new ClassError(
-          //     'Group',
-          //     'GroupErrMsg08',
-          //     'System access already exists',
-          //   );
-          // }
+          if (CurrentGroupSystemAccess?.count > 1) {
+            throw new ClassError(
+              'Group',
+              'GroupErrMsg08',
+              'System access already exists',
+            );
+          }
 
           const groupSystemAccess = await GroupSystemAccess.init(dbTransaction);
           groupSystemAccess.createId();
           groupSystemAccess.GroupCode = GroupCode;
-          groupSystemAccess.SystemCode = GroupCode;
+          groupSystemAccess.SystemCode = SystemCodes[i];
           groupSystemAccess.Status = 'Active';
           groupSystemAccess.CreatedById = +loginUser.ObjectId;
           groupSystemAccess.CreatedAt = new Date();
@@ -722,13 +718,13 @@ export class Group extends ObjectBase {
       );
 
       const EntityValueBefore = {
-        GroupCode: currentGroupSystemAccess.GroupCode,
-        SystemCode: currentGroupSystemAccess.SystemCode,
-        Status: currentGroupSystemAccess.Status,
-        CreatedById: currentGroupSystemAccess.CreatedById,
-        CreatedAt: currentGroupSystemAccess.CreatedAt,
-        UpdatedById: currentGroupSystemAccess.UpdatedById,
-        UpdatedAt: currentGroupSystemAccess.UpdatedAt,
+        GroupCode: currentGroupSystemAccess?.rows[0]?.GroupCode,
+        SystemCode: currentGroupSystemAccess?.rows[0]?.SystemCode,
+        Status: currentGroupSystemAccess?.rows[0]?.Status,
+        CreatedById: currentGroupSystemAccess?.rows[0]?.CreatedById,
+        CreatedAt: currentGroupSystemAccess?.rows[0]?.CreatedAt,
+        UpdatedById: currentGroupSystemAccess?.rows[0]?.UpdatedById,
+        UpdatedAt: currentGroupSystemAccess?.rows[0]?.UpdatedAt,
       };
 
       const activity = new Activity();
@@ -737,7 +733,7 @@ export class Group extends ObjectBase {
       activity.Description = 'Delete Group System Access';
       activity.EntityType = 'GroupSystemAccess';
       activity.EntityId =
-        currentGroupSystemAccess.GroupSystemAccessId?.toString();
+        currentGroupSystemAccess?.rows[0]?.GroupSystemAccessId?.toString();
       activity.EntityValueBefore = JSON.stringify(EntityValueBefore);
       activity.EntityValueAfter = JSON.stringify({});
 

package/src/models/group-system-access.entity.ts

@@ -20,6 +20,7 @@ import SystemModel from './system.entity';
 })
 export default class GroupSystemAccessModel extends Model {
   @Column({
+    autoIncrement: true,
     primaryKey: true,
     allowNull: false,
     type: DataType.INTEGER,