diff --git a/keyserver/src/responders/redux-state-responders.js b/keyserver/src/responders/redux-state-responders.js --- a/keyserver/src/responders/redux-state-responders.js +++ b/keyserver/src/responders/redux-state-responders.js @@ -43,7 +43,7 @@ import { tShape, ashoatKeyserverID, tID } from 'lib/utils/validation-utils.js'; import type { WebInitialReduxStateResponse, - InitialKeyserverInfo, + WebInitialKeyserverInfo, InitialReduxStateRequest, ExcludedData, } from 'web/types/redux-types.js'; @@ -74,7 +74,7 @@ clientUpdatesCurrentAsOf: t.Number, }); -const initialKeyserverInfoValidator = tShape({ +const initialKeyserverInfoValidator = tShape({ sessionID: t.maybe(t.String), updatesCurrentAsOf: t.Number, }); diff --git a/web/redux/action-types.js b/web/redux/action-types.js --- a/web/redux/action-types.js +++ b/web/redux/action-types.js @@ -11,7 +11,7 @@ ExcludedData, InitialReduxState, WebInitialReduxStateResponse, - InitialKeyserverInfo, + WebInitialKeyserverInfo, InitialReduxStateRequest, } from '../types/redux-types.js'; @@ -113,7 +113,7 @@ const inviteLinksStore = { links: {}, }; - let keyserverInfos: { [keyserverID: string]: InitialKeyserverInfo } = {}; + let keyserverInfos: { [keyserverID: string]: WebInitialKeyserverInfo } = {}; for (const keyserverID in responses) { entryStore.daysToEntries = { diff --git a/web/types/redux-types.js b/web/types/redux-types.js --- a/web/types/redux-types.js +++ b/web/types/redux-types.js @@ -18,7 +18,7 @@ +pushApiPublicKey: ?string, +commServicesAccessToken: null, +inviteLinksStore: InviteLinksStore, - +keyserverInfo: InitialKeyserverInfo, + +keyserverInfo: WebInitialKeyserverInfo, }; export type InitialReduxState = { @@ -33,10 +33,10 @@ +inviteLinksStore: InviteLinksStore, +dataLoaded: boolean, +actualizedCalendarQuery: CalendarQuery, - +keyserverInfos: { +[keyserverID: string]: InitialKeyserverInfo }, + +keyserverInfos: { +[keyserverID: string]: WebInitialKeyserverInfo }, }; -export type InitialKeyserverInfo = { +export type WebInitialKeyserverInfo = { +sessionID: ?string, +updatesCurrentAsOf: number, };