api: Transform zulip_{version,feature_level} in registerForEvents

Instead of doing so in accountsReducer.

Author: chrisbobbe

src/__tests__/lib/exampleData.js

@@ -723,7 +723,7 @@ export const action = Object.freeze({
       msg: '',
       queue_id: '1',
       zulip_feature_level: recentZulipFeatureLevel,
-      zulip_version: recentZulipVersion.raw(),
+      zulip_version: recentZulipVersion,
 
       // InitialDataAlertWords
       alert_words: [],

src/account/__tests__/accountsReducer-test.js

@@ -26,7 +26,7 @@ describe('accountsReducer', () => {
       expect(
         accountsReducer(
           deepFreeze([account1, account2, account3]),
-          eg.mkActionRegisterComplete({ zulip_version: newZulipVersion.raw() }),
+          eg.mkActionRegisterComplete({ zulip_version: newZulipVersion }),
         ),
       ).toEqual([{ ...account1, zulipVersion: newZulipVersion }, account2, account3]);
     });

src/account/accountsReducer.js

@@ -21,8 +21,8 @@ const registerComplete = (state, action) => [
   {
     ...state[0],
     userId: action.data.user_id,
-    zulipFeatureLevel: action.data.zulip_feature_level ?? 0,
-    zulipVersion: new ZulipVersion(action.data.zulip_version),
+    zulipFeatureLevel: action.data.zulip_feature_level,
+    zulipVersion: action.data.zulip_version,
     lastDismissedServerPushSetupNotice: action.data.realm_push_notifications_enabled
       ? null
       : state[0].lastDismissedServerPushSetupNotice,

src/api/initialDataTypes.js

@@ -21,6 +21,7 @@ import type {
   CreateWebPublicStreamPolicy,
   EmailAddressVisibility,
 } from './permissionsTypes';
+import type { ZulipVersion } from '../utils/zulipVersion';
 
 /*
    The types in this file are organized by which `fetch_event_types` values
@@ -29,12 +30,7 @@ import type {
    See comments at `InitialData`, at the bottom, for details.
  */
 
-/**
- * The parts of the `/register` response sent regardless of `fetch_event_types`.
- *
- * See `InitialData` for more discussion.
- */
-export type InitialDataBase = $ReadOnly<{|
+export type RawInitialDataBase = $ReadOnly<{|
   last_event_id: number,
   msg: string,
   queue_id: string,
@@ -52,7 +48,7 @@ export type InitialDataBase = $ReadOnly<{|
    * Same meaning as in the server_settings response:
    * https://zulip.com/api/get-server-settings. See also the comment above.
    */
-  // TODO(server-3.0): Mark as required.
+  // TODO(server-3.0): Mark as required; remove missing-to-zero transform
   zulip_feature_level?: number,
 
   /**
@@ -64,6 +60,20 @@ export type InitialDataBase = $ReadOnly<{|
   zulip_version: string,
 |}>;
 
+/**
+ * The parts of the `/register` response sent regardless of `fetch_event_types`.
+ *
+ * Post-transformation. For what we expect directly from the server, see
+ * RawInitialDataBase.
+ *
+ * See `InitialData` for more discussion.
+ */
+export type InitialDataBase = $ReadOnly<{|
+  ...RawInitialDataBase,
+  zulip_feature_level: number, // filled in with zero if missing
+  zulip_version: ZulipVersion, // parsed from string
+|}>;
+
 export type InitialDataAlertWords = $ReadOnly<{|
   alert_words: $ReadOnlyArray<string>,
 |}>;
@@ -716,6 +726,7 @@ export type InitialData = {|
  */
 export type RawInitialData = $ReadOnly<{|
   ...InitialData,
+  ...RawInitialDataBase,
   ...RawInitialDataRealmUser,
   ...RawInitialDataRealmFilters,
 |}>;

src/api/registerForEvents.js

@@ -6,6 +6,7 @@ import type { Auth } from './transportTypes';
 import type { CrossRealmBot, User } from './modelTypes';
 import { apiPost } from './apiFetch';
 import { AvatarURL } from '../utils/avatar';
+import { ZulipVersion } from '../utils/zulipVersion';
 
 const transformUser = (rawUser: {| ...User, avatar_url?: string | null |}, realm: URL): User => {
   const { avatar_url: rawAvatarUrl, email } = rawUser;
@@ -36,6 +37,9 @@ const transformCrossRealmBot = (
 const transform = (rawInitialData: RawInitialData, auth: Auth): InitialData => ({
   ...rawInitialData,
 
+  zulip_feature_level: rawInitialData.zulip_feature_level ?? 0,
+  zulip_version: new ZulipVersion(rawInitialData.zulip_version),
+
   // Transform the newer `realm_linkifiers` format, if present, to the
   // older `realm_filters` format. We do the same transformation on
   // 'realm_linkifiers' events.

src/events/eventActions.js

@@ -23,7 +23,6 @@ import { BackoffMachine, TimeoutError } from '../utils/async';
 import { ApiError, RequestError, Server5xxError, NetworkError } from '../api/apiErrors';
 import * as logging from '../utils/logging';
 import { showErrorAlert } from '../utils/info';
-import { ZulipVersion } from '../utils/zulipVersion';
 import { tryFetch, fetchPrivateMessages } from '../message/fetchActions';
 import { MIN_RECENTPMS_SERVER_VERSION } from '../pm-conversations/pmConversationsModel';
 import { sendOutbox } from '../outbox/outboxActions';
@@ -171,7 +170,7 @@ export const registerAndStartPolling =
       return;
     }
 
-    const serverVersion = new ZulipVersion(initData.zulip_version);
+    const serverVersion = initData.zulip_version;
 
     // Set Sentry tags for the server version immediately, so they're accurate
     // in case we hit an exception in reducers on `registerComplete` below.