Merge pull request #48 from anthrax63/feature/new-typeorm

feat: update TypeORM version

package.json

@@ -27,11 +27,11 @@
     "rimraf": "^2.6.2",
     "ts-jest": "22.4.6",
     "tslint": "^5.11.0",
-    "typescript": "^3.1.3"
+    "typescript": "^4.7.3"
   },
   "dependencies": {
     "casbin": "^5.11.5",
-    "typeorm": "^0.2.29"
+    "typeorm": "^0.3.6"
   },
   "files": [
     "lib",
@@ -78,7 +78,7 @@
       "^.+\\.(ts|tsx)$": "ts-jest"
     },
     "testMatch": [
-      "**/test/*.+(ts|tsx)"
+      "**/test/*.test.+(ts|tsx)"
     ],
     "moduleFileExtensions": [
       "ts",

src/adapter.ts

@@ -250,7 +250,9 @@ export default class TypeORMAdapter implements FilteredAdapter {
     await getRepository(
       this.getCasbinRuleConstructor(),
       this.option.name,
-    ).delete(line);
+    ).delete({
+      ...line,
+    });
   }
 
   /**
@@ -314,7 +316,9 @@ export default class TypeORMAdapter implements FilteredAdapter {
     await getRepository(
       this.getCasbinRuleConstructor(),
       this.option.name,
-    ).delete(line);
+    ).delete({
+      ...line,
+    });
   }
 
   private getCasbinRuleConstructor(): CasbinRuleConstructor {

test/adapter.test.ts

@@ -14,6 +14,7 @@
 
 import { Enforcer, Util } from 'casbin';
 import TypeORMAdapter from '../src/index';
+import { connectionConfig } from './config';
 
 async function testGetPolicy(e: Enforcer, res: string[][]) {
   const myRes = await e.getPolicy();
@@ -31,15 +32,7 @@ async function testGetFilteredPolicy(e: Enforcer, res: string[]) {
 test(
   'TestAdapter',
   async () => {
-    const a = await TypeORMAdapter.newAdapter({
-      type: 'mysql',
-      host: 'localhost',
-      port: 3306,
-      username: 'root',
-      password: 'password',
-      database: 'casbin',
-      dropSchema: true,
-    });
+    const a = await TypeORMAdapter.newAdapter(connectionConfig);
     try {
       // Because the DB is empty at first,
       // so we need to load the policy from the file adapter (.CSV) first.

test/config.ts

@@ -0,0 +1,11 @@
+import { DataSourceOptions } from 'typeorm';
+
+export const connectionConfig: DataSourceOptions = {
+  type: 'mysql',
+  host: 'localhost',
+  port: parseInt(process.env.MYSQL_PORT, 10) || 3306,
+  username: process.env.MYSQL_USER || 'root',
+  password: process.env.MYSQL_PASSWORD !== undefined ? process.env.MYSQL_PASSWORD === '' ? undefined : process.env.MYSQL_PASSWORD : 'password',
+  database: process.env.MYSQL_DB || 'casbin',
+  dropSchema: true,
+};

test/existent-connection-adapter.test.ts

@@ -15,6 +15,7 @@
 import { Enforcer, Util } from 'casbin';
 import { createConnection } from 'typeorm';
 import TypeORMAdapter, { CasbinRule } from '../src/index';
+import { connectionConfig } from './config';
 
 async function testGetPolicy(e: Enforcer, res: string[][]) {
   const myRes = await e.getPolicy();
@@ -33,15 +34,9 @@ test(
   'TestAdapter',
   async () => {
     const connection = await createConnection({
-      type: 'mysql',
-      host: 'localhost',
-      port: 3306,
-      username: 'root',
-      password: 'password',
-      database: 'casbin',
+      ...connectionConfig,
       entities: [CasbinRule],
       synchronize: true,
-      dropSchema: true,
     });
     const a = await TypeORMAdapter.newAdapter({ connection });
     try {