@lcap/nasl 0.3.10 → 0.3.11

package/src/types/permission/Permission.ts

@@ -0,0 +1,112 @@
+import { immutable } from '../decorators';
+import { View, Element } from '..';
+import permissionService from '../../service/permission';
+
+
+export class Permission {
+    /**
+     * App Name
+     */
+    @immutable()
+    public readonly domainName: string = undefined;
+    /**
+     * 上报权限后的资源id
+     */
+    @immutable()
+    public readonly resourceId: string = undefined;
+
+    /**
+     * 应用 id
+     */
+    @immutable()
+    public readonly serviceId: string = undefined;
+
+    /**
+     * view
+     */
+    @immutable()
+    public readonly view: View = undefined;
+
+    /**
+     * element
+     */
+    @immutable()
+    public readonly element: Element = undefined;
+
+    /**
+     * @param source 需要合并的部分参数
+     */
+    constructor(source?: Partial<Permission>) {
+        const { domainName } = source;
+        Object.assign(this, source);
+        if (!domainName) {
+            throw new Error('Permission need domainName!');
+        }
+    }
+
+    async createDefaultRoleFromRoleName(roleName: string) {
+        if (!roleName)
+            return;
+        return await permissionService.createRole({
+            body: {
+                name: roleName,
+                serviceId: this.serviceId,
+            },
+        });
+    }
+
+    async updateRoleName(roleId: string, roleName: string) {
+        return await permissionService.updateRole({
+            body: {
+                id: roleId,
+                name: roleName,
+                serviceId: this.serviceId,
+            }
+        })
+    }
+
+    /**
+     * 
+     * @param query {
+     *   resourceId
+     *   roleId
+     * }
+     */
+    async attachPermissionResource(query: Object) {
+        return await permissionService.attachPermissionResourceAction({ query });
+    }
+
+    async detachPermissionResource(query: Object) {
+        return await permissionService.detachPermissionResourceAction({ query });
+    }
+
+    async getInitRoles(resourceId: string) {
+        return await permissionService.getRoles({ 
+            query: { 
+                serviceId: this.serviceId, 
+                resourceId,
+            } 
+        });
+    }
+
+    async attachDevRole(resourceId: string) {
+        const data: any = await this.getInitRoles(resourceId)|| [];
+        let roleId;
+        data.forEach((item: any) => {
+            if (item.name === 'DEV-AdminRole') {
+                roleId = item.id;
+            }
+        })
+        // 获取权限树资源Id
+        if (roleId) {
+            // 默认角色开启
+            await this.attachPermissionResource({
+                resourceId,
+                roleId,
+            });
+            await this.getInitRoles(resourceId);
+        }
+    }
+}
+
+export default Permission;

package/src/types/process/ProcessParam.ts

@@ -62,10 +62,13 @@ export class ProcessParam extends Param {
             body,
         });
         this.assign(ProcessParam.from(result, this.process));
-        this.updateInterface();
+        await this.updateInterface();
 
         await config.defaultApp?.history.load();
         config.defaultApp?.emit('saved');
+
+        // 更新所有调用此Logic的LogicItem
+        // await this.process.launchProcessInterface.logic.callLogicUpdate();
         return this;
     }
     /**

package/src/types/utils/index.ts

@@ -4,6 +4,11 @@ export * from './logger';
 
 import { traverse } from './traverse';
 import { isBasicType } from '../';
+import { cloneDeep } from 'lodash';
+
+export function getGlobalEnv() {
+    return typeof window !== 'undefined' ? (window as any).appInfo.env : (global as any).appInfoEnv;
+}
 
 /**
  * 用 lodash 的 throttle 好像有点问题，先临时做个处理
@@ -58,21 +63,25 @@ export function resolveParameter(params: Array<ParamStruts>): resolvedParameter
     };
     let hasBody = false;
     let hasParam = false;
-    params.forEach((p) => {
-        if (p.in === 'body') {
+    params.forEach((p) => { 
+        const pcopy = cloneDeep(p);
+        if(pcopy.required) {
+            delete pcopy.defaultValue
+        }
+        if (pcopy.in === 'body') {
             hasBody = true;
-            requestBody.description.name = p.name;
-            if (!isBasicType(p.schema)) {
-                requestBody.content['application/json'] = p;
+            requestBody.description.name = pcopy.name;
+            if (!isBasicType(pcopy.schema)) {
+                requestBody.content['application/json'] = pcopy;
             } else {
                 requestBody.content['application/json'] = {
-                    schema: p.schema,
+                    schema: pcopy.schema,
                 };
             }
             requestBody.required = true;
         } else {
             hasParam = true;
-            parameters[p.name] = p;
+            parameters[pcopy.name] = pcopy;
         }
     });
     return {

package/out/test/units/config.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/out/test/units/config.spec.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const chai_1 = require("chai");
-const types_1 = require("../../types");
-describe('config', () => {
-    it('login successfully', async () => {
-        types_1.config.baseURL = 'http://defaulttenant.qa-ci.lcap.group';
-        const userInfo = await types_1.login('admin', 'Admin@123456');
-        chai_1.expect(userInfo.UserId).to.equal('28db2e05f7e54c3b90a9e41e5cfe2318');
-    });
-});
-//# sourceMappingURL=config.spec.js.map

package/out/test/units/config.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"config.spec.js","sourceRoot":"","sources":["../../../src/test/units/config.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,uCAA4C;AAE5C,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;IACpB,EAAE,CAAC,oBAAoB,EAAE,KAAK,IAAI,EAAE;QAChC,cAAM,CAAC,OAAO,GAAG,uCAAuC,CAAC;QACzD,MAAM,QAAQ,GAAG,MAAM,aAAK,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QACtD,aAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}