一些checker和trigger

lib/aspects/token.js

@@ -110,23 +110,23 @@ async function loginWechatMp({ code, env }, context) {
                     },
                 },
             });
-            await rowStore.operate('token', {
-                action: 'create',
-                data: {
-                    id,
-                    userId: wechatUser2.userId,
-                    playerId: wechatUser2.userId,
-                    applicationId: application.id,
-                    entity: 'wechatUser',
-                    entityId: wechatUser2.id,
-                    wechatUser: {
-                        action: 'update',
-                        data: wechatUserUpdateData,
-                    },
-                    env
-                }
-            }, context);
         }
+        await rowStore.operate('token', {
+            action: 'create',
+            data: {
+                id,
+                userId: wechatUser2.userId,
+                playerId: wechatUser2.userId,
+                applicationId: application.id,
+                entity: 'wechatUser',
+                entityId: wechatUser2.id,
+                wechatUser: {
+                    action: 'update',
+                    data: wechatUserUpdateData,
+                },
+                env
+            }
+        }, context);
         return id;
     }
     else if (unionId) {

lib/checkers/address.js

@@ -5,6 +5,7 @@ const types_1 = require("oak-domain/lib/types");
 const check_1 = require("../utils/check");
 const checkers = [
     {
+        type: 'data',
         action: 'create',
         entity: 'address',
         checker: async ({ operation }) => {

lib/entities/Token.js

@@ -1,3 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const action_1 = require("oak-domain/lib/actions/action");
 ;
+const AbleActionDef = (0, action_1.makeAbleActionDef)('enabled');

lib/triggers/token.js

@@ -0,0 +1 @@
+"use strict";

src/aspects/token.ts

@@ -6,7 +6,7 @@ import WechatSDK from 'oak-wechat-sdk';
 import { CreateOperationData as CreateToken, WechatMpEnv } from 'oak-app-domain/Token/Schema';
 import { CreateOperationData as CreateWechatUser } from 'oak-app-domain/WechatUser/Schema';
 import { CreateOperationData as CreateUser } from 'oak-app-domain/User/Schema';
-import { assign, eq } from 'lodash';
+import { assign, isEqual } from 'lodash';
 import { SelectRowShape } from 'oak-domain/lib/types';
 
 export async function loginMp<ED extends EntityDict, Cxt extends GeneralRuntimeContext<ED>>(params: { code: string }, context: Cxt): Promise<string> {
@@ -88,7 +88,7 @@ export async function loginWechatMp<ED extends EntityDict, Cxt extends GeneralRu
                     entityId: wechatUser2.id,
                 },
             }, context);
-            if (token && eq(token.env, env)) {
+            if (token && isEqual(token.env, env)) {
                 await rowStore.operate('token', {
                     action: 'update',
                     data: {
@@ -128,24 +128,24 @@ export async function loginWechatMp<ED extends EntityDict, Cxt extends GeneralRu
                     },
                 },
             });
-
-            await rowStore.operate('token', {
-                action: 'create',
-                data: {
-                    id,
-                    userId: wechatUser2.userId as string,
-                    playerId: wechatUser2.userId as string,
-                    applicationId: application.id,
-                    entity: 'wechatUser',
-                    entityId: wechatUser2.id as string,
-                    wechatUser: {
-                        action: 'update',
-                        data: wechatUserUpdateData,
-                    },
-                    env
-                } as CreateToken
-            }, context);
         }
+
+        await rowStore.operate('token', {
+            action: 'create',
+            data: {
+                id,
+                userId: wechatUser2.userId as string,
+                playerId: wechatUser2.userId as string,
+                applicationId: application.id,
+                entity: 'wechatUser',
+                entityId: wechatUser2.id as string,
+                wechatUser: {
+                    action: 'update',
+                    data: wechatUserUpdateData,
+                },
+                env
+            } as CreateToken
+        }, context);
         return id;
 
     }

src/checkers/address.ts

@@ -6,6 +6,7 @@ import { GeneralRuntimeContext } from '../RuntimeContext';
 
 const checkers: Checker<EntityDict, 'address', GeneralRuntimeContext<EntityDict>> [] = [
     {
+        type: 'data',
         action: 'create',
         entity: 'address',
         checker: async ({ operation }) => {

src/entities/Token.ts

@@ -1,7 +1,7 @@
 import { String, Int, Datetime, Image, Boolean } from 'oak-domain/lib/types/DataType';
 import { Schema as User } from './User';
 import { Schema as Application } from './Application';
-import { AbleAction } from 'oak-domain/lib/actions/action';
+import { AbleAction, makeAbleActionDef } from 'oak-domain/lib/actions/action';
 import { EntityShape } from 'oak-domain/lib/types/Entity';
 // https://developers.weixin.qq.com/miniprogram/dev/api/base/system/wx.getSystemInfoSync.html
 export type WechatMpEnv = {
@@ -39,3 +39,5 @@ export interface Schema extends EntityShape {
 };
 
 type Action = AbleAction;
+
+const AbleActionDef = makeAbleActionDef('enabled');