In D10064#293452, @ashoat wrote:

Most of the changes were related to moving RPCs from one proto to the other, so I approached this by opening these files side-by side and moving flow definition between files

Did you make sure the ordering was the same as the TypeScript files? It's important that we try to keep our Flow definitions here minimally different from the TypeScript definitions. The more "different" and "custom" of an approach you take, the harder it becomes to compare the codegenned TypeScript types with our existing in-repo Flow types. This will make changes more difficult in the future.

Yes, the ordering is the same in TypeScript and Flow files - obviously keeping order consistent also simplifies my work. By saying side by side I also meant comparing them with typescript files, I should've mentioned that in the description, I admit it isn't clear enough.

Relatedly, it looks like this:

logOutUser(
  request: identityStructs.LogoutRequest,
  metadata: grpcWeb.Metadata | void,
  callback: (err: grpcWeb.RpcError,
             response: identityStructs.Empty) => void
): grpcWeb.ClientReadableStream<identityStructs.Empty>;

Got replaced with this:

logOutUser(
  request: identityStructs.Empty,
  metadata?: grpcWeb.Metadata
): Promise<identityStructs.Empty>;

Can you explain why you made these changes? I have a strong preference to revert these changes in favor of keeping the Flow types minimally different from the TypeScript types.

This is intentional - in D9931 I have removed LogoutRequest because it's not needed for the auth proto. The same applies to DeleteUserRequest.

Sidenote – you're making it rather hard on your reviewer by simultaneously moving and changing code. I have to compare each thing side-by-side manually, which takes a lot of time. Please see here

This could be split into three diffs but it will keep the cjs files inconsistent with ts/flow definitions between these diffs.

Full list of changes:

• Added FindUserID proto, with request and response types
• Deleted UploadOneTimeKeys and its types from unauth proto (it was previously in both protos)
• Moved Delete and Logout RPCs to the auth proto
  • The Request objects are not necessary so replaced them with Empty (contents of former requests are now in auth metadata)
• Moved GetOutboundKeysForUser to the auth proto.
  • Partially the types were already there for keyserver keys endpoints
• Moved GetInboundKeysForUser to the auth proto along with its types, though they internally use PreKey and IdentityKeyInfo from the unauth proto
• Moved UpdateUserPassword RPCs along with its types to the auth proto