@simitgroup/simpleapp-generator 2.0.2-u-alpha → 2.0.2-w-alpha
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ReleaseNote.md +14 -0
- package/dist/buildinschemas/autoincreament.d.ts +3 -0
- package/dist/buildinschemas/autoincreament.d.ts.map +1 -0
- package/dist/buildinschemas/autoincreament.js +39 -0
- package/dist/buildinschemas/autoincreament.js.map +1 -0
- package/dist/buildinschemas/docnoformat.d.ts +3 -0
- package/dist/buildinschemas/docnoformat.d.ts.map +1 -0
- package/dist/buildinschemas/docnoformat.js +58 -0
- package/dist/buildinschemas/docnoformat.js.map +1 -0
- package/dist/buildinschemas/documentevent.d.ts +3 -0
- package/dist/buildinschemas/documentevent.d.ts.map +1 -0
- package/dist/buildinschemas/documentevent.js +48 -0
- package/dist/buildinschemas/documentevent.js.map +1 -0
- package/dist/buildinschemas/webhooklog.d.ts +3 -0
- package/dist/buildinschemas/webhooklog.d.ts.map +1 -0
- package/dist/buildinschemas/webhooklog.js +79 -0
- package/dist/buildinschemas/webhooklog.js.map +1 -0
- package/dist/framework.d.ts.map +1 -1
- package/dist/framework.js +8 -18
- package/dist/framework.js.map +1 -1
- package/dist/generate.d.ts.map +1 -1
- package/dist/generate.js +8 -18
- package/dist/generate.js.map +1 -1
- package/dist/index.js +7 -17
- package/dist/index.js.map +1 -1
- package/dist/libs.d.ts.map +1 -1
- package/dist/processors/bpmnbuilder.d.ts.map +1 -1
- package/dist/processors/bpmnbuilder.js +7 -17
- package/dist/processors/bpmnbuilder.js.map +1 -1
- package/dist/processors/jrxmlbuilder.d.ts.map +1 -1
- package/dist/processors/jrxmlbuilder.js +7 -17
- package/dist/processors/jrxmlbuilder.js.map +1 -1
- package/dist/processors/jsonschemabuilder.d.ts.map +1 -1
- package/dist/processors/jsonschemabuilder.js.map +1 -1
- package/package.json +1 -1
- package/templates/nest/src/simple-app/_core/features/mini-app/mini-app-manager/mini-app-manager.controller.ts.eta +2 -3
- package/templates/nest/src/simple-app/_core/features/profile/profile.controller.ts.eta +6 -6
- package/templates/nest/src/simple-app/_core/features/profile/profile.schema.ts.eta +36 -4
- package/templates/nest/src/simple-app/_core/features/user-context/user-context.type.ts.eta +43 -13
- package/templates/nest/src/simple-app/_core/features/user-context/user.context.ts.eta +57 -37
- package/templates/nest/src/simple-app/_core/framework/schemas/simple-app.schema.ts.eta +4 -3
- package/templates/nest/src/simple-app/_core/utils/dayjs.ts.eta +14 -9
- package/templates/nuxt/app.vue.eta +46 -47
- package/templates/nuxt/plugins/10.simpleapp-event.ts.eta +102 -90
- package/templates/nuxt/plugins/20.simpleapp-userstore.ts.eta +70 -52
- package/templates/nuxt/server/api/profile/[...].ts.eta +153 -160
- package/templates/nuxt/server/api/profile/index.ts.eta +11 -12
package/dist/libs.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"libs.d.ts","sourceRoot":"","sources":["../src/libs.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,qBAAqB,
|
|
1
|
+
{"version":3,"file":"libs.d.ts","sourceRoot":"","sources":["../src/libs.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,qBAAqB,QAAS,MAAM,WAI9C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bpmnbuilder.d.ts","sourceRoot":"","sources":["../../src/processors/bpmnbuilder.ts"],"names":[],"mappings":"AASA,eAAO,MAAO,iBAAiB,
|
|
1
|
+
{"version":3,"file":"bpmnbuilder.d.ts","sourceRoot":"","sources":["../../src/processors/bpmnbuilder.ts"],"names":[],"mappings":"AASA,eAAO,MAAO,iBAAiB,yBAAyB,MAAM,EAAE,sBAiJ7D,CAAA"}
|
|
@@ -15,23 +15,13 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
-
var __importStar = (this && this.__importStar) ||
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
return ownKeys(o);
|
|
26
|
-
};
|
|
27
|
-
return function (mod) {
|
|
28
|
-
if (mod && mod.__esModule) return mod;
|
|
29
|
-
var result = {};
|
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
-
__setModuleDefault(result, mod);
|
|
32
|
-
return result;
|
|
33
|
-
};
|
|
34
|
-
})();
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
35
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
27
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bpmnbuilder.js","sourceRoot":"","sources":["../../src/processors/bpmnbuilder.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bpmnbuilder.js","sourceRoot":"","sources":["../../src/processors/bpmnbuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jrxmlbuilder.d.ts","sourceRoot":"","sources":["../../src/processors/jrxmlbuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAM5C,eAAO,MAAO,mBAAmB,
|
|
1
|
+
{"version":3,"file":"jrxmlbuilder.d.ts","sourceRoot":"","sources":["../../src/processors/jrxmlbuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAM5C,eAAO,MAAO,mBAAmB,+BAA+B,iBAAiB,EAAE,kBAwBlF,CAAA"}
|
|
@@ -15,23 +15,13 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
-
var __importStar = (this && this.__importStar) ||
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
return ownKeys(o);
|
|
26
|
-
};
|
|
27
|
-
return function (mod) {
|
|
28
|
-
if (mod && mod.__esModule) return mod;
|
|
29
|
-
var result = {};
|
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
-
__setModuleDefault(result, mod);
|
|
32
|
-
return result;
|
|
33
|
-
};
|
|
34
|
-
})();
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
35
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
26
|
exports.generatePrintformat = void 0;
|
|
37
27
|
const fs_1 = require("fs");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jrxmlbuilder.js","sourceRoot":"","sources":["../../src/processors/jrxmlbuilder.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"jrxmlbuilder.js","sourceRoot":"","sources":["../../src/processors/jrxmlbuilder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2BAA0D;AAC1D,uDAAwC;AAExC,iCAAwC;AAExC,MAAM,GAAG,GAAoB,IAAI,cAAM,EAAE,CAAC;AAE1C,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;AACxB,MAAO,mBAAmB,GAAG,KAAK,EAAE,OAAO,EAAC,YAAgC,EAAE,EAAE;IAEnF,sDAAsD;IACtD,MAAM,oBAAoB,GAAG,GAAG,SAAS,CAAC,WAAW,mCAAmC,CAAA;IACxF,0DAA0D;IAE1D,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC;QAChB,KAAK,EAAE,GAAG;QAEV,cAAc,EAAE,gBAAgB,EAAE;KACrC,CAAC,CAAC;IACH,IAAG,OAAO,CAAC,cAAc,IAAI,YAAY,EAAC;QACtC,IAAA,cAAS,EAAC,OAAO,CAAC,cAAc,EAAC,EAAC,SAAS,EAAC,IAAI,EAAC,CAAC,CAAA;QAClD,KAAI,IAAI,CAAC,GAAC,CAAC,EAAC,CAAC,GAAC,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAC;YACnC,MAAM,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC,CAAA;YAC9B,MAAM,UAAU,GAAG,GAAG,OAAO,CAAC,cAAc,IAAI,MAAM,CAAC,QAAQ,QAAQ,CAAC;YACxE,wCAAwC;YACxC,IAAG,CAAC,IAAA,eAAU,EAAC,UAAU,CAAC,EAAC;gBACvB,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAA;gBAC5D,IAAA,kBAAa,EAAC,UAAU,EAAC,WAAW,CAAC,CAAC;aACzC;SAEJ;KACJ;AACL,CAAC,CAAA;AAxBa,QAAA,mBAAmB,uBAwBhC;AAGD,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,sFAAsF;IACrH,kIAAkI;IAClI,0IAA0I,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsonschemabuilder.d.ts","sourceRoot":"","sources":["../../src/processors/jsonschemabuilder.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EAKZ,MAAM,aAAa,CAAC;AAUrB,OAAO,EAGL,WAAW,EAIZ,MAAM,SAAS,CAAC;AAIjB,eAAO,MAAM,qBAAqB,
|
|
1
|
+
{"version":3,"file":"jsonschemabuilder.d.ts","sourceRoot":"","sources":["../../src/processors/jsonschemabuilder.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EAKZ,MAAM,aAAa,CAAC;AAUrB,OAAO,EAGL,WAAW,EAIZ,MAAM,SAAS,CAAC;AAIjB,eAAO,MAAM,qBAAqB,YACvB,MAAM,eACF,WAAW,yBAwHzB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsonschemabuilder.js","sourceRoot":"","sources":["../../src/processors/jsonschemabuilder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"jsonschemabuilder.js","sourceRoot":"","sources":["../../src/processors/jsonschemabuilder.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,15 +1,14 @@
|
|
|
1
1
|
import { Body, Controller, Get, Param, Post, Put } from '@nestjs/common';
|
|
2
|
-
import {
|
|
2
|
+
import { ApiBody, ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
|
|
3
3
|
|
|
4
|
-
import { AppUser } from 'src/simple-app/_core/features/user-context/appuser.decorator';
|
|
5
4
|
import { Roles } from 'src/simple-app/_core/features/auth/role-guard/roles.decorator';
|
|
6
5
|
import { Role } from 'src/simple-app/_core/features/auth/role-guard/roles.enum';
|
|
6
|
+
import { AppUser } from 'src/simple-app/_core/features/user-context/appuser.decorator';
|
|
7
7
|
import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
|
|
8
8
|
|
|
9
9
|
import * as schemas from '../dto';
|
|
10
10
|
import { MiniAppManagerBridgeService } from './mini-app-manager-bridge.service';
|
|
11
11
|
|
|
12
|
-
|
|
13
12
|
@ApiTags('MINIAPPMANAGER')
|
|
14
13
|
@Controller('mini-app-manager')
|
|
15
14
|
export class MiniAppManagerController {
|
|
@@ -3,14 +3,14 @@
|
|
|
3
3
|
* MODIFICATION OVERRIDE BY GENERATEOR
|
|
4
4
|
* Author: Ks Tan
|
|
5
5
|
*/
|
|
6
|
-
import {
|
|
6
|
+
import { Body, Controller, Get, HttpException, HttpStatus, Logger, Param, Post } from '@nestjs/common';
|
|
7
|
+
import { ApiBody, ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
|
|
7
8
|
import { Roles } from '../auth/role-guard/roles.decorator';
|
|
8
9
|
import { Role } from '../auth/role-guard/roles.enum';
|
|
9
|
-
import {
|
|
10
|
+
import { AppUser } from '../user-context/appuser.decorator';
|
|
10
11
|
import { UserContext } from '../user-context/user.context';
|
|
12
|
+
import { KeyValue, RegTenant, TenantPermission, UserContextInfo } from './profile.schema';
|
|
11
13
|
import { ProfileService } from './profile.service';
|
|
12
|
-
import { AppUser } from '../user-context/appuser.decorator';
|
|
13
|
-
import { UserContextInfo, TenantPermission, RegTenant, KeyValue } from './profile.schema';
|
|
14
14
|
@ApiTags('PROFILE')
|
|
15
15
|
@Controller('/profile')
|
|
16
16
|
export class ProfileController {
|
|
@@ -34,8 +34,8 @@ export class ProfileController {
|
|
|
34
34
|
async getProfile(@AppUser() appUser: UserContext) {
|
|
35
35
|
this.logger.debug(`access getProfile API by ${appUser.getUid()},(${appUser.getId()})`);
|
|
36
36
|
const result = await this.profileservice.getProfile(appUser);
|
|
37
|
-
this.logger.debug('getProfile result is:');
|
|
38
|
-
this.logger.debug(result);
|
|
37
|
+
// this.logger.debug('getProfile result is:');
|
|
38
|
+
// this.logger.debug(result);
|
|
39
39
|
if (result) {
|
|
40
40
|
return result;
|
|
41
41
|
} else {
|
|
@@ -1,11 +1,40 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { TenantHealthStatusEnum } from '@core-features/user-context/user-context.enum';
|
|
2
|
+
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
|
|
3
3
|
import { Branch } from 'src/simple-app/_core/resources/branch/branch.schema';
|
|
4
|
-
import { Permission } from 'src/simple-app/_core/resources/permission/permission.schema';
|
|
5
|
-
import { Role } from '../auth/role-guard/roles.enum';
|
|
6
4
|
import { Organization } from '../../resources/organization/organization.schema';
|
|
7
5
|
import { Tenant } from '../../resources/tenant/tenant.schema';
|
|
6
|
+
import { Role } from '../auth/role-guard/roles.enum';
|
|
8
7
|
export { KeyValue } from '../../framework/schemas';
|
|
8
|
+
|
|
9
|
+
export class TenantHealth {
|
|
10
|
+
@ApiProperty({ enum: TenantHealthStatusEnum })
|
|
11
|
+
status: TenantHealthStatusEnum;
|
|
12
|
+
|
|
13
|
+
@ApiProperty({ type: String })
|
|
14
|
+
message: string;
|
|
15
|
+
|
|
16
|
+
@ApiProperty({ type: Boolean })
|
|
17
|
+
isLicenseRenewable: boolean;
|
|
18
|
+
|
|
19
|
+
@ApiProperty({ type: Boolean, description: 'Decide subscription portal allowed downgrade or not. Downgrade effect next renewal' })
|
|
20
|
+
isLicenseDowngradable: boolean;
|
|
21
|
+
|
|
22
|
+
@ApiProperty({ type: Boolean, description: 'Cancel effect immediatly' })
|
|
23
|
+
isLicenseCancellable: boolean;
|
|
24
|
+
|
|
25
|
+
@ApiProperty({ type: Boolean })
|
|
26
|
+
isLicenseUpgradable: boolean;
|
|
27
|
+
|
|
28
|
+
@ApiProperty({ type: Boolean })
|
|
29
|
+
isLicenseAddOnAllowed: boolean;
|
|
30
|
+
|
|
31
|
+
@ApiPropertyOptional({ type: String })
|
|
32
|
+
localGracePeriodStartDate?: string;
|
|
33
|
+
|
|
34
|
+
@ApiPropertyOptional({ type: String })
|
|
35
|
+
localGracePeriodEndDate?: string;
|
|
36
|
+
}
|
|
37
|
+
|
|
9
38
|
export class UserContextInfo {
|
|
10
39
|
@ApiProperty({ type: String })
|
|
11
40
|
_id: string;
|
|
@@ -68,6 +97,9 @@ export class UserContextInfo {
|
|
|
68
97
|
|
|
69
98
|
@ApiProperty({ type: () => Object, description: 'Store all the rest of useful fields regarding user or branch' })
|
|
70
99
|
moreProps?: Record<string, any>;
|
|
100
|
+
|
|
101
|
+
@ApiProperty({ type: () => TenantHealth, required: false })
|
|
102
|
+
tenantHealth?: TenantHealth;
|
|
71
103
|
}
|
|
72
104
|
|
|
73
105
|
export class ProfileUserInvites {
|
|
@@ -1,15 +1,45 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
uid?: string;
|
|
4
|
-
uname?: string;
|
|
5
|
-
fullName?: string;
|
|
6
|
-
email?: string;
|
|
7
|
-
timeZone?: string;
|
|
8
|
-
currency?: string;
|
|
9
|
-
country?: string;
|
|
10
|
-
offsetMinute?: number;
|
|
11
|
-
tenantId?:number;
|
|
12
|
-
orgId?:number;
|
|
13
|
-
branchId?:number;
|
|
1
|
+
import { ProfileUserBranch } from 'src/simple-app/_core/features/profile/profile.schema';
|
|
2
|
+
import { Role } from '../auth/role-guard/roles.enum';
|
|
14
3
|
|
|
4
|
+
export type BaseUserContext = {
|
|
5
|
+
_id?: string;
|
|
6
|
+
uid?: string;
|
|
7
|
+
uname?: string;
|
|
8
|
+
fullName?: string;
|
|
9
|
+
email?: string;
|
|
10
|
+
timeZone?: string;
|
|
11
|
+
currency?: string;
|
|
12
|
+
country?: string;
|
|
13
|
+
offsetMinute?: number;
|
|
14
|
+
tenantId?: number;
|
|
15
|
+
orgId?: number;
|
|
16
|
+
branchId?: number;
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
export type RoleGroupResolver = () => Role[];
|
|
20
|
+
|
|
21
|
+
export type EnvEmailFieldKey = 'adminEmails' | 'billingEmails' | 'supportEmails';
|
|
22
|
+
|
|
23
|
+
export interface TenantPermissionAggregatePerm {
|
|
24
|
+
_id?: string;
|
|
25
|
+
tenantId?: number;
|
|
26
|
+
orgId?: number;
|
|
27
|
+
branchId?: number;
|
|
28
|
+
groups?: string[];
|
|
29
|
+
branch?: ProfileUserBranch['branch'];
|
|
30
|
+
organization?: {
|
|
31
|
+
_id?: string;
|
|
32
|
+
[key: string]: unknown;
|
|
15
33
|
};
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
export interface TenantPermissionAggregateRow {
|
|
37
|
+
tenantName?: string;
|
|
38
|
+
perms?: TenantPermissionAggregatePerm[];
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
export const ENV_EMAIL_ROLE_MAP: Record<EnvEmailFieldKey, Role> = {
|
|
42
|
+
adminEmails: Role.SuperAdmin,
|
|
43
|
+
billingEmails: Role.DevBilling,
|
|
44
|
+
supportEmails: Role.DevSupport,
|
|
45
|
+
};
|
|
@@ -6,32 +6,31 @@
|
|
|
6
6
|
* 2.
|
|
7
7
|
*/
|
|
8
8
|
import Base64URL from '@darkwolf/base64url';
|
|
9
|
-
import { isEmpty } from 'lodash';
|
|
10
|
-
import { Request } from 'express';
|
|
11
|
-
import { InjectModel } from '@nestjs/mongoose';
|
|
12
9
|
import { BadRequestException, ForbiddenException, Injectable, Logger, Scope } from '@nestjs/common';
|
|
10
|
+
import { Request } from 'express';
|
|
13
11
|
import * as jwt from 'jsonwebtoken';
|
|
12
|
+
import { isEmpty } from 'lodash';
|
|
14
13
|
import { ClientSession, Model, PipelineStage } from 'mongoose';
|
|
15
14
|
|
|
16
15
|
// import { Branch, Organization, Permission, Tenant, TenantClientSetting, User, Appintegration, Webhook, Miniappinstallation, TUserType, TMiniApiTokenInfo } from 'src/simpleapp/generate/types';
|
|
17
|
-
import {
|
|
16
|
+
import { TMiniApiTokenInfo, TUserType } from 'src/simple-app/_core/framework/schemas';
|
|
18
17
|
import { MiniAppInstallation } from 'src/simple-app/_core/resources/mini-app-installation/mini-app-installation.schema';
|
|
19
18
|
|
|
20
|
-
import { Tenant, TenantClientSetting } from 'src/simple-app/_core/resources/tenant/tenant.schema';
|
|
21
19
|
import { Organization } from 'src/simple-app/_core/resources/organization/organization.schema';
|
|
22
|
-
import {
|
|
20
|
+
import { Tenant, TenantClientSetting } from 'src/simple-app/_core/resources/tenant/tenant.schema';
|
|
23
21
|
|
|
24
|
-
import {
|
|
25
|
-
import {
|
|
22
|
+
import { Environment } from '@core-features/maintenance/schemas';
|
|
23
|
+
import { TenantLicenseEnum } from '@resources/tenant/tenant.enum';
|
|
24
|
+
import { ProfileUserBranch, TenantHealth, TenantPermission, UserContextInfo } from 'src/simple-app/_core/features/profile/profile.schema';
|
|
26
25
|
import { Webhook } from 'src/simple-app/_core/features/webhook/schemas';
|
|
27
|
-
import {
|
|
26
|
+
import { Permission, StepData } from 'src/simple-app/_core/resources/permission/permission.schema';
|
|
27
|
+
import { User } from 'src/simple-app/_core/resources/user/user.schema';
|
|
28
28
|
import { ModifiedRecords } from '../../framework/schemas';
|
|
29
|
+
import { SimpleAppDbRevertService } from '../../framework/simple-app-db-revert.service';
|
|
29
30
|
import { Role } from '../auth/role-guard/roles.enum';
|
|
30
|
-
import { Environment } from '@core-features/maintenance/schemas';
|
|
31
31
|
import * as rolegroups from '../auth/role-guard/roles.group';
|
|
32
|
-
import {
|
|
33
|
-
import {
|
|
34
|
-
import { StepData } from 'src/simple-app/_core/resources/permission/permission.schema';
|
|
32
|
+
import { TenantHealthStatusEnum } from './user-context.enum';
|
|
33
|
+
import { ENV_EMAIL_ROLE_MAP, EnvEmailFieldKey, RoleGroupResolver, TenantPermissionAggregateRow } from './user-context.type';
|
|
35
34
|
|
|
36
35
|
// import systemWebHooks from '../../webhooks';
|
|
37
36
|
@Injectable({ scope: Scope.REQUEST })
|
|
@@ -136,6 +135,16 @@ export class UserContext extends UserContextInfo {
|
|
|
136
135
|
|
|
137
136
|
protected userType: TUserType = 'normal';
|
|
138
137
|
|
|
138
|
+
tenantHealth?: TenantHealth = {
|
|
139
|
+
status: TenantHealthStatusEnum.ACTIVE,
|
|
140
|
+
message: 'User context initial',
|
|
141
|
+
isLicenseRenewable: false,
|
|
142
|
+
isLicenseDowngradable: false,
|
|
143
|
+
isLicenseCancellable: false,
|
|
144
|
+
isLicenseUpgradable: true,
|
|
145
|
+
isLicenseAddOnAllowed: false,
|
|
146
|
+
};
|
|
147
|
+
|
|
139
148
|
constructor(
|
|
140
149
|
private readonly userModel: Model<User>,
|
|
141
150
|
private readonly permModel: Model<Permission>,
|
|
@@ -215,7 +224,7 @@ export class UserContext extends UserContextInfo {
|
|
|
215
224
|
|
|
216
225
|
setLicense = (license: TenantLicenseEnum) => {
|
|
217
226
|
if (!this.tenantInfo) {
|
|
218
|
-
this.tenantInfo = {} as
|
|
227
|
+
this.tenantInfo = {} as Tenant;
|
|
219
228
|
}
|
|
220
229
|
|
|
221
230
|
this.tenantInfo.license = license;
|
|
@@ -260,6 +269,10 @@ export class UserContext extends UserContextInfo {
|
|
|
260
269
|
this.offsetMinute = offsetMinute;
|
|
261
270
|
};
|
|
262
271
|
|
|
272
|
+
setTenantHealth = (data: TenantHealth) => {
|
|
273
|
+
this.tenantHealth = data;
|
|
274
|
+
};
|
|
275
|
+
|
|
263
276
|
// async obtainNoTenantProfile() {
|
|
264
277
|
// const pipelines: PipelineStage[] = [{ $match: { uid: this.uid, tenantId: this.tenantId } }];
|
|
265
278
|
// try {
|
|
@@ -288,8 +301,8 @@ export class UserContext extends UserContextInfo {
|
|
|
288
301
|
// return this.obtainNoTenantProfile();
|
|
289
302
|
// }
|
|
290
303
|
const pipelines: PipelineStage[] = [
|
|
291
|
-
//get profile
|
|
292
|
-
{ $match: { uid: this.uid, tenantId: this.tenantId } },
|
|
304
|
+
//get profile (inactive users must not load org/branch/groups)
|
|
305
|
+
{ $match: { uid: this.uid, tenantId: this.tenantId, active: { $ne: false } } },
|
|
293
306
|
{
|
|
294
307
|
$lookup: {
|
|
295
308
|
from: 'tenant',
|
|
@@ -497,7 +510,7 @@ export class UserContext extends UserContextInfo {
|
|
|
497
510
|
},
|
|
498
511
|
];
|
|
499
512
|
|
|
500
|
-
const userProfiles
|
|
513
|
+
const userProfiles = await this.userModel.aggregate<UserContextInfo>(pipelines).exec();
|
|
501
514
|
return userProfiles[0];
|
|
502
515
|
}
|
|
503
516
|
|
|
@@ -539,7 +552,7 @@ export class UserContext extends UserContextInfo {
|
|
|
539
552
|
});
|
|
540
553
|
this.branches = userProfile['branches'];
|
|
541
554
|
this.groups = userProfile['groups'] ?? [];
|
|
542
|
-
this.clientSetting = userProfile
|
|
555
|
+
this.clientSetting = userProfile.tenantInfo?.clientSetting ?? {
|
|
543
556
|
auditTrail: false,
|
|
544
557
|
disableClassReminder: true,
|
|
545
558
|
webhook: false,
|
|
@@ -552,24 +565,24 @@ export class UserContext extends UserContextInfo {
|
|
|
552
565
|
}
|
|
553
566
|
if (this.tenantInfo?.company && this.tenantInfo.company.billUserEmail === this.email) {
|
|
554
567
|
this.roles.push(Role.Billing);
|
|
568
|
+
this.roles.push(Role.Tenant_search);
|
|
569
|
+
this.roles.push(Role.TenantInvoice_search);
|
|
555
570
|
}
|
|
556
571
|
if (systemEnv) {
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
};
|
|
563
|
-
for (const f of Object.keys(emailFields)) {
|
|
564
|
-
if (Array.isArray(systemEnv[f]) && systemEnv[f].includes(this.email) && !this.roles.includes(Role[emailFields[f]])) {
|
|
565
|
-
this.roles.push(Role[emailFields[f]]);
|
|
572
|
+
for (const f of Object.keys(ENV_EMAIL_ROLE_MAP) as EnvEmailFieldKey[]) {
|
|
573
|
+
const emails = systemEnv[f];
|
|
574
|
+
const targetRole = ENV_EMAIL_ROLE_MAP[f];
|
|
575
|
+
if (Array.isArray(emails) && emails.includes(this.email) && !this.roles.includes(targetRole)) {
|
|
576
|
+
this.roles.push(targetRole);
|
|
566
577
|
}
|
|
567
578
|
}
|
|
568
579
|
}
|
|
569
580
|
|
|
570
581
|
// console.log('this.roles', this.roles);
|
|
571
582
|
for (const group of this.groups) {
|
|
572
|
-
const
|
|
583
|
+
const roleResolver = (rolegroups as Record<string, RoleGroupResolver | undefined>)[group];
|
|
584
|
+
if (!roleResolver) continue;
|
|
585
|
+
const roles: Role[] = roleResolver();
|
|
573
586
|
//(<() => Role[]>rolegroups[group])();
|
|
574
587
|
for (let r = 0; r < roles.length; r++) {
|
|
575
588
|
if (!this.roles.includes(roles[r])) {
|
|
@@ -797,6 +810,7 @@ export class UserContext extends UserContextInfo {
|
|
|
797
810
|
branches: this.getBranches(),
|
|
798
811
|
invites: this.getInvites(),
|
|
799
812
|
moreProps: this.moreProps,
|
|
813
|
+
tenantHealth: this.tenantHealth,
|
|
800
814
|
};
|
|
801
815
|
return result;
|
|
802
816
|
}
|
|
@@ -887,6 +901,8 @@ export class UserContext extends UserContextInfo {
|
|
|
887
901
|
tenantId: {
|
|
888
902
|
$gt: 0,
|
|
889
903
|
},
|
|
904
|
+
// Inactive user rows must not appear on pick-tenant / org switcher
|
|
905
|
+
active: { $ne: false },
|
|
890
906
|
},
|
|
891
907
|
},
|
|
892
908
|
{
|
|
@@ -964,10 +980,10 @@ export class UserContext extends UserContextInfo {
|
|
|
964
980
|
},
|
|
965
981
|
];
|
|
966
982
|
|
|
967
|
-
const datas = await this.userModel.aggregate(pipelines);
|
|
983
|
+
const datas = await this.userModel.aggregate<TenantPermissionAggregateRow>(pipelines);
|
|
968
984
|
for (const r of datas) {
|
|
969
985
|
const perms: ProfileUserBranch[] = [];
|
|
970
|
-
for (const p of r.perms) {
|
|
986
|
+
for (const p of r.perms ?? []) {
|
|
971
987
|
perms.push({
|
|
972
988
|
permissionId: p._id,
|
|
973
989
|
tenantId: p.tenantId,
|
|
@@ -1039,7 +1055,7 @@ export class UserContext extends UserContextInfo {
|
|
|
1039
1055
|
const pipeLine: PipelineStage[] = [{ $match: { tenantId: -1 } }, { $unionWith: { coll: 'organization', pipeline: [{ $match: { orgId: this.orgId } }] } }, { $limit: 1 }];
|
|
1040
1056
|
|
|
1041
1057
|
// console.log("set as static user", pipeLine)
|
|
1042
|
-
const result
|
|
1058
|
+
const result = await this.userModel.aggregate<Organization>(pipeLine).exec();
|
|
1043
1059
|
// console.log("result",result)
|
|
1044
1060
|
if (result && result.length > 0) {
|
|
1045
1061
|
const res = result[0];
|
|
@@ -1150,7 +1166,7 @@ export class UserContext extends UserContextInfo {
|
|
|
1150
1166
|
});
|
|
1151
1167
|
this.branches = userProfile['branches'];
|
|
1152
1168
|
this.groups = userProfile['groups'] ?? [];
|
|
1153
|
-
this.clientSetting = userProfile
|
|
1169
|
+
this.clientSetting = userProfile.tenantInfo?.clientSetting ?? {
|
|
1154
1170
|
auditTrail: false,
|
|
1155
1171
|
disableClassReminder: true,
|
|
1156
1172
|
webhook: false,
|
|
@@ -1159,7 +1175,9 @@ export class UserContext extends UserContextInfo {
|
|
|
1159
1175
|
this.roles = userProfile['roles'] ?? [Role.Everyone, Role.User];
|
|
1160
1176
|
|
|
1161
1177
|
for (const group of this.groups) {
|
|
1162
|
-
const
|
|
1178
|
+
const roleResolver = (rolegroups as Record<string, RoleGroupResolver | undefined>)[group];
|
|
1179
|
+
if (!roleResolver) continue;
|
|
1180
|
+
const roles: Role[] = roleResolver();
|
|
1163
1181
|
for (let r = 0; r < roles.length; r++) {
|
|
1164
1182
|
if (!this.roles.includes(roles[r])) {
|
|
1165
1183
|
this.roles.push(roles[r]);
|
|
@@ -1233,8 +1251,9 @@ export class UserContext extends UserContextInfo {
|
|
|
1233
1251
|
/**
|
|
1234
1252
|
* Define additional properties from user into moreProps
|
|
1235
1253
|
*/
|
|
1236
|
-
setMoreProps(userProfile: UserContextInfo): Record<string,
|
|
1254
|
+
setMoreProps(userProfile: UserContextInfo): Record<string, unknown> {
|
|
1237
1255
|
const allprops = Object.keys(userProfile);
|
|
1256
|
+
const profileRecord = userProfile as unknown as Record<string, unknown>;
|
|
1238
1257
|
const excludekeys = [
|
|
1239
1258
|
'created',
|
|
1240
1259
|
'createdBy',
|
|
@@ -1265,11 +1284,11 @@ export class UserContext extends UserContextInfo {
|
|
|
1265
1284
|
'uid',
|
|
1266
1285
|
'orgRecordId',
|
|
1267
1286
|
];
|
|
1268
|
-
const data: Record<string,
|
|
1287
|
+
const data: Record<string, unknown> = {};
|
|
1269
1288
|
for (let i = 0; i < allprops.length; i++) {
|
|
1270
1289
|
const key = allprops[i];
|
|
1271
1290
|
if (!excludekeys.includes(key)) {
|
|
1272
|
-
data[key] =
|
|
1291
|
+
data[key] = profileRecord[key];
|
|
1273
1292
|
}
|
|
1274
1293
|
}
|
|
1275
1294
|
|
|
@@ -1293,7 +1312,7 @@ export class UserContext extends UserContextInfo {
|
|
|
1293
1312
|
return isodate;
|
|
1294
1313
|
}
|
|
1295
1314
|
|
|
1296
|
-
addTransactionStep(action: string, collection: string, id: string[], data:
|
|
1315
|
+
addTransactionStep(action: string, collection: string, id: string[], data: StepData['data']) {
|
|
1297
1316
|
this.transSteps.push({ action: action, collection: collection, id: id, data: data });
|
|
1298
1317
|
}
|
|
1299
1318
|
|
|
@@ -1326,6 +1345,7 @@ export class UserContext extends UserContextInfo {
|
|
|
1326
1345
|
if (this.dbsession.inTransaction()) await this.dbsession.abortTransaction();
|
|
1327
1346
|
}
|
|
1328
1347
|
}
|
|
1348
|
+
|
|
1329
1349
|
async endSession() {
|
|
1330
1350
|
await this.dbsession.endSession();
|
|
1331
1351
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import { Field, ObjectType } from '@nestjs/graphql';
|
|
1
2
|
import { ApiProperty } from '@nestjs/swagger';
|
|
2
|
-
import {
|
|
3
|
-
import { JSONSchema7, JSONSchema7Type, JSONSchema7Version, JSONSchema7TypeName, JSONSchema7Definition } from 'json-schema';
|
|
3
|
+
import { JSONSchema7 } from 'json-schema';
|
|
4
4
|
import { Permission } from 'src/simple-app/_core/resources/permission/permission.schema';
|
|
5
5
|
|
|
6
6
|
export class ModifiedCollection {
|
|
@@ -168,6 +168,7 @@ export class SchemaFields {
|
|
|
168
168
|
|
|
169
169
|
export class SimpleAppJSONSchema7 implements JSONSchema7 {
|
|
170
170
|
'x-simpleapp-config': SchemaConfig;
|
|
171
|
+
type?: JSONSchema7['type'];
|
|
171
172
|
}
|
|
172
173
|
export const SimpleAppJSONSchema7Definition = SimpleAppJSONSchema7;
|
|
173
174
|
|
|
@@ -176,7 +177,7 @@ export class BranchPermission extends Permission {
|
|
|
176
177
|
branch: ForeignKey;
|
|
177
178
|
}
|
|
178
179
|
|
|
179
|
-
export type StepData = {action:string
|
|
180
|
+
export type StepData = { action: string; collection: string; id: string[]; data: any[] };
|
|
180
181
|
|
|
181
182
|
export type DocumentDictEntry = {
|
|
182
183
|
docName: string;
|