@simitgroup/simpleapp-generator 2.0.1-g-alpha → 2.0.1-i-alpha

package/ReleaseNote.md

@@ -1,3 +1,11 @@
+[2.0.1i-alpha]
+
+1. Add org for user info
+
+[2.0.1h-alpha]
+
+1. Set robot user auto capture organization country, currency, timezone
+
 [2.0.1g-alpha]
 
 1. Fix mini app cannot publish

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simitgroup/simpleapp-generator",
-  "version": "2.0.1g-alpha",
+  "version": "2.0.1i-alpha",
   "description": "frontend nuxtjs and backend nests code generator using jsonschema",
   "main": "dist/index.js",
   "scripts": {

package/templates/nest/src/simple-app/_core/features/auth/api-key/validators/static-api-key.validator.ts.eta

@@ -17,7 +17,7 @@ export class StaticApiKeyValidator implements IApiKeyValidator {
     const xOrg = req.get(HEADER_X_ORG) ?? Base64URL.encodeText('0-0-0');
     const guestAccessToken = req.get(HEADER_X_GUESS_ACCESS_TOKEN);
 
-    user.setAsStaticUser('00000000-0000-0000-0000-000000000000', 'robot', 'Robot', 'robot@a.org', xOrg);
+    await user.setAsStaticUser('00000000-0000-0000-0000-000000000000', 'robot', 'Robot', 'robot@a.org', xOrg);
     user.setUserType('robot');
 
     if (guestAccessToken) {

package/templates/nest/src/simple-app/_core/features/mini-app/developer-portal/developer-portal-env-development.service.ts.eta

@@ -36,7 +36,7 @@ export class DeveloperPortalEnvDevelopmentService {
 
   async publish(appUser: UserContext, developerPortalAppId: string, dto: MiniApp) {
     this.assertDemoCompanyDefined();
-    appUser.setAsStaticUser(dto.author.uid, dto.author.email, dto.author.name, dto.author.email, process.env.DEMO_COMPANY_XORG);
+    await appUser.setAsStaticUser(dto.author.uid, dto.author.email, dto.author.name, dto.author.email, process.env.DEMO_COMPANY_XORG);
     appUser.setLicense(TenantLicenseEnum.ENTERPRISE); // else cannot install mini app
 
     const miniApp = await this.findMiniApp(developerPortalAppId, MiniAppManagerEnvEnum.DEV);

package/templates/nest/src/simple-app/_core/features/profile/profile.schema.ts.eta

@@ -5,7 +5,7 @@ import { Permission } from 'src/simple-app/_core/resources/permission/permission
 import { Role } from '../auth/role-guard/roles.enum';
 import { Organization } from '../../resources/organization/organization.schema';
 import { Tenant } from '../../resources/tenant/tenant.schema';
-export {KeyValue} from '../../framework/schemas';
+export { KeyValue } from '../../framework/schemas';
 export class UserContextInfo {
   @ApiProperty({ type: String })
   _id: string;
@@ -106,6 +106,8 @@ export class ProfileUserBranch {
   orgRecordId: String;
   @ApiProperty({ type: String })
   xOrg: String;
+  @ApiProperty({ type: Object, required: false })
+  organization?: any;
 }
 
 export class TenantPermission {

package/templates/nest/src/simple-app/_core/features/user-context/robot-user.service.ts.eta

@@ -99,7 +99,7 @@ export class SimpleAppRobotUserService {
     const user = userContext;
     const xorg = appUser.generateXOrg(user.tenantId, user.orgId, user.branchId);
 
-    appUser.setAsStaticUser(user.uid ?? '00000000-0000-0000-0000-000000000000', user.uname ?? 'robot', user.fullName ?? 'Robot', user.email ?? 'robot@a.org', xorg);
+    await appUser.setAsStaticUser(user.uid ?? '00000000-0000-0000-0000-000000000000', user.uname ?? 'robot', user.fullName ?? 'Robot', user.email ?? 'robot@a.org', xorg);
     appUser.setTimeZone(user.timeZone ?? this.defaultTimeZone);
     appUser.setCountry(user.country ?? this.defaultCountry);
     appUser.setCurrency(user.currency ?? this.defaultCurrency);
@@ -111,7 +111,7 @@ export class SimpleAppRobotUserService {
     // console.log('prepareAppUserprepareAppUser');
     // this.appmodel,
     const appuser = new UserContext(this.userModel, this.permModel, this.miniAppInstallationModel,envs[0]);
-    appuser.setAsStaticUser('00000000-0000-0000-0000-000000000000', 'robot', 'Robot', 'robot@a.org', Base64URL.encodeText('0-0-0'));
+    await appuser.setAsStaticUser('00000000-0000-0000-0000-000000000000', 'robot', 'Robot', 'robot@a.org', Base64URL.encodeText('0-0-0'));
 
     const tenantId = data?.tenantId ?? 0;
     const orgId = data?.orgId ?? 0;

package/templates/nest/src/simple-app/_core/features/user-context/user.context.ts.eta

@@ -885,6 +885,7 @@ export class UserContext extends UserContextInfo {
                           _id: '$org._id',
                           code: '$org.orgCode',
                           label: '$org.orgName',
+                          imageUrl: '$org.imageUrl',
                         },
                       },
                     },
@@ -925,6 +926,7 @@ export class UserContext extends UserContextInfo {
             groups: p.groups,
             branch: p.branch,
             orgRecordId: p.organization._id,
+            organization: p.organization,
             xOrg: this.generateXOrg(p.tenantId, p.orgId, p.branchId),
           });
         }
@@ -974,7 +976,7 @@ export class UserContext extends UserContextInfo {
     return results;
   }
 
-  setAsStaticUser = (uid: string, uname: string, name: string, email: string, xorg: string) => {
+  setAsStaticUser = async (uid: string, uname: string, name: string, email: string, xorg: string) => {
     // Define token info
     this.token = '';
     this.uid = uid;
@@ -984,6 +986,23 @@ export class UserContext extends UserContextInfo {
     this.ssoACL = {};
     this.roles = [Role.Everyone, Role.User, Role.SuperUser];
     this.setXOrg(xorg);
+    const pipeLine:PipelineStage[] = [
+      {$match:{ tenantId : -1 }},      
+      {$unionWith: { coll: "organization", pipeline: [ {$match:{orgId: this.orgId}}] } },
+      {$limit:1}
+    ]
+
+    // console.log("set as static user", pipeLine)
+    const result:Organization[] = await this.userModel.aggregate(pipeLine).exec();
+    // console.log("result",result)
+    if(result && result.length>0){
+      const res = result[0]
+      this.currency = res.currency
+      this.country = res.country
+      this.timeZone = res.timeZone
+      this.offsetMinute = res.offsetMinute
+    }
+
   };
 
   setGuestToken(tokenStr: string) {