Page MenuHomePhabricator
Differential D6788

[Identity] Add deleteUser RPC to proto files
ClosedPublic
Actions

Authored by • jon on Feb 20 2023, 1:34 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Apr 5, 2:46 AM
Unknown Object (File)
Thu, Apr 3, 1:25 PM
Unknown Object (File)
Thu, Apr 3, 1:25 PM
Unknown Object (File)
Thu, Apr 3, 1:18 PM
Unknown Object (File)
Thu, Apr 3, 1:18 PM
Unknown Object (File)
Thu, Apr 3, 1:18 PM
Unknown Object (File)
Thu, Apr 3, 1:17 PM
Unknown Object (File)
Wed, Apr 2, 4:09 PM
View All Files
Subscribers
ashoat
atul
tomek

Details

Reviewers
varun
• max
bartek
Commits
rCOMMde8151a7c3c0: [Identity] Add deleteUser RPC to proto files
Summary

Add deleteUser logic to identity service.

Depends on D6787

Part of https://linear.app/comm/issue/ENG-2764

Test Plan
cargo build

Gets end-to-end tested in a later diff

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

• jon created this revision.Feb 20 2023, 1:34 PM
Herald added subscribers: atul, tomek, ashoat. · View Herald TranscriptFeb 20 2023, 1:34 PM
• jon added a child revision: D6789: [Keyserver] Move shared identity client resources to lib.rs.Feb 20 2023, 1:41 PM
Harbormaster completed remote builds in B16640: Diff 22751.Feb 20 2023, 1:49 PM
• jon requested review of this revision.Feb 20 2023, 1:49 PM
• jon updated this revision to Diff 22756.Feb 20 2023, 1:59 PM

Add grpc implementation as it's not that much code

