Revert "[web] Migrate to new id schema"

This reverts commit 3293f7d.
CommE2E · Jul 13, 2023 · 932c409 · 932c409
1 parent 05657aa
commit 932c409
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 42 deletions.
diff --git a/keyserver/src/responders/website-responders.js b/keyserver/src/responders/website-responders.js
@@ -605,7 +605,6 @@ async function websiteResponder(
     viewer.platformDetails,
     initialReduxStateValidator,
     initialReduxState,
-    true,
   );
   const jsonStream = streamJSON(res, validatedInitialReduxState);
 

diff --git a/keyserver/src/utils/validation-utils.js b/keyserver/src/utils/validation-utils.js
@@ -7,7 +7,7 @@ import {
   hasMinCodeVersion,
   FUTURE_CODE_VERSION,
 } from 'lib/shared/version-utils.js';
-import { type PlatformDetails } from 'lib/types/device-types.js';
+import { type PlatformDetails, isWebPlatform } from 'lib/types/device-types.js';
 import { ServerError } from 'lib/utils/errors.js';
 import {
   tCookie,
@@ -39,8 +39,8 @@ async function validateInput<T>(
   if (
     hasMinCodeVersion(viewer.platformDetails, {
       native: FUTURE_CODE_VERSION,
-      web: FUTURE_CODE_VERSION,
     }) &&
+    !isWebPlatform(viewer.platformDetails?.platform) &&
     convertToNewIDSchema
   ) {
     try {
@@ -61,7 +61,6 @@ function validateOutput<T>(
   platformDetails: ?PlatformDetails,
   outputValidator: TType<T>,
   data: T,
-  alwaysConvertSchema?: boolean,
 ): T {
   if (!outputValidator.is(data)) {
     console.trace(
@@ -72,11 +71,8 @@ function validateOutput<T>(
   }
 
   if (
-    (hasMinCodeVersion(platformDetails, {
-      native: FUTURE_CODE_VERSION,
-      web: FUTURE_CODE_VERSION,
-    }) ||
-      alwaysConvertSchema) &&
+    hasMinCodeVersion(platformDetails, { native: FUTURE_CODE_VERSION }) &&
+    !isWebPlatform(platformDetails?.platform) &&
     convertToNewIDSchema
   ) {
     return convertServerIDsToClientIDs(

diff --git a/web/redux/persist.js b/web/redux/persist.js
@@ -1,6 +1,5 @@
 // @flow
 
-import invariant from 'invariant';
 import { getStoredState, purgeStoredState } from 'redux-persist';
 import storage from 'redux-persist/es/storage/index.js';
 import type { PersistConfig } from 'redux-persist/src/types.js';
@@ -10,10 +9,6 @@ import {
   type StorageMigrationFunction,
 } from 'lib/shared/create-async-migrate.js';
 import { isDev } from 'lib/utils/dev-utils.js';
-import {
-  generateIDSchemaMigrationOpsForDrafts,
-  convertDraftStoreToNewIDSchema,
-} from 'lib/utils/migration-utils.js';
 
 import commReduxStorageEngine from './comm-redux-storage-engine.js';
 import type { AppState } from './redux-setup.js';
@@ -66,34 +61,6 @@ const migrations = {
 
     return state;
   },
-  [3]: async (state: AppState) => {
-    let newState = state;
-    if (state.draftStore) {
-      newState = {
-        ...newState,
-        draftStore: convertDraftStoreToNewIDSchema(state.draftStore),
-      };
-    }
-
-    if (!isDatabaseSupported) {
-      return newState;
-    }
-
-    const stores = await databaseModule.schedule({
-      type: workerRequestMessageTypes.GET_CLIENT_STORE,
-    });
-    invariant(stores?.store, 'Stores should exist');
-    await databaseModule.schedule({
-      type: workerRequestMessageTypes.PROCESS_STORE_OPERATIONS,
-      storeOperations: {
-        draftStoreOperations: generateIDSchemaMigrationOpsForDrafts(
-          stores.store.drafts,
-        ),
-      },
-    });
-
-    return newState;
-  },
 };
 
 const persistWhitelist = [