增加了OakUserInfoLoadingException异常

lib/features/token.js

@@ -6,6 +6,7 @@ var Feature_1 = require("oak-frontend-base/lib/types/Feature");
 var Exception_1 = require("oak-domain/lib/types/Exception");
 var env_1 = require("../utils/env");
 var projection_1 = require("../types/projection");
+var Exception_2 = require("../types/Exception");
 var Token = /** @class */ (function (_super) {
     tslib_1.__extends(Token, _super);
     function Token(cache, storage) {
@@ -184,6 +185,10 @@ var Token = /** @class */ (function (_super) {
             }, context)[0];
             if (!token) {
                 this.loadTokenInfo();
+                if (allowUnloggedIn) {
+                    return undefined;
+                }
+                throw new Exception_2.OakUserInfoLoadingException();
             }
             return token;
         }

lib/types/Exception.d.ts

@@ -37,6 +37,9 @@ export declare class OakMpHaveToSubscribeMessage extends Error {
     rejectedMessageType: string[];
     constructor(rejectedMessageType: string[], message?: string);
 }
+export declare class OakUserInfoLoadingException<ED extends EntityDict & BaseEntityDict> extends OakUserException<ED> {
+    constructor(message?: string);
+}
 export declare function makeException<ED extends EntityDict & BaseEntityDict>(data: {
     name: string;
     message?: string;

lib/types/Exception.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeException = exports.OakMpHaveToSubscribeMessage = exports.OakTokenExpiredException = exports.OakUserDisabledException = exports.OakUserInfoUncompletedException = exports.OakMobileUnsetException = exports.OakChangeLoginWayException = exports.OakDistinguishUserException = exports.OakNotEnoughMoneyException = void 0;
+exports.makeException = exports.OakUserInfoLoadingException = exports.OakMpHaveToSubscribeMessage = exports.OakTokenExpiredException = exports.OakUserDisabledException = exports.OakUserInfoUncompletedException = exports.OakMobileUnsetException = exports.OakChangeLoginWayException = exports.OakDistinguishUserException = exports.OakNotEnoughMoneyException = void 0;
 var tslib_1 = require("tslib");
 var types_1 = require("oak-domain/lib/types");
 var OakNotEnoughMoneyException = /** @class */ (function (_super) {
@@ -103,6 +103,15 @@ var OakMpHaveToSubscribeMessage = /** @class */ (function (_super) {
     return OakMpHaveToSubscribeMessage;
 }(Error));
 exports.OakMpHaveToSubscribeMessage = OakMpHaveToSubscribeMessage;
+var OakUserInfoLoadingException = /** @class */ (function (_super) {
+    tslib_1.__extends(OakUserInfoLoadingException, _super);
+    function OakUserInfoLoadingException(message) {
+        return _super.call(this, message || '正在装载用户信息') || this;
+    }
+    return OakUserInfoLoadingException;
+}(types_1.OakUserException));
+exports.OakUserInfoLoadingException = OakUserInfoLoadingException;
+;
 function makeException(data) {
     var exception = (0, types_1.makeException)(data);
     if (exception) {
@@ -140,6 +149,11 @@ function makeException(data) {
             e.setOpRecords(opRecords);
             return e;
         }
+        case 'OakUserInfoLoadingException': {
+            var e = new OakUserInfoLoadingException(message);
+            e.setOpRecords(opRecords);
+            return e;
+        }
         default: {
             return;
         }

src/features/token.ts

@@ -11,6 +11,7 @@ import { BackendRuntimeContext } from '../context/BackendRuntimeContext';
 import { FrontendRuntimeContext } from '../context/FrontendRuntimeContext';
 import { ROOT_ROLE_ID } from '../constants';
 import { tokenProjection } from '../types/projection';
+import { OakUserInfoLoadingException } from '../types/Exception';
 
 export class Token<
     ED extends EntityDict,
@@ -143,6 +144,10 @@ export class Token<
             )[0];
             if (!token) {
                 this.loadTokenInfo(); 
+                if (allowUnloggedIn) {
+                    return undefined;
+                }
+                throw new OakUserInfoLoadingException();
             }
             return token;
         }

src/types/Exception.ts

@@ -95,6 +95,11 @@ export class OakMpHaveToSubscribeMessage extends Error {
     }
 }
 
+export class OakUserInfoLoadingException<ED extends EntityDict & BaseEntityDict> extends OakUserException<ED> {
+    constructor(message?: string) {
+        super(message || '正在装载用户信息');
+    }
+};
 
 export function makeException<ED extends EntityDict & BaseEntityDict>(data: {
     name: string;
@@ -139,6 +144,11 @@ export function makeException<ED extends EntityDict & BaseEntityDict>(data: {
             e.setOpRecords(opRecords);
             return e;
         }
+        case 'OakUserInfoLoadingException': {
+            const e = new OakUserInfoLoadingException(message);
+            e.setOpRecords(opRecords);
+            return e;
+        }
         default: {
             return;
         }