Harbormaster completed remote builds in B16645: Diff 22756.Feb 20 2023, 2:14 PM
• jon added inline comments.Feb 20 2023, 2:26 PM
services/identity/src/database.rs
202 ↗(On Diff #22756)

This might be a bit misleading, whether or not it deleted something, this will still return as successful.

varun accepted this revision.Feb 21 2023, 9:56 AM

nice! i noticed we never send back the failure enum variant. did you look into best practices for gRPC API design?

This revision is now accepted and ready to land.Feb 21 2023, 9:56 AM
• jon added a comment.Feb 21 2023, 10:16 AM

Since the generated bindings require me to send Result<tonic::Response<DeleteUserResponse>, tonic::Status>, I can only send a status. I will just remove the inner result and let the grpc status dictate success.

• jon updated this revision to Diff 22884.Feb 21 2023, 10:52 AM

Remove response enum, as it duplicates GRPC behavior

Harbormaster completed remote builds in B16729: Diff 22884.Feb 21 2023, 11:22 AM
• jon updated this revision to Diff 22894.Feb 21 2023, 1:36 PM

Rebase on master

Harbormaster failed remote builds in B16737: Diff 22894!Feb 21 2023, 1:42 PM
bartek accepted this revision.Feb 21 2023, 1:47 PM
Harbormaster completed remote builds in B16737: Diff 22894.Feb 22 2023, 4:22 PM
Closed by commit rCOMMde8151a7c3c0: [Identity] Add deleteUser RPC to proto files (authored by • jon). · Explain WhyFeb 22 2023, 4:25 PM
This revision was automatically updated to reflect the committed changes.
• jon added a commit: rCOMMde8151a7c3c0: [Identity] Add deleteUser RPC to proto files.

Revision Contents
Changeset List

PathSize
services/
identity/
src/
32 lines
19 lines
shared/
protos/
12 lines

Diff 22953

View Options

services/identity/src/database.rs

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import { import {
pushTypes, pushTypes,
type CreateMessageInfoParams, type CreateMessageInfoParams,
type MessageSpec, type MessageSpec,
type NotificationTextsParams,
} from './message-spec.js'; } from './message-spec.js';
import { joinResult } from './utils.js'; import { joinResult } from './utils.js';
import type { PlatformDetails } from '../../types/device-types.js'; import type { PlatformDetails } from '../../types/device-types.js';
import { messageTypes } from '../../types/message-types.js'; import { messageTypes } from '../../types/message-types.js';
import type { import type {
MessageInfo, MessageInfo,
ClientDBMessageInfo, ClientDBMessageInfo,
} from '../../types/message-types.js'; } from '../../types/message-types.js';
import type { import type {
CreateSidebarMessageData, CreateSidebarMessageData,
CreateSidebarMessageInfo, CreateSidebarMessageInfo,
RawCreateSidebarMessageInfo, RawCreateSidebarMessageInfo,
} from '../../types/messages/create-sidebar.js'; } from '../../types/messages/create-sidebar.js';
import type { RawUnsupportedMessageInfo } from '../../types/messages/unsupported.js'; import type { RawUnsupportedMessageInfo } from '../../types/messages/unsupported.js';
import type { NotifTexts } from '../../types/notif-types.js'; import type { NotifTexts } from '../../types/notif-types.js';
import type { ThreadInfo } from '../../types/thread-types.js'; import type { ThreadInfo } from '../../types/thread-types.js';
import type { RelativeUserInfo } from '../../types/user-types.js'; import type { RelativeUserInfo } from '../../types/user-types.js';
import { import {
ET, ET,
type EntityText, type EntityText,
pluralizeEntityText, pluralizeEntityText,
} from '../../utils/entity-text.js'; } from '../../utils/entity-text.js';
import { isMentioned } from '../mention-utils.js';
import { hasMinCodeVersion } from '../version-utils.js'; import { hasMinCodeVersion } from '../version-utils.js';
export const createSidebarMessageSpec: MessageSpec< export const createSidebarMessageSpec: MessageSpec<
CreateSidebarMessageData, CreateSidebarMessageData,
RawCreateSidebarMessageInfo, RawCreateSidebarMessageInfo,
CreateSidebarMessageInfo, CreateSidebarMessageInfo,
> = Object.freeze({ > = Object.freeze({
messageContentForServerDB( messageContentForServerDB(
▲ Show 20 Lines • Show All 134 Lines • ▼ Show 20 Lines unshimMessageInfo(
unwrapped: RawCreateSidebarMessageInfo, unwrapped: RawCreateSidebarMessageInfo,
): RawCreateSidebarMessageInfo { ): RawCreateSidebarMessageInfo {
return unwrapped; return unwrapped;
}, },
async notificationTexts( async notificationTexts(
messageInfos: $ReadOnlyArray<MessageInfo>, messageInfos: $ReadOnlyArray<MessageInfo>,
threadInfo: ThreadInfo, threadInfo: ThreadInfo,
params: NotificationTextsParams,
): Promise<NotifTexts> { ): Promise<NotifTexts> {
const firstMessageInfo = messageInfos[0]; const firstMessageInfo = messageInfos[0];
invariant( invariant(
firstMessageInfo.type === messageTypes.CREATE_SIDEBAR, firstMessageInfo.type === messageTypes.CREATE_SIDEBAR,
'firstMessageInfo should be messageTypes.CREATE_SIDEBAR!', 'firstMessageInfo should be messageTypes.CREATE_SIDEBAR!',
); );
const creator = ET.user({ userInfo: firstMessageInfo.creator }); const creator = ET.user({ userInfo: firstMessageInfo.creator });
const prefix = ET`${creator}`; const prefix = ET`${creator}`;
const initialName = firstMessageInfo.initialThreadState.name; const initialName = firstMessageInfo.initialThreadState.name;
const sourceMessageAuthorPossessive = ET.user({ const sourceMessageAuthorPossessive = ET.user({
userInfo: firstMessageInfo.sourceMessageAuthor, userInfo: firstMessageInfo.sourceMessageAuthor,
possessive: true, possessive: true,
}); });
let body = `started a thread in response to `; let body = `started a thread in response to `;
body = ET`${body} ${sourceMessageAuthorPossessive} message`; body = ET`${body} ${sourceMessageAuthorPossessive} message`;
if (initialName) {
const { username } = params.notifTargetUserInfo;
const secondMessageInfo = messageInfos[1];
if (
username &&
secondMessageInfo &&
secondMessageInfo.type === messageTypes.SIDEBAR_SOURCE &&
secondMessageInfo.sourceMessage.type === messageTypes.TEXT &&
isMentioned(username, secondMessageInfo.sourceMessage.text)
) {
body = ET`${body} that tagged you`;
} else if (initialName) {
body = ET`${body} "${initialName}"`; body = ET`${body} "${initialName}"`;
} }
return { return {
merged: ET`${prefix} ${body}`, merged: ET`${prefix} ${body}`,
body, body,
title: threadInfo.uiName, title: threadInfo.uiName,
prefix, prefix,
Show All 20 Lines
View Options

services/identity/src/service.rs

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import { import {
pushTypes, pushTypes,
type CreateMessageInfoParams, type CreateMessageInfoParams,
type MessageSpec, type MessageSpec,
type NotificationTextsParams,
} from './message-spec.js'; } from './message-spec.js';
import { joinResult } from './utils.js'; import { joinResult } from './utils.js';
import type { PlatformDetails } from '../../types/device-types.js'; import type { PlatformDetails } from '../../types/device-types.js';
import { messageTypes } from '../../types/message-types.js'; import { messageTypes } from '../../types/message-types.js';
import type { import type {
MessageInfo, MessageInfo,
ClientDBMessageInfo, ClientDBMessageInfo,
} from '../../types/message-types.js'; } from '../../types/message-types.js';
import type { import type {
CreateSidebarMessageData, CreateSidebarMessageData,
CreateSidebarMessageInfo, CreateSidebarMessageInfo,
RawCreateSidebarMessageInfo, RawCreateSidebarMessageInfo,
} from '../../types/messages/create-sidebar.js'; } from '../../types/messages/create-sidebar.js';
import type { RawUnsupportedMessageInfo } from '../../types/messages/unsupported.js'; import type { RawUnsupportedMessageInfo } from '../../types/messages/unsupported.js';
import type { NotifTexts } from '../../types/notif-types.js'; import type { NotifTexts } from '../../types/notif-types.js';
import type { ThreadInfo } from '../../types/thread-types.js'; import type { ThreadInfo } from '../../types/thread-types.js';
import type { RelativeUserInfo } from '../../types/user-types.js'; import type { RelativeUserInfo } from '../../types/user-types.js';
import { import {
ET, ET,
type EntityText, type EntityText,
pluralizeEntityText, pluralizeEntityText,
} from '../../utils/entity-text.js'; } from '../../utils/entity-text.js';
import { isMentioned } from '../mention-utils.js';
import { hasMinCodeVersion } from '../version-utils.js'; import { hasMinCodeVersion } from '../version-utils.js';
export const createSidebarMessageSpec: MessageSpec< export const createSidebarMessageSpec: MessageSpec<
CreateSidebarMessageData, CreateSidebarMessageData,
RawCreateSidebarMessageInfo, RawCreateSidebarMessageInfo,
CreateSidebarMessageInfo, CreateSidebarMessageInfo,
> = Object.freeze({ > = Object.freeze({
messageContentForServerDB( messageContentForServerDB(
▲ Show 20 Lines • Show All 134 Lines • ▼ Show 20 Lines unshimMessageInfo(
unwrapped: RawCreateSidebarMessageInfo, unwrapped: RawCreateSidebarMessageInfo,
): RawCreateSidebarMessageInfo { ): RawCreateSidebarMessageInfo {
return unwrapped; return unwrapped;
}, },
async notificationTexts( async notificationTexts(
messageInfos: $ReadOnlyArray<MessageInfo>, messageInfos: $ReadOnlyArray<MessageInfo>,
threadInfo: ThreadInfo, threadInfo: ThreadInfo,
params: NotificationTextsParams,
): Promise<NotifTexts> { ): Promise<NotifTexts> {
const firstMessageInfo = messageInfos[0]; const firstMessageInfo = messageInfos[0];
invariant( invariant(
firstMessageInfo.type === messageTypes.CREATE_SIDEBAR, firstMessageInfo.type === messageTypes.CREATE_SIDEBAR,
'firstMessageInfo should be messageTypes.CREATE_SIDEBAR!', 'firstMessageInfo should be messageTypes.CREATE_SIDEBAR!',
); );
const creator = ET.user({ userInfo: firstMessageInfo.creator }); const creator = ET.user({ userInfo: firstMessageInfo.creator });
const prefix = ET`${creator}`; const prefix = ET`${creator}`;
const initialName = firstMessageInfo.initialThreadState.name; const initialName = firstMessageInfo.initialThreadState.name;
const sourceMessageAuthorPossessive = ET.user({ const sourceMessageAuthorPossessive = ET.user({
userInfo: firstMessageInfo.sourceMessageAuthor, userInfo: firstMessageInfo.sourceMessageAuthor,
possessive: true, possessive: true,
}); });
let body = `started a thread in response to `; let body = `started a thread in response to `;
body = ET`${body} ${sourceMessageAuthorPossessive} message`; body = ET`${body} ${sourceMessageAuthorPossessive} message`;
if (initialName) {
const { username } = params.notifTargetUserInfo;
const secondMessageInfo = messageInfos[1];
if (
username &&
secondMessageInfo &&
secondMessageInfo.type === messageTypes.SIDEBAR_SOURCE &&
secondMessageInfo.sourceMessage.type === messageTypes.TEXT &&
isMentioned(username, secondMessageInfo.sourceMessage.text)
) {
body = ET`${body} that tagged you`;
} else if (initialName) {
body = ET`${body} "${initialName}"`; body = ET`${body} "${initialName}"`;
} }
return { return {
merged: ET`${prefix} ${body}`, merged: ET`${prefix} ${body}`,
body, body,
title: threadInfo.uiName, title: threadInfo.uiName,
prefix, prefix,
Show All 20 Lines
View Options

shared/protos/identity.proto

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import { import {
pushTypes, pushTypes,
type CreateMessageInfoParams, type CreateMessageInfoParams,
type MessageSpec, type MessageSpec,
type NotificationTextsParams,
} from './message-spec.js'; } from './message-spec.js';
import { joinResult } from './utils.js'; import { joinResult } from './utils.js';
import type { PlatformDetails } from '../../types/device-types.js'; import type { PlatformDetails } from '../../types/device-types.js';
import { messageTypes } from '../../types/message-types.js'; import { messageTypes } from '../../types/message-types.js';
import type { import type {
MessageInfo, MessageInfo,
ClientDBMessageInfo, ClientDBMessageInfo,
} from '../../types/message-types.js'; } from '../../types/message-types.js';
import type { import type {
CreateSidebarMessageData, CreateSidebarMessageData,
CreateSidebarMessageInfo, CreateSidebarMessageInfo,
RawCreateSidebarMessageInfo, RawCreateSidebarMessageInfo,
} from '../../types/messages/create-sidebar.js'; } from '../../types/messages/create-sidebar.js';
import type { RawUnsupportedMessageInfo } from '../../types/messages/unsupported.js'; import type { RawUnsupportedMessageInfo } from '../../types/messages/unsupported.js';
import type { NotifTexts } from '../../types/notif-types.js'; import type { NotifTexts } from '../../types/notif-types.js';
import type { ThreadInfo } from '../../types/thread-types.js'; import type { ThreadInfo } from '../../types/thread-types.js';
import type { RelativeUserInfo } from '../../types/user-types.js'; import type { RelativeUserInfo } from '../../types/user-types.js';
import { import {
ET, ET,
type EntityText, type EntityText,
pluralizeEntityText, pluralizeEntityText,
} from '../../utils/entity-text.js'; } from '../../utils/entity-text.js';
import { isMentioned } from '../mention-utils.js';
import { hasMinCodeVersion } from '../version-utils.js'; import { hasMinCodeVersion } from '../version-utils.js';
export const createSidebarMessageSpec: MessageSpec< export const createSidebarMessageSpec: MessageSpec<
CreateSidebarMessageData, CreateSidebarMessageData,
RawCreateSidebarMessageInfo, RawCreateSidebarMessageInfo,
CreateSidebarMessageInfo, CreateSidebarMessageInfo,
> = Object.freeze({ > = Object.freeze({
messageContentForServerDB( messageContentForServerDB(
▲ Show 20 Lines • Show All 134 Lines • ▼ Show 20 Lines unshimMessageInfo(
unwrapped: RawCreateSidebarMessageInfo, unwrapped: RawCreateSidebarMessageInfo,
): RawCreateSidebarMessageInfo { ): RawCreateSidebarMessageInfo {
return unwrapped; return unwrapped;
}, },
async notificationTexts( async notificationTexts(
messageInfos: $ReadOnlyArray<MessageInfo>, messageInfos: $ReadOnlyArray<MessageInfo>,
threadInfo: ThreadInfo, threadInfo: ThreadInfo,
params: NotificationTextsParams,
): Promise<NotifTexts> { ): Promise<NotifTexts> {
const firstMessageInfo = messageInfos[0]; const firstMessageInfo = messageInfos[0];
invariant( invariant(
firstMessageInfo.type === messageTypes.CREATE_SIDEBAR, firstMessageInfo.type === messageTypes.CREATE_SIDEBAR,
'firstMessageInfo should be messageTypes.CREATE_SIDEBAR!', 'firstMessageInfo should be messageTypes.CREATE_SIDEBAR!',
); );
const creator = ET.user({ userInfo: firstMessageInfo.creator }); const creator = ET.user({ userInfo: firstMessageInfo.creator });
const prefix = ET`${creator}`; const prefix = ET`${creator}`;
const initialName = firstMessageInfo.initialThreadState.name; const initialName = firstMessageInfo.initialThreadState.name;
const sourceMessageAuthorPossessive = ET.user({ const sourceMessageAuthorPossessive = ET.user({
userInfo: firstMessageInfo.sourceMessageAuthor, userInfo: firstMessageInfo.sourceMessageAuthor,
possessive: true, possessive: true,
}); });
let body = `started a thread in response to `; let body = `started a thread in response to `;
body = ET`${body} ${sourceMessageAuthorPossessive} message`; body = ET`${body} ${sourceMessageAuthorPossessive} message`;
if (initialName) {
const { username } = params.notifTargetUserInfo;
const secondMessageInfo = messageInfos[1];
if (
username &&
secondMessageInfo &&
secondMessageInfo.type === messageTypes.SIDEBAR_SOURCE &&
secondMessageInfo.sourceMessage.type === messageTypes.TEXT &&
isMentioned(username, secondMessageInfo.sourceMessage.text)
) {
body = ET`${body} that tagged you`;
} else if (initialName) {
body = ET`${body} "${initialName}"`; body = ET`${body} "${initialName}"`;
} }
return { return {
merged: ET`${prefix} ${body}`, merged: ET`${prefix} ${body}`,
body, body,
title: threadInfo.uiName, title: threadInfo.uiName,
prefix, prefix,
Show All 20 Lines