From b3393ef05d71bb2b9e74fa87d6d57e6fc80b4085 Mon Sep 17 00:00:00 2001 From: "Gpound.liu" <141617023+Gggpound@users.noreply.github.com> Date: Thu, 13 Jun 2024 11:25:58 +0800 Subject: [PATCH] fix(core): init user info (#2499) --- packages/core/src/services/user-manager/const.ts | 11 ++++++++++- .../src/services/user-manager/user-manager.service.ts | 3 +-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/core/src/services/user-manager/const.ts b/packages/core/src/services/user-manager/const.ts index f83ff3a21463..fb571614abf7 100644 --- a/packages/core/src/services/user-manager/const.ts +++ b/packages/core/src/services/user-manager/const.ts @@ -25,7 +25,16 @@ const nameMap = { [UnitRole.Reader]: 'Reader', [UnitRole.UNRECOGNIZED]: 'UNRECOGNIZED', }; -export const createDefaultUser = (type: UnitRole) => { +export const createDefaultUser = (type?: UnitRole) => { + if (!type) { + return { + userID: '', + name: '', + avatar: '', + anonymous: true, + canBindAnonymous: false, + } as IUser; + } const user = { userID: `${nameMap[type]}_${Tools.generateRandomId(8)}`, name: nameMap[type], diff --git a/packages/core/src/services/user-manager/user-manager.service.ts b/packages/core/src/services/user-manager/user-manager.service.ts index f50a49fad848..fe5205c77125 100644 --- a/packages/core/src/services/user-manager/user-manager.service.ts +++ b/packages/core/src/services/user-manager/user-manager.service.ts @@ -15,7 +15,6 @@ */ import type { IUser } from '@univerjs/protocol'; -import { UnitRole } from '@univerjs/protocol'; import { BehaviorSubject, Subject } from 'rxjs'; import { LifecycleStages, OnLifecycle } from '../lifecycle/lifecycle'; @@ -26,7 +25,7 @@ export class UserManagerService { private _model = new Map(); private _userChange$ = new Subject<{ type: 'add' | 'delete'; user: IUser } | { type: 'clear' }>(); public userChange$ = this._userChange$.asObservable(); - private _currentUser$ = new BehaviorSubject(createDefaultUser(UnitRole.Owner)); + private _currentUser$ = new BehaviorSubject(createDefaultUser()); /** * When the current user undergoes a switch or change * @memberof UserManagerService