feat: add test cases for all objects and all operations except resour…

…ce.ts (#38) * chore(yarn.lock): update yarn.lock file by nodejs18 * test: add test cases for all objects and all operations
casdoor · Nov 1, 2023 · 3ab8905 · 3ab8905
1 parent adce747
commit 3ab8905
Show file tree

Hide file tree

Showing 42 changed files with 2,110 additions and 501 deletions.
diff --git a/public/casbinTest.svg b/public/casbinTest.svg
diff --git a/src/adapter.ts b/src/adapter.ts
@@ -21,17 +21,17 @@ export interface Adapter {
   name: string
   createdTime: string
 
-  type: string
-  databaseType: string
+  type?: string
+  databaseType?: string
   host: string
-  port: number
+  port?: number
   user: string
-  password: string
-  database: string
-  table: string
-  tableNamePrefix: string
+  password?: string
+  database?: string
+  table?: string
+  tableNamePrefix?: string
 
-  isEnabled: boolean
+  isEnabled?: boolean
 }
 
 export class AdapterSDK {
@@ -51,10 +51,8 @@ export class AdapterSDK {
     return (await this.request.get('/get-adapters', {
       params: {
         owner: this.config.orgName,
-        clientId: this.config.clientId,
-        clientSecret: this.config.clientSecret,
       },
-    })) as unknown as Promise<AxiosResponse<Adapter[]>>
+    })) as unknown as Promise<AxiosResponse<{ data: Adapter[] }>>
   }
 
   public async getAdapter(id: string) {
@@ -65,31 +63,23 @@ export class AdapterSDK {
     return (await this.request.get('/get-adapter', {
       params: {
         id: `${this.config.orgName}/${id}`,
-        clientId: this.config.clientId,
-        clientSecret: this.config.clientSecret,
       },
-    })) as unknown as Promise<AxiosResponse<Adapter>>
+    })) as unknown as Promise<AxiosResponse<{ data: Adapter }>>
   }
 
   public async modifyAdapter(method: string, adapter: Adapter) {
     if (!this.request) {
       throw new Error('request init failed')
     }
 
-    const url = this.config.endpoint + `/${method}`
+    const url = `/${method}`
     adapter.owner = this.config.orgName
-    const adapterInfo = JSON.stringify(adapter)
-    return (await this.request.post(
-      url,
-      { adapterInfo },
-      {
-        params: {
-          id: `${adapter.owner}/${adapter.name}`,
-          clientId: this.config.clientId,
-          clientSecret: this.config.clientSecret,
-        },
+
+    return (await this.request.post(url, adapter, {
+      params: {
+        id: `${adapter.owner}/${adapter.name}`,
       },
-    )) as unknown as Promise<AxiosResponse<Record<string, unknown>>>
+    })) as unknown as Promise<AxiosResponse<Record<string, unknown>>>
   }
 
   public async addAdapter(adapter: Adapter) {

diff --git a/src/application.ts b/src/application.ts
@@ -100,13 +100,6 @@ export class ApplicationSDK {
       params: {
         owner: 'admin',
       },
-      headers: {
-        Authorization:
-          'Basic ' +
-          Buffer.from(
-            `${this.config.clientId}:${this.config.clientSecret}`,
-          ).toString('base64'),
-      },
     })) as unknown as Promise<AxiosResponse<{ data: Application[] }>>
   }
 
@@ -119,13 +112,6 @@ export class ApplicationSDK {
       params: {
         id: `admin/${name}`,
       },
-      headers: {
-        Authorization:
-          'Basic ' +
-          Buffer.from(
-            `${this.config.clientId}:${this.config.clientSecret}`,
-          ).toString('base64'),
-      },
     })) as unknown as Promise<AxiosResponse<{ data: Application }>>
   }
 
@@ -140,13 +126,6 @@ export class ApplicationSDK {
       params: {
         id: `${application.owner}/${application.name}`,
       },
-      headers: {
-        Authorization:
-          'Basic ' +
-          Buffer.from(
-            `${this.config.clientId}:${this.config.clientSecret}`,
-          ).toString('base64'),
-      },
     })) as unknown as Promise<AxiosResponse<Record<string, unknown>>>
   }
 

diff --git a/src/cert.ts b/src/cert.ts
@@ -28,10 +28,10 @@ export interface Cert {
   bitSize: number
   expireInYears: number
 
-  certificate: string
-  privateKey: string
-  authorityPublicKey: string
-  authorityRootPublicKey: string
+  certificate?: string
+  privateKey?: string
+  authorityPublicKey?: string
+  authorityRootPublicKey?: string
 }
 
 export class CertSDK {
@@ -51,10 +51,8 @@ export class CertSDK {
     return (await this.request.get('/get-certs', {
       params: {
         owner: this.config.orgName,
-        clientId: this.config.clientId,
-        clientSecret: this.config.clientSecret,
       },
-    })) as unknown as Promise<AxiosResponse<Cert[]>>
+    })) as unknown as Promise<AxiosResponse<{ data: Cert[] }>>
   }
 
   public async getCert(id: string) {
@@ -65,31 +63,22 @@ export class CertSDK {
     return (await this.request.get('/get-cert', {
       params: {
         id: `${this.config.orgName}/${id}`,
-        clientId: this.config.clientId,
-        clientSecret: this.config.clientSecret,
       },
-    })) as unknown as Promise<AxiosResponse<Cert>>
+    })) as unknown as Promise<AxiosResponse<{ data: Cert }>>
   }
 
   public async modifyCert(method: string, cert: Cert) {
     if (!this.request) {
       throw new Error('request init failed')
     }
 
-    const url = this.config.endpoint + `/${method}`
+    const url = `/${method}`
     cert.owner = this.config.orgName
-    const certInfo = JSON.stringify(cert)
-    return (await this.request.post(
-      url,
-      { certInfo },
-      {
-        params: {
-          id: `${cert.owner}/${cert.name}`,
-          clientId: this.config.clientId,
-          clientSecret: this.config.clientSecret,
-        },
+    return (await this.request.post(url, cert, {
+      params: {
+        id: `${cert.owner}/${cert.name}`,
       },
-    )) as unknown as Promise<AxiosResponse<Record<string, unknown>>>
+    })) as unknown as Promise<AxiosResponse<Record<string, unknown>>>
   }
 
   public async addCert(cert: Cert) {

diff --git a/src/enforcer.ts b/src/enforcer.ts
@@ -20,13 +20,13 @@ export interface Enforcer {
   owner: string
   name: string
   createdTime: string
-  updatedTime: string
+  updatedTime?: string
   displayName: string
   description: string
 
   model: string
   adapter: string
-  isEnabled: boolean
+  isEnabled?: boolean
 
   // *casbin.Enforcer
 }
@@ -48,10 +48,8 @@ export class EnforcerSDK {
     return (await this.request.get('/get-enforcers', {
       params: {
         owner: this.config.orgName,
-        clientId: this.config.clientId,
-        clientSecret: this.config.clientSecret,
       },
-    })) as unknown as Promise<AxiosResponse<Enforcer[]>>
+    })) as unknown as Promise<AxiosResponse<{ data: Enforcer[] }>>
   }
 
   public async getEnforcer(id: string) {
@@ -62,10 +60,8 @@ export class EnforcerSDK {
     return (await this.request.get('/get-enforcer', {
       params: {
         id: `${this.config.orgName}/${id}`,
-        clientId: this.config.clientId,
-        clientSecret: this.config.clientSecret,
       },
-    })) as unknown as Promise<AxiosResponse<Enforcer>>
+    })) as unknown as Promise<AxiosResponse<{ data: Enforcer }>>
   }
 
   public async modifyEnforcer(method: string, enforcer: Enforcer) {
@@ -75,18 +71,11 @@ export class EnforcerSDK {
 
     const url = `/${method}`
     enforcer.owner = this.config.orgName
-    const enforcerInfo = JSON.stringify(enforcer)
-    return (await this.request.post(
-      url,
-      { enforcerInfo },
-      {
-        params: {
-          id: `${enforcer.owner}/${enforcer.name}`,
-          clientId: this.config.clientId,
-          clientSecret: this.config.clientSecret,
-        },
+    return (await this.request.post(url, enforcer, {
+      params: {
+        id: `${enforcer.owner}/${enforcer.name}`,
       },
-    )) as unknown as Promise<AxiosResponse<Record<string, unknown>>>
+    })) as unknown as Promise<AxiosResponse<Record<string, unknown>>>
   }
 
   public async addEnforcer(enforcer: Enforcer) {

diff --git a/src/group.ts b/src/group.ts
@@ -21,21 +21,21 @@ export interface Group {
   owner: string
   name: string
   createdTime: string
-  updatedTime: string
+  updatedTime?: string
 
   displayName: string
-  manager: string
-  contactEmail: string
-  type: string
-  parentId: string
-  isTopGroup: boolean
+  manager?: string
+  contactEmail?: string
+  type?: string
+  parentId?: string
+  isTopGroup?: boolean
   users?: User[]
 
   title?: string
   key?: string
   children?: Group[]
 
-  isEnabled: boolean
+  isEnabled?: boolean
 }
 
 export class GroupSDK {
@@ -55,10 +55,8 @@ export class GroupSDK {
     return (await this.request.get('/get-groups', {
       params: {
         owner: this.config.orgName,
-        clientId: this.config.clientId,
-        clientSecret: this.config.clientSecret,
       },
-    })) as unknown as Promise<AxiosResponse<Group[]>>
+    })) as unknown as Promise<AxiosResponse<{ data: Group[] }>>
   }
 
   public async getGroup(id: string) {
@@ -69,10 +67,8 @@ export class GroupSDK {
     return (await this.request.get('/get-group', {
       params: {
         id: `${this.config.orgName}/${id}`,
-        clientId: this.config.clientId,
-        clientSecret: this.config.clientSecret,
       },
-    })) as unknown as Promise<AxiosResponse<Group>>
+    })) as unknown as Promise<AxiosResponse<{ data: Group }>>
   }
 
   public async modifyGroup(method: string, group: Group) {
@@ -82,18 +78,11 @@ export class GroupSDK {
 
     const url = `/${method}`
     group.owner = this.config.orgName
-    const groupInfo = JSON.stringify(group)
-    return (await this.request.post(
-      url,
-      { groupInfo },
-      {
-        params: {
-          id: `${group.owner}/${group.name}`,
-          clientId: this.config.clientId,
-          clientSecret: this.config.clientSecret,
-        },
+    return (await this.request.post(url, group, {
+      params: {
+        id: `${group.owner}/${group.name}`,
       },
-    )) as unknown as Promise<AxiosResponse<Record<string, unknown>>>
+    })) as unknown as Promise<AxiosResponse<Record<string, unknown>>>
   }
 
   public async addGroup(group: Group) {