token中allowUnloggedIn的处理原来写的不对
This commit is contained in:
parent
d06b32fe48
commit
0c8c40933a
|
|
@ -20,7 +20,7 @@ export declare class Token<ED extends EntityDict> extends Feature {
|
|||
syncUserInfoWechatMp(): Promise<void>;
|
||||
logout(dontPublish?: boolean): Promise<void>;
|
||||
removeToken(dontPublish?: boolean): void;
|
||||
getTokenValue(allowUnloggedIn?: boolean): string | undefined;
|
||||
getTokenValue(): string | undefined;
|
||||
getToken(allowUnloggedIn?: boolean): Partial<ED["token"]["Schema"]> | undefined;
|
||||
getUserId(allowUnloggedIn?: boolean): NonNullable<ED["token"]["Schema"]["userId"]> | undefined;
|
||||
getUserInfo(): NonNullable<ED["token"]["Schema"]["user"]> | undefined;
|
||||
|
|
|
|||
|
|
@ -138,14 +138,14 @@ class Token extends Feature_1.Feature {
|
|||
this.publish();
|
||||
}
|
||||
}
|
||||
getTokenValue(allowUnloggedIn) {
|
||||
if (!allowUnloggedIn && this.tokenValue === '') {
|
||||
getTokenValue() {
|
||||
if (this.tokenValue === '') {
|
||||
throw new Exception_2.OakUserInfoLoadingException();
|
||||
}
|
||||
return this.tokenValue;
|
||||
}
|
||||
getToken(allowUnloggedIn) {
|
||||
if (!allowUnloggedIn && this.tokenValue === '') {
|
||||
if (this.tokenValue === '') {
|
||||
throw new Exception_2.OakUserInfoLoadingException();
|
||||
}
|
||||
if (this.tokenValue) {
|
||||
|
|
|
|||
|
|
@ -2,9 +2,6 @@ export declare const actionDefDict: {
|
|||
modi: {
|
||||
iState: import("oak-domain/lib/types").ActionDef<string, string>;
|
||||
};
|
||||
account: {
|
||||
ableState: import("oak-domain/lib/types").ActionDef<import("oak-domain/lib/actions/action").AbleAction, import("oak-domain/lib/actions/action").AbleState>;
|
||||
};
|
||||
captcha: {
|
||||
iState: import("oak-domain/lib/types").ActionDef<string, string>;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ import { EntityDef as User } from "./User/Schema";
|
|||
import { EntityDef as UserEntityClaim } from "./UserEntityClaim/Schema";
|
||||
import { EntityDef as UserEntityGrant } from "./UserEntityGrant/Schema";
|
||||
import { EntityDef as UserRelation } from "./UserRelation/Schema";
|
||||
import { EntityDef as Account } from "./Account/Schema";
|
||||
import { EntityDef as Address } from "./Address/Schema";
|
||||
import { EntityDef as Application } from "./Application/Schema";
|
||||
import { EntityDef as Area } from "./Area/Schema";
|
||||
|
|
@ -67,7 +66,6 @@ export type EntityDict = {
|
|||
userEntityClaim: UserEntityClaim;
|
||||
userEntityGrant: UserEntityGrant;
|
||||
userRelation: UserRelation;
|
||||
account: Account;
|
||||
address: Address;
|
||||
application: Application;
|
||||
area: Area;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ import { OneOf } from "oak-domain/lib/types/Polyfill";
|
|||
import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, AggregationResult, EntityShape } from "oak-domain/lib/types/Entity";
|
||||
import { GenericAction } from "oak-domain/lib/actions/action";
|
||||
import { String } from "oak-domain/lib/types/DataType";
|
||||
import * as Account from "../Account/Schema";
|
||||
import * as Session from "../Session/Schema";
|
||||
import * as ToDo from "../ToDo/Schema";
|
||||
import * as ActionAuth from "../ActionAuth/Schema";
|
||||
|
|
@ -12,18 +11,17 @@ import * as RelationAuth from "../RelationAuth/Schema";
|
|||
import * as UserEntityClaim from "../UserEntityClaim/Schema";
|
||||
import * as UserRelation from "../UserRelation/Schema";
|
||||
export type OpSchema = EntityShape & {
|
||||
entity: "account" | "session" | "toDo" | string;
|
||||
entity: "session" | "toDo" | string;
|
||||
entityId?: String<64> | null;
|
||||
name?: String<32> | null;
|
||||
display?: String<32> | null;
|
||||
};
|
||||
export type OpAttr = keyof OpSchema;
|
||||
export type Schema = EntityShape & {
|
||||
entity: "account" | "session" | "toDo" | string;
|
||||
entity: "session" | "toDo" | string;
|
||||
entityId?: String<64> | null;
|
||||
name?: String<32> | null;
|
||||
display?: String<32> | null;
|
||||
account?: Account.Schema;
|
||||
session?: Session.Schema;
|
||||
toDo?: ToDo.Schema;
|
||||
actionAuth$relation?: Array<ActionAuth.Schema>;
|
||||
|
|
@ -44,11 +42,10 @@ type AttrFilter = {
|
|||
$$createAt$$: Q_DateValue;
|
||||
$$seq$$: Q_NumberValue;
|
||||
$$updateAt$$: Q_DateValue;
|
||||
entity: Q_EnumValue<"account" | "session" | "toDo" | string>;
|
||||
entity: Q_EnumValue<"session" | "toDo" | string>;
|
||||
entityId: Q_StringValue;
|
||||
name: Q_StringValue;
|
||||
display: Q_StringValue;
|
||||
account: Account.Filter;
|
||||
session: Session.Filter;
|
||||
toDo: ToDo.Filter;
|
||||
actionAuth$relation: ActionAuth.Filter & SubQueryPredicateMetadata;
|
||||
|
|
@ -69,7 +66,6 @@ export type Projection = {
|
|||
entityId?: number;
|
||||
name?: number;
|
||||
display?: number;
|
||||
account?: Account.Projection;
|
||||
session?: Session.Projection;
|
||||
toDo?: ToDo.Projection;
|
||||
actionAuth$relation?: ActionAuth.Selection & {
|
||||
|
|
@ -106,9 +102,6 @@ export type Projection = {
|
|||
type RelationIdProjection = OneOf<{
|
||||
id: number;
|
||||
}>;
|
||||
type AccountIdProjection = OneOf<{
|
||||
entityId: number;
|
||||
}>;
|
||||
type SessionIdProjection = OneOf<{
|
||||
entityId: number;
|
||||
}>;
|
||||
|
|
@ -131,8 +124,6 @@ export type SortAttr = {
|
|||
name: number;
|
||||
} | {
|
||||
display: number;
|
||||
} | {
|
||||
account: Account.SortAttr;
|
||||
} | {
|
||||
session: Session.SortAttr;
|
||||
} | {
|
||||
|
|
@ -149,18 +140,6 @@ export type SelectOperation<P extends Object = Projection> = OakSelection<"selec
|
|||
export type Selection<P extends Object = Projection> = SelectOperation<P>;
|
||||
export type Aggregation = DeduceAggregation<Projection, Filter, Sorter>;
|
||||
export type CreateOperationData = FormCreateData<Omit<OpSchema, "entity" | "entityId">> & ({
|
||||
entity?: never;
|
||||
entityId?: never;
|
||||
account?: Account.CreateSingleOperation;
|
||||
} | {
|
||||
entity: "account";
|
||||
entityId?: ForeignKey<"Account">;
|
||||
account?: Account.UpdateOperation;
|
||||
} | {
|
||||
entity: "account";
|
||||
entityId?: ForeignKey<"Account">;
|
||||
account?: never;
|
||||
} | {
|
||||
entity?: never;
|
||||
entityId?: never;
|
||||
session?: Session.CreateSingleOperation;
|
||||
|
|
@ -199,10 +178,6 @@ export type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
|
|||
export type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
|
||||
export type CreateOperation = CreateSingleOperation | CreateMultipleOperation;
|
||||
export type UpdateOperationData = FormUpdateData<Omit<OpSchema, "entity" | "entityId">> & ({
|
||||
account?: Account.CreateSingleOperation | Account.UpdateOperation | Account.RemoveOperation;
|
||||
entityId?: never;
|
||||
entity?: never;
|
||||
} | {
|
||||
session?: Session.CreateSingleOperation | Session.UpdateOperation | Session.RemoveOperation;
|
||||
entityId?: never;
|
||||
entity?: never;
|
||||
|
|
@ -211,9 +186,8 @@ export type UpdateOperationData = FormUpdateData<Omit<OpSchema, "entity" | "enti
|
|||
entityId?: never;
|
||||
entity?: never;
|
||||
} | {
|
||||
entity?: ("account" | "session" | "toDo" | string) | null;
|
||||
entityId?: ForeignKey<"Account" | "Session" | "ToDo">;
|
||||
account?: never;
|
||||
entity?: ("session" | "toDo" | string) | null;
|
||||
entityId?: ForeignKey<"Session" | "ToDo">;
|
||||
session?: never;
|
||||
toDo?: never;
|
||||
}) & {
|
||||
|
|
@ -226,8 +200,6 @@ export type UpdateOperationData = FormUpdateData<Omit<OpSchema, "entity" | "enti
|
|||
};
|
||||
export type UpdateOperation = OakOperation<"update" | string, UpdateOperationData, Filter, Sorter>;
|
||||
export type RemoveOperationData = {} & ({
|
||||
account?: Account.UpdateOperation | Account.RemoveOperation;
|
||||
} | {
|
||||
session?: Session.UpdateOperation | Session.RemoveOperation;
|
||||
} | {
|
||||
toDo?: ToDo.UpdateOperation | ToDo.RemoveOperation;
|
||||
|
|
@ -236,7 +208,6 @@ export type RemoveOperationData = {} & ({
|
|||
});
|
||||
export type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter, Sorter>;
|
||||
export type Operation = CreateOperation | UpdateOperation | RemoveOperation;
|
||||
export type AccountIdSubQuery = Selection<AccountIdProjection>;
|
||||
export type SessionIdSubQuery = Selection<SessionIdProjection>;
|
||||
export type ToDoIdSubQuery = Selection<ToDoIdProjection>;
|
||||
export type RelationIdSubQuery = Selection<RelationIdProjection>;
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ import * as OperEntity from "../OperEntity/Schema";
|
|||
import * as ExtraFile from "../ExtraFile/Schema";
|
||||
import * as WechatQrCode from "../WechatQrCode/Schema";
|
||||
import * as Address from "../Address/Schema";
|
||||
import * as Account from "../Account/Schema";
|
||||
export type OpSchema = EntityShape & {
|
||||
name?: String<16> | null;
|
||||
nickname?: String<64> | null;
|
||||
|
|
@ -102,8 +101,6 @@ export type Schema = EntityShape & {
|
|||
wechatQrCode$entity$$aggr?: AggregationResult<WechatQrCode.Schema>;
|
||||
address$entity?: Array<Address.Schema>;
|
||||
address$entity$$aggr?: AggregationResult<Address.Schema>;
|
||||
account$entity?: Array<Account.Schema>;
|
||||
account$entity$$aggr?: AggregationResult<Account.Schema>;
|
||||
} & {
|
||||
[A in ExpressionKey]?: any;
|
||||
};
|
||||
|
|
@ -148,7 +145,6 @@ type AttrFilter = {
|
|||
extraFile$entity: ExtraFile.Filter & SubQueryPredicateMetadata;
|
||||
wechatQrCode$entity: WechatQrCode.Filter & SubQueryPredicateMetadata;
|
||||
address$entity: Address.Filter & SubQueryPredicateMetadata;
|
||||
account$entity: Account.Filter & SubQueryPredicateMetadata;
|
||||
};
|
||||
export type Filter = MakeFilter<AttrFilter & ExprOp<OpAttr | string> & FulltextFilter>;
|
||||
export type Projection = {
|
||||
|
|
@ -309,12 +305,6 @@ export type Projection = {
|
|||
address$entity$$aggr?: Address.Aggregation & {
|
||||
$entity: "address";
|
||||
};
|
||||
account$entity?: Account.Selection & {
|
||||
$entity: "account";
|
||||
};
|
||||
account$entity$$aggr?: Account.Aggregation & {
|
||||
$entity: "account";
|
||||
};
|
||||
} & Partial<ExprOp<OpAttr | string>>;
|
||||
type UserIdProjection = OneOf<{
|
||||
id: number;
|
||||
|
|
@ -398,7 +388,6 @@ export type CreateOperationData = FormCreateData<Omit<OpSchema, "refId">> & (({
|
|||
extraFile$entity?: OakOperation<ExtraFile.UpdateOperation["action"], Omit<ExtraFile.UpdateOperationData, "entity" | "entityId">, Omit<ExtraFile.Filter, "entity" | "entityId">> | OakOperation<"create", Omit<ExtraFile.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<ExtraFile.CreateOperationData, "entity" | "entityId">> | OakOperation<ExtraFile.UpdateOperation["action"], Omit<ExtraFile.UpdateOperationData, "entity" | "entityId">, Omit<ExtraFile.Filter, "entity" | "entityId">>>;
|
||||
wechatQrCode$entity?: OakOperation<WechatQrCode.UpdateOperation["action"], Omit<WechatQrCode.UpdateOperationData, "entity" | "entityId">, Omit<WechatQrCode.Filter, "entity" | "entityId">> | OakOperation<"create", Omit<WechatQrCode.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<WechatQrCode.CreateOperationData, "entity" | "entityId">> | OakOperation<WechatQrCode.UpdateOperation["action"], Omit<WechatQrCode.UpdateOperationData, "entity" | "entityId">, Omit<WechatQrCode.Filter, "entity" | "entityId">>>;
|
||||
address$entity?: OakOperation<Address.UpdateOperation["action"], Omit<Address.UpdateOperationData, "entity" | "entityId">, Omit<Address.Filter, "entity" | "entityId">> | OakOperation<"create", Omit<Address.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<Address.CreateOperationData, "entity" | "entityId">> | OakOperation<Address.UpdateOperation["action"], Omit<Address.UpdateOperationData, "entity" | "entityId">, Omit<Address.Filter, "entity" | "entityId">>>;
|
||||
account$entity?: OakOperation<Account.UpdateOperation["action"], Omit<Account.UpdateOperationData, "entity" | "entityId">, Omit<Account.Filter, "entity" | "entityId">> | OakOperation<"create", Omit<Account.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<Account.CreateOperationData, "entity" | "entityId">> | OakOperation<Account.UpdateOperation["action"], Omit<Account.UpdateOperationData, "entity" | "entityId">, Omit<Account.Filter, "entity" | "entityId">>>;
|
||||
};
|
||||
export type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
|
||||
export type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
|
||||
|
|
@ -440,7 +429,6 @@ export type UpdateOperationData = FormUpdateData<Omit<OpSchema, "refId">> & (({
|
|||
extraFile$entity?: OakOperation<ExtraFile.UpdateOperation["action"], Omit<ExtraFile.UpdateOperationData, "entity" | "entityId">, Omit<ExtraFile.Filter, "entity" | "entityId">> | OakOperation<ExtraFile.RemoveOperation["action"], Omit<ExtraFile.RemoveOperationData, "entity" | "entityId">, Omit<ExtraFile.Filter, "entity" | "entityId">> | OakOperation<"create", Omit<ExtraFile.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<ExtraFile.CreateOperationData, "entity" | "entityId">> | OakOperation<ExtraFile.UpdateOperation["action"], Omit<ExtraFile.UpdateOperationData, "entity" | "entityId">, Omit<ExtraFile.Filter, "entity" | "entityId">> | OakOperation<ExtraFile.RemoveOperation["action"], Omit<ExtraFile.RemoveOperationData, "entity" | "entityId">, Omit<ExtraFile.Filter, "entity" | "entityId">>>;
|
||||
wechatQrCode$entity?: OakOperation<WechatQrCode.UpdateOperation["action"], Omit<WechatQrCode.UpdateOperationData, "entity" | "entityId">, Omit<WechatQrCode.Filter, "entity" | "entityId">> | OakOperation<WechatQrCode.RemoveOperation["action"], Omit<WechatQrCode.RemoveOperationData, "entity" | "entityId">, Omit<WechatQrCode.Filter, "entity" | "entityId">> | OakOperation<"create", Omit<WechatQrCode.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<WechatQrCode.CreateOperationData, "entity" | "entityId">> | OakOperation<WechatQrCode.UpdateOperation["action"], Omit<WechatQrCode.UpdateOperationData, "entity" | "entityId">, Omit<WechatQrCode.Filter, "entity" | "entityId">> | OakOperation<WechatQrCode.RemoveOperation["action"], Omit<WechatQrCode.RemoveOperationData, "entity" | "entityId">, Omit<WechatQrCode.Filter, "entity" | "entityId">>>;
|
||||
address$entity?: OakOperation<Address.UpdateOperation["action"], Omit<Address.UpdateOperationData, "entity" | "entityId">, Omit<Address.Filter, "entity" | "entityId">> | OakOperation<Address.RemoveOperation["action"], Omit<Address.RemoveOperationData, "entity" | "entityId">, Omit<Address.Filter, "entity" | "entityId">> | OakOperation<"create", Omit<Address.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<Address.CreateOperationData, "entity" | "entityId">> | OakOperation<Address.UpdateOperation["action"], Omit<Address.UpdateOperationData, "entity" | "entityId">, Omit<Address.Filter, "entity" | "entityId">> | OakOperation<Address.RemoveOperation["action"], Omit<Address.RemoveOperationData, "entity" | "entityId">, Omit<Address.Filter, "entity" | "entityId">>>;
|
||||
account$entity?: OakOperation<Account.UpdateOperation["action"], Omit<Account.UpdateOperationData, "entity" | "entityId">, Omit<Account.Filter, "entity" | "entityId">> | OakOperation<Account.RemoveOperation["action"], Omit<Account.RemoveOperationData, "entity" | "entityId">, Omit<Account.Filter, "entity" | "entityId">> | OakOperation<"create", Omit<Account.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<Account.CreateOperationData, "entity" | "entityId">> | OakOperation<Account.UpdateOperation["action"], Omit<Account.UpdateOperationData, "entity" | "entityId">, Omit<Account.Filter, "entity" | "entityId">> | OakOperation<Account.RemoveOperation["action"], Omit<Account.RemoveOperationData, "entity" | "entityId">, Omit<Account.Filter, "entity" | "entityId">>>;
|
||||
};
|
||||
export type UpdateOperation = OakOperation<"update" | ParticularAction | RelationAction | string, UpdateOperationData, Filter, Sorter>;
|
||||
export type RemoveOperationData = {} & (({
|
||||
|
|
|
|||
|
|
@ -6,25 +6,23 @@ import { GenericAction } from "oak-domain/lib/actions/action";
|
|||
import { String } from "oak-domain/lib/types/DataType";
|
||||
import * as User from "../User/Schema";
|
||||
import * as Relation from "../Relation/Schema";
|
||||
import * as Account from "../Account/Schema";
|
||||
import * as Session from "../Session/Schema";
|
||||
import * as ToDo from "../ToDo/Schema";
|
||||
import * as UserEntityClaim from "../UserEntityClaim/Schema";
|
||||
export type OpSchema = EntityShape & {
|
||||
userId: ForeignKey<"user">;
|
||||
relationId: ForeignKey<"relation">;
|
||||
entity: "account" | "session" | "toDo" | string;
|
||||
entity: "session" | "toDo" | string;
|
||||
entityId: String<64>;
|
||||
};
|
||||
export type OpAttr = keyof OpSchema;
|
||||
export type Schema = EntityShape & {
|
||||
userId: ForeignKey<"user">;
|
||||
relationId: ForeignKey<"relation">;
|
||||
entity: "account" | "session" | "toDo" | string;
|
||||
entity: "session" | "toDo" | string;
|
||||
entityId: String<64>;
|
||||
user: User.Schema;
|
||||
relation: Relation.Schema;
|
||||
account?: Account.Schema;
|
||||
session?: Session.Schema;
|
||||
toDo?: ToDo.Schema;
|
||||
userEntityClaim$userRelation?: Array<UserEntityClaim.Schema>;
|
||||
|
|
@ -41,9 +39,8 @@ type AttrFilter = {
|
|||
user: User.Filter;
|
||||
relationId: Q_StringValue;
|
||||
relation: Relation.Filter;
|
||||
entity: Q_EnumValue<"account" | "session" | "toDo" | string>;
|
||||
entity: Q_EnumValue<"session" | "toDo" | string>;
|
||||
entityId: Q_StringValue;
|
||||
account: Account.Filter;
|
||||
session: Session.Filter;
|
||||
toDo: ToDo.Filter;
|
||||
userEntityClaim$userRelation: UserEntityClaim.Filter & SubQueryPredicateMetadata;
|
||||
|
|
@ -62,7 +59,6 @@ export type Projection = {
|
|||
relation?: Relation.Projection;
|
||||
entity?: number;
|
||||
entityId?: number;
|
||||
account?: Account.Projection;
|
||||
session?: Session.Projection;
|
||||
toDo?: ToDo.Projection;
|
||||
userEntityClaim$userRelation?: UserEntityClaim.Selection & {
|
||||
|
|
@ -81,9 +77,6 @@ type UserIdProjection = OneOf<{
|
|||
type RelationIdProjection = OneOf<{
|
||||
relationId: number;
|
||||
}>;
|
||||
type AccountIdProjection = OneOf<{
|
||||
entityId: number;
|
||||
}>;
|
||||
type SessionIdProjection = OneOf<{
|
||||
entityId: number;
|
||||
}>;
|
||||
|
|
@ -110,8 +103,6 @@ export type SortAttr = {
|
|||
entity: number;
|
||||
} | {
|
||||
entityId: number;
|
||||
} | {
|
||||
account: Account.SortAttr;
|
||||
} | {
|
||||
session: Session.SortAttr;
|
||||
} | {
|
||||
|
|
@ -146,18 +137,6 @@ export type CreateOperationData = FormCreateData<Omit<OpSchema, "entity" | "enti
|
|||
relation?: never;
|
||||
relationId: ForeignKey<"relation">;
|
||||
})) & ({
|
||||
entity?: never;
|
||||
entityId?: never;
|
||||
account: Account.CreateSingleOperation;
|
||||
} | {
|
||||
entity: "account";
|
||||
entityId: ForeignKey<"Account">;
|
||||
account?: Account.UpdateOperation;
|
||||
} | {
|
||||
entity: "account";
|
||||
entityId: ForeignKey<"Account">;
|
||||
account?: never;
|
||||
} | {
|
||||
entity?: never;
|
||||
entityId?: never;
|
||||
session: Session.CreateSingleOperation;
|
||||
|
|
@ -216,10 +195,6 @@ export type UpdateOperationData = FormUpdateData<Omit<OpSchema, "entity" | "enti
|
|||
relation?: never;
|
||||
relationId?: ForeignKey<"relation">;
|
||||
})) & ({
|
||||
account?: Account.CreateSingleOperation | Account.UpdateOperation | Account.RemoveOperation;
|
||||
entityId?: never;
|
||||
entity?: never;
|
||||
} | {
|
||||
session?: Session.CreateSingleOperation | Session.UpdateOperation | Session.RemoveOperation;
|
||||
entityId?: never;
|
||||
entity?: never;
|
||||
|
|
@ -228,9 +203,8 @@ export type UpdateOperationData = FormUpdateData<Omit<OpSchema, "entity" | "enti
|
|||
entityId?: never;
|
||||
entity?: never;
|
||||
} | {
|
||||
entity?: ("account" | "session" | "toDo" | string) | null;
|
||||
entityId?: ForeignKey<"Account" | "Session" | "ToDo"> | null;
|
||||
account?: never;
|
||||
entity?: ("session" | "toDo" | string) | null;
|
||||
entityId?: ForeignKey<"Session" | "ToDo"> | null;
|
||||
session?: never;
|
||||
toDo?: never;
|
||||
}) & {
|
||||
|
|
@ -243,8 +217,6 @@ export type RemoveOperationData = {} & (({
|
|||
}) & ({
|
||||
relation?: Relation.UpdateOperation | Relation.RemoveOperation;
|
||||
})) & ({
|
||||
account?: Account.UpdateOperation | Account.RemoveOperation;
|
||||
} | {
|
||||
session?: Session.UpdateOperation | Session.RemoveOperation;
|
||||
} | {
|
||||
toDo?: ToDo.UpdateOperation | ToDo.RemoveOperation;
|
||||
|
|
@ -255,7 +227,6 @@ export type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter
|
|||
export type Operation = CreateOperation | UpdateOperation | RemoveOperation;
|
||||
export type UserIdSubQuery = Selection<UserIdProjection>;
|
||||
export type RelationIdSubQuery = Selection<RelationIdProjection>;
|
||||
export type AccountIdSubQuery = Selection<AccountIdProjection>;
|
||||
export type SessionIdSubQuery = Selection<SessionIdProjection>;
|
||||
export type ToDoIdSubQuery = Selection<ToDoIdProjection>;
|
||||
export type UserRelationIdSubQuery = Selection<UserRelationIdProjection>;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ import * as User from "./User/Schema";
|
|||
import * as UserEntityClaim from "./UserEntityClaim/Schema";
|
||||
import * as UserEntityGrant from "./UserEntityGrant/Schema";
|
||||
import * as UserRelation from "./UserRelation/Schema";
|
||||
import * as Account from "./Account/Schema";
|
||||
import * as Address from "./Address/Schema";
|
||||
import * as Application from "./Application/Schema";
|
||||
import * as Area from "./Area/Schema";
|
||||
|
|
@ -159,8 +158,6 @@ export type UserIdSubQuery = {
|
|||
entity: "wechatQrCode";
|
||||
}) | (Address.UserIdSubQuery & {
|
||||
entity: "address";
|
||||
}) | (Account.UserIdSubQuery & {
|
||||
entity: "account";
|
||||
}) | (User.UserIdSubQuery & {
|
||||
entity: "user";
|
||||
}) | any;
|
||||
|
|
@ -190,15 +187,6 @@ export type UserRelationIdSubQuery = {
|
|||
entity: "userRelation";
|
||||
}) | any;
|
||||
};
|
||||
export type AccountIdSubQuery = {
|
||||
[K in "$in" | "$nin"]?: (Relation.AccountIdSubQuery & {
|
||||
entity: "relation";
|
||||
}) | (UserRelation.AccountIdSubQuery & {
|
||||
entity: "userRelation";
|
||||
}) | (Account.AccountIdSubQuery & {
|
||||
entity: "account";
|
||||
}) | any;
|
||||
};
|
||||
export type AddressIdSubQuery = {
|
||||
[K in "$in" | "$nin"]?: (Address.AddressIdSubQuery & {
|
||||
entity: "address";
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
declare const _default: (import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "message", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "account", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "address", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "application", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "article", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "articleMenu", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "extraFile", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "user", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "userEntityGrant", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatQrCode", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "notification", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatLogin", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "parasite", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "sessionMessage", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatMenu", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatPublicTag", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatMpJump", import("..").BRC<import("../oak-app-domain").EntityDict>>)[];
|
||||
declare const _default: (import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "account", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "application", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "address", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "user", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "userEntityGrant", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatQrCode", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "message", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "notification", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatLogin", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "articleMenu", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "article", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "parasite", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "extraFile", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "sessionMessage", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatMenu", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatPublicTag", import("..").BRC<import("../oak-app-domain").EntityDict>> | import("oak-domain/lib/types").Trigger<import("../oak-app-domain").EntityDict, "wechatMpJump", import("..").BRC<import("../oak-app-domain").EntityDict>>)[];
|
||||
export default _default;
|
||||
|
|
|
|||
|
|
@ -192,15 +192,15 @@ export class Token<ED extends EntityDict> extends Feature {
|
|||
}
|
||||
}
|
||||
|
||||
getTokenValue(allowUnloggedIn?: boolean) {
|
||||
if (!allowUnloggedIn && this.tokenValue === '') {
|
||||
getTokenValue() {
|
||||
if (this.tokenValue === '') {
|
||||
throw new OakUserInfoLoadingException();
|
||||
}
|
||||
return this.tokenValue;
|
||||
}
|
||||
|
||||
getToken(allowUnloggedIn?: boolean) {
|
||||
if (!allowUnloggedIn && this.tokenValue === '') {
|
||||
if (this.tokenValue === '') {
|
||||
throw new OakUserInfoLoadingException();
|
||||
}
|
||||
if (this.tokenValue) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue