Skip to content

Commit 9864eda

Browse files
committed
use null instead of Map for empty user field in store
1 parent ef2c80e commit 9864eda

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

packages/client/src/AccountsClient.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,9 @@ export class AccountsClient {
8181
return Promise.resolve(this.storage.removeItem(keyName));
8282
}
8383

84-
user(): UserObjectType {
85-
return this.getState().get('user').toJS();
84+
user(): UserObjectType | null {
85+
const user = this.getState().get('user');
86+
return user ? user.toJS() : null;
8687
}
8788

8889
async tokens(): Promise<TokensType> {
@@ -250,7 +251,7 @@ const Accounts = {
250251
...options,
251252
}, transport);
252253
},
253-
user(): UserObjectType {
254+
user(): UserObjectType | null {
254255
return this.instance.user();
255256
},
256257
options(): Object {

packages/client/src/module.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const LOGGING_IN = `${PATH}LOGGING_IN`;
88

99
const initialState = Map({
1010
isLoading: false,
11-
user: Map(),
11+
user: null,
1212
loggingIn: false,
1313
});
1414

@@ -23,7 +23,7 @@ const reducer = (state = initialState, action) => {
2323
return state.set('user', Map(user));
2424
}
2525
case CLEAR_USER: {
26-
return state.set('user', Map());
26+
return state.set('user', null);
2727
}
2828
case LOGGING_IN: {
2929
const { isLoggingIn } = action.payload;

0 commit comments

Comments
 (0)