Page MenuHomePhabricator
Differential D3920

[Identity] Set max width to 80 characters
ClosedPublic
Actions

Authored by varun on May 4 2022, 11:32 AM.
Tags
None
Referenced Files
F4948432: D3920.diff
Wed, Mar 19, 9:33 PM
Unknown Object (File)
Sat, Mar 8, 11:17 PM
Unknown Object (File)
Sat, Mar 8, 11:17 PM
Unknown Object (File)
Sat, Mar 8, 11:16 PM
Unknown Object (File)
Sat, Mar 8, 11:13 PM
Unknown Object (File)
Fri, Mar 7, 7:12 AM
Unknown Object (File)
Tue, Mar 4, 4:56 AM
Unknown Object (File)
Sat, Mar 1, 6:36 PM
View All Files
Subscribers
• abosh
• adrian
ashoat
atul

Details

Reviewers
• karol
tomek
atul
• jim
Commits
rCOMM086389e20728: [Identity] Set max width to 80 characters
Summary

The rustfmt default is 100 characters, but we use 80 in the Comm codebase

Depends on D3853

Test Plan

Ran cargo build

Diff Detail

Repository
rCOMM Comm
Branch
varun/identity_service (branched from master)
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

varun created this revision.May 4 2022, 11:32 AM
Herald added subscribers: • abosh, atul, • adrian, ashoat. · View Herald TranscriptMay 4 2022, 11:32 AM
Harbormaster completed remote builds in B8788: Diff 12236.May 4 2022, 11:37 AM
varun requested review of this revision.May 4 2022, 11:37 AM
varun added a child revision: D3921: [Identity] Implement database client method to get pake registration.May 4 2022, 1:40 PM
• karol accepted this revision.May 5 2022, 3:59 AM
• karol added a reviewer: • jim.
atul accepted this revision.May 5 2022, 4:33 AM
• jim resigned from this revision.May 5 2022, 8:35 AM

Resigning as reviewer b/c I don't condone 80 char line limits. :-P

This revision is now accepted and ready to land.May 5 2022, 8:35 AM
Closed by commit rCOMM086389e20728: [Identity] Set max width to 80 characters (authored by varun). · Explain WhyMay 10 2022, 12:20 PM
This revision was automatically updated to reflect the committed changes.
varun added a commit: rCOMM086389e20728: [Identity] Set max width to 80 characters.
varun added a child revision: D4015: [services][identity] helper function to create primary key for DynamoDB.May 12 2022, 8:06 AM
varun removed a child revision: D3921: [Identity] Implement database client method to get pake registration.May 12 2022, 8:18 AM

Revision Contents
Changeset List

PathSize
services/
identity/
1 line
src/
4 lines
3 lines
12 lines

Diff 12236

View Options

services/identity/rustfmt.toml

// @flow // @flow
import type { Utility as OlmUtility } from '@commapp/olm'; import type { Utility as OlmUtility } from '@commapp/olm';
import invariant from 'invariant'; import invariant from 'invariant';
import { ErrorTypes, SiweMessage } from 'siwe'; import { ErrorTypes, SiweMessage } from 'siwe';
import t from 'tcomb'; import t, { type TInterface } from 'tcomb';
import bcrypt from 'twin-bcrypt'; import bcrypt from 'twin-bcrypt';
import { baseLegalPolicies, policies } from 'lib/facts/policies.js'; import {
baseLegalPolicies,
policies,
policyTypeValidator,
} from 'lib/facts/policies.js';
import { hasMinCodeVersion } from 'lib/shared/version-utils.js'; import { hasMinCodeVersion } from 'lib/shared/version-utils.js';
import type { import type {
ResetPasswordRequest, ResetPasswordRequest,
LogOutResponse, LogOutResponse,
DeleteAccountRequest, DeleteAccountRequest,
RegisterResponse, RegisterResponse,
RegisterRequest, RegisterRequest,
LogInResponse, LogInResponse,
Show All 10 Lines
import type { import type {
ClientAvatar, ClientAvatar,
UpdateUserAvatarRequest, UpdateUserAvatarRequest,
} from 'lib/types/avatar-types.js'; } from 'lib/types/avatar-types.js';
import type { import type {
IdentityKeysBlob, IdentityKeysBlob,
SignedIdentityKeysBlob, SignedIdentityKeysBlob,
} from 'lib/types/crypto-types.js'; } from 'lib/types/crypto-types.js';
import type { CalendarQuery } from 'lib/types/entry-types.js'; import {
import { defaultNumberPerThread } from 'lib/types/message-types.js'; type CalendarQuery,
rawEntryInfoValidator,
} from 'lib/types/entry-types.js';
import {
defaultNumberPerThread,
rawMessageInfoValidator,
messageTruncationStatusesValidator,
} from 'lib/types/message-types.js';
import type { import type {
SIWEAuthRequest, SIWEAuthRequest,
SIWEMessage, SIWEMessage,
SIWESocialProof, SIWESocialProof,
} from 'lib/types/siwe-types.js'; } from 'lib/types/siwe-types.js';
import type { import type {
SubscriptionUpdateRequest, SubscriptionUpdateRequest,
SubscriptionUpdateResponse, SubscriptionUpdateResponse,
} from 'lib/types/subscription-types.js'; } from 'lib/types/subscription-types.js';
import type { PasswordUpdate } from 'lib/types/user-types.js'; import { rawThreadInfoValidator } from 'lib/types/thread-types.js';
import {
type PasswordUpdate,
loggedOutUserInfoValidator,
loggedInUserInfoValidator,
oldLoggedInUserInfoValidator,
userInfoValidator,
} from 'lib/types/user-types.js';
import { updateUserAvatarRequestValidator } from 'lib/utils/avatar-utils.js'; import { updateUserAvatarRequestValidator } from 'lib/utils/avatar-utils.js';
import { import {
identityKeysBlobValidator, identityKeysBlobValidator,
signedIdentityKeysBlobValidator, signedIdentityKeysBlobValidator,
} from 'lib/utils/crypto-utils.js'; } from 'lib/utils/crypto-utils.js';
import { ServerError } from 'lib/utils/errors.js'; import { ServerError } from 'lib/utils/errors.js';
import { values } from 'lib/utils/objects.js'; import { values } from 'lib/utils/objects.js';
import { promiseAll } from 'lib/utils/promises.js'; import { promiseAll } from 'lib/utils/promises.js';
import { import {
getPublicKeyFromSIWEStatement, getPublicKeyFromSIWEStatement,
isValidSIWEMessage, isValidSIWEMessage,
isValidSIWEStatementWithPublicKey, isValidSIWEStatementWithPublicKey,
primaryIdentityPublicKeyRegex, primaryIdentityPublicKeyRegex,
} from 'lib/utils/siwe-utils.js'; } from 'lib/utils/siwe-utils.js';
import { import {
tShape, tShape,
tPlatformDetails, tPlatformDetails,
tPassword, tPassword,
tEmail, tEmail,
tOldValidUsername, tOldValidUsername,
tRegex, tRegex,
tID,
} from 'lib/utils/validation-utils.js'; } from 'lib/utils/validation-utils.js';
import { import {
entryQueryInputValidator, entryQueryInputValidator,
newEntryQueryInputValidator, newEntryQueryInputValidator,
normalizeCalendarQuery, normalizeCalendarQuery,
verifyCalendarQueryThreadIDs, verifyCalendarQueryThreadIDs,
} from './entry-responders.js'; } from './entry-responders.js';
▲ Show 20 Lines • Show All 105 Lines • ▼ Show 20 Lines return {
}, },
}; };
} }
const deleteAccountRequestInputValidator = tShape({ const deleteAccountRequestInputValidator = tShape({
password: t.maybe(tPassword), password: t.maybe(tPassword),
}); });
export const logOutResponseValidator: TInterface<LogOutResponse> =
tShape<LogOutResponse>({
currentUserInfo: loggedOutUserInfoValidator,
});
async function accountDeletionResponder( async function accountDeletionResponder(
viewer: Viewer, viewer: Viewer,
input: any, input: any,
): Promise<LogOutResponse> { ): Promise<LogOutResponse> {
const request: DeleteAccountRequest = input; const request: DeleteAccountRequest = input;
await validateInput(viewer, deleteAccountRequestInputValidator, request); await validateInput(viewer, deleteAccountRequestInputValidator, request);
const result = await deleteAccount(viewer, request); const result = await deleteAccount(viewer, request);
invariant(result, 'deleteAccount should return result if handed request'); invariant(result, 'deleteAccount should return result if handed request');
Show All 13 Linesconst registerRequestInputValidator = tShape({
deviceTokenUpdateRequest: t.maybe(deviceTokenUpdateRequestInputValidator), deviceTokenUpdateRequest: t.maybe(deviceTokenUpdateRequestInputValidator),
platformDetails: tPlatformDetails, platformDetails: tPlatformDetails,
// We include `primaryIdentityPublicKey` to avoid breaking // We include `primaryIdentityPublicKey` to avoid breaking
// old clients, but we no longer do anything with it. // old clients, but we no longer do anything with it.
primaryIdentityPublicKey: t.maybe(tRegex(primaryIdentityPublicKeyRegex)), primaryIdentityPublicKey: t.maybe(tRegex(primaryIdentityPublicKeyRegex)),
signedIdentityKeysBlob: t.maybe(signedIdentityKeysBlobValidator), signedIdentityKeysBlob: t.maybe(signedIdentityKeysBlobValidator),
}); });
export const registerResponseValidator: TInterface<RegisterResponse> =
tShape<RegisterResponse>({
id: t.String,
rawMessageInfos: t.list(rawMessageInfoValidator),
currentUserInfo: t.union([
oldLoggedInUserInfoValidator,
loggedInUserInfoValidator,
]),
cookieChange: tShape({
threadInfos: t.dict(t.String, rawThreadInfoValidator),
userInfos: t.list(userInfoValidator),
}),
});
async function accountCreationResponder( async function accountCreationResponder(
viewer: Viewer, viewer: Viewer,
input: any, input: any,
): Promise<RegisterResponse> { ): Promise<RegisterResponse> {
const request: RegisterRequest = input; const request: RegisterRequest = input;
await validateInput(viewer, registerRequestInputValidator, request); await validateInput(viewer, registerRequestInputValidator, request);
const { signedIdentityKeysBlob } = request; const { signedIdentityKeysBlob } = request;
if (signedIdentityKeysBlob) { if (signedIdentityKeysBlob) {
▲ Show 20 Lines • Show All 131 Lines • ▼ Show 20 Linesconst logInRequestInputValidator = tShape({
platformDetails: tPlatformDetails, platformDetails: tPlatformDetails,
source: t.maybe(t.enums.of(values(logInActionSources))), source: t.maybe(t.enums.of(values(logInActionSources))),
// We include `primaryIdentityPublicKey` to avoid breaking // We include `primaryIdentityPublicKey` to avoid breaking
// old clients, but we no longer do anything with it. // old clients, but we no longer do anything with it.
primaryIdentityPublicKey: t.maybe(tRegex(primaryIdentityPublicKeyRegex)), primaryIdentityPublicKey: t.maybe(tRegex(primaryIdentityPublicKeyRegex)),
signedIdentityKeysBlob: t.maybe(signedIdentityKeysBlobValidator), signedIdentityKeysBlob: t.maybe(signedIdentityKeysBlobValidator),
}); });
export const logInResponseValidator: TInterface<LogInResponse> =
tShape<LogInResponse>({
currentUserInfo: t.union([
loggedInUserInfoValidator,
oldLoggedInUserInfoValidator,
]),
rawMessageInfos: t.list(rawMessageInfoValidator),
truncationStatuses: messageTruncationStatusesValidator,
userInfos: t.list(userInfoValidator),
rawEntryInfos: t.maybe(t.list(rawEntryInfoValidator)),
serverTime: t.Number,
cookieChange: tShape({
threadInfos: t.dict(tID, rawThreadInfoValidator),
userInfos: t.list(userInfoValidator),
}),
notAcknowledgedPolicies: t.maybe(t.list(policyTypeValidator)),
});
async function logInResponder( async function logInResponder(
viewer: Viewer, viewer: Viewer,
input: any, input: any,
): Promise<LogInResponse> { ): Promise<LogInResponse> {
await validateInput(viewer, logInRequestInputValidator, input); await validateInput(viewer, logInRequestInputValidator, input);
const request: LogInRequest = input; const request: LogInRequest = input;
let identityKeys: ?IdentityKeysBlob; let identityKeys: ?IdentityKeysBlob;
▲ Show 20 Lines • Show All 281 Lines • Show Last 20 Lines
View Options

services/identity/src/config.rs

// @flow // @flow
import type { Utility as OlmUtility } from '@commapp/olm'; import type { Utility as OlmUtility } from '@commapp/olm';
import invariant from 'invariant'; import invariant from 'invariant';
import { ErrorTypes, SiweMessage } from 'siwe'; import { ErrorTypes, SiweMessage } from 'siwe';
import t from 'tcomb'; import t, { type TInterface } from 'tcomb';
import bcrypt from 'twin-bcrypt'; import bcrypt from 'twin-bcrypt';
import { baseLegalPolicies, policies } from 'lib/facts/policies.js'; import {
baseLegalPolicies,
policies,
policyTypeValidator,
} from 'lib/facts/policies.js';
import { hasMinCodeVersion } from 'lib/shared/version-utils.js'; import { hasMinCodeVersion } from 'lib/shared/version-utils.js';
import type { import type {
ResetPasswordRequest, ResetPasswordRequest,
LogOutResponse, LogOutResponse,
DeleteAccountRequest, DeleteAccountRequest,
RegisterResponse, RegisterResponse,
RegisterRequest, RegisterRequest,
LogInResponse, LogInResponse,
Show All 10 Lines
import type { import type {
ClientAvatar, ClientAvatar,
UpdateUserAvatarRequest, UpdateUserAvatarRequest,
} from 'lib/types/avatar-types.js'; } from 'lib/types/avatar-types.js';
import type { import type {
IdentityKeysBlob, IdentityKeysBlob,
SignedIdentityKeysBlob, SignedIdentityKeysBlob,
} from 'lib/types/crypto-types.js'; } from 'lib/types/crypto-types.js';
import type { CalendarQuery } from 'lib/types/entry-types.js'; import {
import { defaultNumberPerThread } from 'lib/types/message-types.js'; type CalendarQuery,
rawEntryInfoValidator,
} from 'lib/types/entry-types.js';
import {
defaultNumberPerThread,
rawMessageInfoValidator,
messageTruncationStatusesValidator,
} from 'lib/types/message-types.js';
import type { import type {
SIWEAuthRequest, SIWEAuthRequest,
SIWEMessage, SIWEMessage,
SIWESocialProof, SIWESocialProof,
} from 'lib/types/siwe-types.js'; } from 'lib/types/siwe-types.js';
import type { import type {
SubscriptionUpdateRequest, SubscriptionUpdateRequest,
SubscriptionUpdateResponse, SubscriptionUpdateResponse,
} from 'lib/types/subscription-types.js'; } from 'lib/types/subscription-types.js';
import type { PasswordUpdate } from 'lib/types/user-types.js'; import { rawThreadInfoValidator } from 'lib/types/thread-types.js';
import {
type PasswordUpdate,
loggedOutUserInfoValidator,
loggedInUserInfoValidator,
oldLoggedInUserInfoValidator,
userInfoValidator,
} from 'lib/types/user-types.js';
import { updateUserAvatarRequestValidator } from 'lib/utils/avatar-utils.js'; import { updateUserAvatarRequestValidator } from 'lib/utils/avatar-utils.js';
import { import {
identityKeysBlobValidator, identityKeysBlobValidator,
signedIdentityKeysBlobValidator, signedIdentityKeysBlobValidator,
} from 'lib/utils/crypto-utils.js'; } from 'lib/utils/crypto-utils.js';
import { ServerError } from 'lib/utils/errors.js'; import { ServerError } from 'lib/utils/errors.js';
import { values } from 'lib/utils/objects.js'; import { values } from 'lib/utils/objects.js';
import { promiseAll } from 'lib/utils/promises.js'; import { promiseAll } from 'lib/utils/promises.js';
import { import {
getPublicKeyFromSIWEStatement, getPublicKeyFromSIWEStatement,
isValidSIWEMessage, isValidSIWEMessage,
isValidSIWEStatementWithPublicKey, isValidSIWEStatementWithPublicKey,
primaryIdentityPublicKeyRegex, primaryIdentityPublicKeyRegex,
} from 'lib/utils/siwe-utils.js'; } from 'lib/utils/siwe-utils.js';
import { import {
tShape, tShape,
tPlatformDetails, tPlatformDetails,
tPassword, tPassword,
tEmail, tEmail,
tOldValidUsername, tOldValidUsername,
tRegex, tRegex,
tID,
} from 'lib/utils/validation-utils.js'; } from 'lib/utils/validation-utils.js';
import { import {
entryQueryInputValidator, entryQueryInputValidator,
newEntryQueryInputValidator, newEntryQueryInputValidator,
normalizeCalendarQuery, normalizeCalendarQuery,
verifyCalendarQueryThreadIDs, verifyCalendarQueryThreadIDs,
} from './entry-responders.js'; } from './entry-responders.js';
▲ Show 20 Lines • Show All 105 Lines • ▼ Show 20 Lines return {
}, },
}; };
} }
const deleteAccountRequestInputValidator = tShape({ const deleteAccountRequestInputValidator = tShape({
password: t.maybe(tPassword), password: t.maybe(tPassword),
}); });
export const logOutResponseValidator: TInterface<LogOutResponse> =
tShape<LogOutResponse>({
currentUserInfo: loggedOutUserInfoValidator,
});
async function accountDeletionResponder( async function accountDeletionResponder(
viewer: Viewer, viewer: Viewer,
input: any, input: any,
): Promise<LogOutResponse> { ): Promise<LogOutResponse> {
const request: DeleteAccountRequest = input; const request: DeleteAccountRequest = input;
await validateInput(viewer, deleteAccountRequestInputValidator, request); await validateInput(viewer, deleteAccountRequestInputValidator, request);
const result = await deleteAccount(viewer, request); const result = await deleteAccount(viewer, request);
invariant(result, 'deleteAccount should return result if handed request'); invariant(result, 'deleteAccount should return result if handed request');
Show All 13 Linesconst registerRequestInputValidator = tShape({
deviceTokenUpdateRequest: t.maybe(deviceTokenUpdateRequestInputValidator), deviceTokenUpdateRequest: t.maybe(deviceTokenUpdateRequestInputValidator),
platformDetails: tPlatformDetails, platformDetails: tPlatformDetails,
// We include `primaryIdentityPublicKey` to avoid breaking // We include `primaryIdentityPublicKey` to avoid breaking
// old clients, but we no longer do anything with it. // old clients, but we no longer do anything with it.
primaryIdentityPublicKey: t.maybe(tRegex(primaryIdentityPublicKeyRegex)), primaryIdentityPublicKey: t.maybe(tRegex(primaryIdentityPublicKeyRegex)),
signedIdentityKeysBlob: t.maybe(signedIdentityKeysBlobValidator), signedIdentityKeysBlob: t.maybe(signedIdentityKeysBlobValidator),
}); });
export const registerResponseValidator: TInterface<RegisterResponse> =
tShape<RegisterResponse>({
id: t.String,
rawMessageInfos: t.list(rawMessageInfoValidator),
currentUserInfo: t.union([
oldLoggedInUserInfoValidator,
loggedInUserInfoValidator,
]),
cookieChange: tShape({
threadInfos: t.dict(t.String, rawThreadInfoValidator),
userInfos: t.list(userInfoValidator),
}),
});
async function accountCreationResponder( async function accountCreationResponder(
viewer: Viewer, viewer: Viewer,
input: any, input: any,
): Promise<RegisterResponse> { ): Promise<RegisterResponse> {
const request: RegisterRequest = input; const request: RegisterRequest = input;
await validateInput(viewer, registerRequestInputValidator, request); await validateInput(viewer, registerRequestInputValidator, request);
const { signedIdentityKeysBlob } = request; const { signedIdentityKeysBlob } = request;
if (signedIdentityKeysBlob) { if (signedIdentityKeysBlob) {
▲ Show 20 Lines • Show All 131 Lines • ▼ Show 20 Linesconst logInRequestInputValidator = tShape({
platformDetails: tPlatformDetails, platformDetails: tPlatformDetails,
source: t.maybe(t.enums.of(values(logInActionSources))), source: t.maybe(t.enums.of(values(logInActionSources))),
// We include `primaryIdentityPublicKey` to avoid breaking // We include `primaryIdentityPublicKey` to avoid breaking
// old clients, but we no longer do anything with it. // old clients, but we no longer do anything with it.
primaryIdentityPublicKey: t.maybe(tRegex(primaryIdentityPublicKeyRegex)), primaryIdentityPublicKey: t.maybe(tRegex(primaryIdentityPublicKeyRegex)),
signedIdentityKeysBlob: t.maybe(signedIdentityKeysBlobValidator), signedIdentityKeysBlob: t.maybe(signedIdentityKeysBlobValidator),
}); });
export const logInResponseValidator: TInterface<LogInResponse> =
tShape<LogInResponse>({
currentUserInfo: t.union([
loggedInUserInfoValidator,
oldLoggedInUserInfoValidator,
]),
rawMessageInfos: t.list(rawMessageInfoValidator),
truncationStatuses: messageTruncationStatusesValidator,
userInfos: t.list(userInfoValidator),
rawEntryInfos: t.maybe(t.list(rawEntryInfoValidator)),
serverTime: t.Number,
cookieChange: tShape({
threadInfos: t.dict(tID, rawThreadInfoValidator),
userInfos: t.list(userInfoValidator),
}),
notAcknowledgedPolicies: t.maybe(t.list(policyTypeValidator)),
});
async function logInResponder( async function logInResponder(
viewer: Viewer, viewer: Viewer,
input: any, input: any,
): Promise<LogInResponse> { ): Promise<LogInResponse> {
await validateInput(viewer, logInRequestInputValidator, input); await validateInput(viewer, logInRequestInputValidator, input);
const request: LogInRequest = input; const request: LogInRequest = input;
let identityKeys: ?IdentityKeysBlob; let identityKeys: ?IdentityKeysBlob;
▲ Show 20 Lines • Show All 281 Lines • Show Last 20 Lines
View Options

services/identity/src/opaque.rs

// @flow // @flow
import type { Utility as OlmUtility } from '@commapp/olm'; import type { Utility as OlmUtility } from '@commapp/olm';
import invariant from 'invariant'; import invariant from 'invariant';
import { ErrorTypes, SiweMessage } from 'siwe'; import { ErrorTypes, SiweMessage } from 'siwe';
import t from 'tcomb'; import t, { type TInterface } from 'tcomb';
import bcrypt from 'twin-bcrypt'; import bcrypt from 'twin-bcrypt';
import { baseLegalPolicies, policies } from 'lib/facts/policies.js'; import {
baseLegalPolicies,
policies,
policyTypeValidator,
} from 'lib/facts/policies.js';
import { hasMinCodeVersion } from 'lib/shared/version-utils.js'; import { hasMinCodeVersion } from 'lib/shared/version-utils.js';
import type { import type {
ResetPasswordRequest, ResetPasswordRequest,
LogOutResponse, LogOutResponse,
DeleteAccountRequest, DeleteAccountRequest,
RegisterResponse, RegisterResponse,
RegisterRequest, RegisterRequest,
LogInResponse, LogInResponse,
Show All 10 Lines
import type { import type {
ClientAvatar, ClientAvatar,
UpdateUserAvatarRequest, UpdateUserAvatarRequest,
} from 'lib/types/avatar-types.js'; } from 'lib/types/avatar-types.js';
import type { import type {
IdentityKeysBlob, IdentityKeysBlob,
SignedIdentityKeysBlob, SignedIdentityKeysBlob,
} from 'lib/types/crypto-types.js'; } from 'lib/types/crypto-types.js';
import type { CalendarQuery } from 'lib/types/entry-types.js'; import {
import { defaultNumberPerThread } from 'lib/types/message-types.js'; type CalendarQuery,
rawEntryInfoValidator,
} from 'lib/types/entry-types.js';
import {
defaultNumberPerThread,
rawMessageInfoValidator,
messageTruncationStatusesValidator,
} from 'lib/types/message-types.js';
import type { import type {
SIWEAuthRequest, SIWEAuthRequest,
SIWEMessage, SIWEMessage,
SIWESocialProof, SIWESocialProof,
} from 'lib/types/siwe-types.js'; } from 'lib/types/siwe-types.js';
import type { import type {
SubscriptionUpdateRequest, SubscriptionUpdateRequest,
SubscriptionUpdateResponse, SubscriptionUpdateResponse,
} from 'lib/types/subscription-types.js'; } from 'lib/types/subscription-types.js';
import type { PasswordUpdate } from 'lib/types/user-types.js'; import { rawThreadInfoValidator } from 'lib/types/thread-types.js';
import {
type PasswordUpdate,
loggedOutUserInfoValidator,
loggedInUserInfoValidator,
oldLoggedInUserInfoValidator,
userInfoValidator,
} from 'lib/types/user-types.js';
import { updateUserAvatarRequestValidator } from 'lib/utils/avatar-utils.js'; import { updateUserAvatarRequestValidator } from 'lib/utils/avatar-utils.js';
import { import {
identityKeysBlobValidator, identityKeysBlobValidator,
signedIdentityKeysBlobValidator, signedIdentityKeysBlobValidator,
} from 'lib/utils/crypto-utils.js'; } from 'lib/utils/crypto-utils.js';
import { ServerError } from 'lib/utils/errors.js'; import { ServerError } from 'lib/utils/errors.js';
import { values } from 'lib/utils/objects.js'; import { values } from 'lib/utils/objects.js';
import { promiseAll } from 'lib/utils/promises.js'; import { promiseAll } from 'lib/utils/promises.js';
import { import {
getPublicKeyFromSIWEStatement, getPublicKeyFromSIWEStatement,
isValidSIWEMessage, isValidSIWEMessage,
isValidSIWEStatementWithPublicKey, isValidSIWEStatementWithPublicKey,
primaryIdentityPublicKeyRegex, primaryIdentityPublicKeyRegex,
} from 'lib/utils/siwe-utils.js'; } from 'lib/utils/siwe-utils.js';
import { import {
tShape, tShape,
tPlatformDetails, tPlatformDetails,
tPassword, tPassword,
tEmail, tEmail,
tOldValidUsername, tOldValidUsername,
tRegex, tRegex,
tID,
} from 'lib/utils/validation-utils.js'; } from 'lib/utils/validation-utils.js';
import { import {
entryQueryInputValidator, entryQueryInputValidator,
newEntryQueryInputValidator, newEntryQueryInputValidator,
normalizeCalendarQuery, normalizeCalendarQuery,
verifyCalendarQueryThreadIDs, verifyCalendarQueryThreadIDs,
} from './entry-responders.js'; } from './entry-responders.js';
▲ Show 20 Lines • Show All 105 Lines • ▼ Show 20 Lines return {
}, },
}; };
} }
const deleteAccountRequestInputValidator = tShape({ const deleteAccountRequestInputValidator = tShape({
password: t.maybe(tPassword), password: t.maybe(tPassword),
}); });
export const logOutResponseValidator: TInterface<LogOutResponse> =
tShape<LogOutResponse>({
currentUserInfo: loggedOutUserInfoValidator,
});
async function accountDeletionResponder( async function accountDeletionResponder(
viewer: Viewer, viewer: Viewer,
input: any, input: any,
): Promise<LogOutResponse> { ): Promise<LogOutResponse> {
const request: DeleteAccountRequest = input; const request: DeleteAccountRequest = input;
await validateInput(viewer, deleteAccountRequestInputValidator, request); await validateInput(viewer, deleteAccountRequestInputValidator, request);
const result = await deleteAccount(viewer, request); const result = await deleteAccount(viewer, request);
invariant(result, 'deleteAccount should return result if handed request'); invariant(result, 'deleteAccount should return result if handed request');
Show All 13 Linesconst registerRequestInputValidator = tShape({
deviceTokenUpdateRequest: t.maybe(deviceTokenUpdateRequestInputValidator), deviceTokenUpdateRequest: t.maybe(deviceTokenUpdateRequestInputValidator),
platformDetails: tPlatformDetails, platformDetails: tPlatformDetails,
// We include `primaryIdentityPublicKey` to avoid breaking // We include `primaryIdentityPublicKey` to avoid breaking
// old clients, but we no longer do anything with it. // old clients, but we no longer do anything with it.
primaryIdentityPublicKey: t.maybe(tRegex(primaryIdentityPublicKeyRegex)), primaryIdentityPublicKey: t.maybe(tRegex(primaryIdentityPublicKeyRegex)),
signedIdentityKeysBlob: t.maybe(signedIdentityKeysBlobValidator), signedIdentityKeysBlob: t.maybe(signedIdentityKeysBlobValidator),
}); });
export const registerResponseValidator: TInterface<RegisterResponse> =
tShape<RegisterResponse>({
id: t.String,
rawMessageInfos: t.list(rawMessageInfoValidator),
currentUserInfo: t.union([
oldLoggedInUserInfoValidator,
loggedInUserInfoValidator,
]),
cookieChange: tShape({
threadInfos: t.dict(t.String, rawThreadInfoValidator),
userInfos: t.list(userInfoValidator),
}),
});
async function accountCreationResponder( async function accountCreationResponder(
viewer: Viewer, viewer: Viewer,
input: any, input: any,
): Promise<RegisterResponse> { ): Promise<RegisterResponse> {
const request: RegisterRequest = input; const request: RegisterRequest = input;
await validateInput(viewer, registerRequestInputValidator, request); await validateInput(viewer, registerRequestInputValidator, request);
const { signedIdentityKeysBlob } = request; const { signedIdentityKeysBlob } = request;
if (signedIdentityKeysBlob) { if (signedIdentityKeysBlob) {
▲ Show 20 Lines • Show All 131 Lines • ▼ Show 20 Linesconst logInRequestInputValidator = tShape({
platformDetails: tPlatformDetails, platformDetails: tPlatformDetails,
source: t.maybe(t.enums.of(values(logInActionSources))), source: t.maybe(t.enums.of(values(logInActionSources))),
// We include `primaryIdentityPublicKey` to avoid breaking // We include `primaryIdentityPublicKey` to avoid breaking
// old clients, but we no longer do anything with it. // old clients, but we no longer do anything with it.
primaryIdentityPublicKey: t.maybe(tRegex(primaryIdentityPublicKeyRegex)), primaryIdentityPublicKey: t.maybe(tRegex(primaryIdentityPublicKeyRegex)),
signedIdentityKeysBlob: t.maybe(signedIdentityKeysBlobValidator), signedIdentityKeysBlob: t.maybe(signedIdentityKeysBlobValidator),
}); });
export const logInResponseValidator: TInterface<LogInResponse> =
tShape<LogInResponse>({
currentUserInfo: t.union([
loggedInUserInfoValidator,
oldLoggedInUserInfoValidator,
]),
rawMessageInfos: t.list(rawMessageInfoValidator),
truncationStatuses: messageTruncationStatusesValidator,
userInfos: t.list(userInfoValidator),
rawEntryInfos: t.maybe(t.list(rawEntryInfoValidator)),
serverTime: t.Number,
cookieChange: tShape({
threadInfos: t.dict(tID, rawThreadInfoValidator),
userInfos: t.list(userInfoValidator),
}),
notAcknowledgedPolicies: t.maybe(t.list(policyTypeValidator)),
});
async function logInResponder( async function logInResponder(
viewer: Viewer, viewer: Viewer,
input: any, input: any,
): Promise<LogInResponse> { ): Promise<LogInResponse> {
await validateInput(viewer, logInRequestInputValidator, input); await validateInput(viewer, logInRequestInputValidator, input);
const request: LogInRequest = input; const request: LogInRequest = input;
let identityKeys: ?IdentityKeysBlob; let identityKeys: ?IdentityKeysBlob;
▲ Show 20 Lines • Show All 281 Lines • Show Last 20 Lines
View Options

services/identity/src/service.rs

// @flow // @flow
import type { Utility as OlmUtility } from '@commapp/olm'; import type { Utility as OlmUtility } from '@commapp/olm';
import invariant from 'invariant'; import invariant from 'invariant';
import { ErrorTypes, SiweMessage } from 'siwe'; import { ErrorTypes, SiweMessage } from 'siwe';
import t from 'tcomb'; import t, { type TInterface } from 'tcomb';
import bcrypt from 'twin-bcrypt'; import bcrypt from 'twin-bcrypt';
import { baseLegalPolicies, policies } from 'lib/facts/policies.js'; import {
baseLegalPolicies,
policies,
policyTypeValidator,
} from 'lib/facts/policies.js';
import { hasMinCodeVersion } from 'lib/shared/version-utils.js'; import { hasMinCodeVersion } from 'lib/shared/version-utils.js';
import type { import type {
ResetPasswordRequest, ResetPasswordRequest,
LogOutResponse, LogOutResponse,
DeleteAccountRequest, DeleteAccountRequest,
RegisterResponse, RegisterResponse,
RegisterRequest, RegisterRequest,
LogInResponse, LogInResponse,
Show All 10 Lines
import type { import type {
ClientAvatar, ClientAvatar,
UpdateUserAvatarRequest, UpdateUserAvatarRequest,
} from 'lib/types/avatar-types.js'; } from 'lib/types/avatar-types.js';
import type { import type {
IdentityKeysBlob, IdentityKeysBlob,
SignedIdentityKeysBlob, SignedIdentityKeysBlob,
} from 'lib/types/crypto-types.js'; } from 'lib/types/crypto-types.js';
import type { CalendarQuery } from 'lib/types/entry-types.js'; import {
import { defaultNumberPerThread } from 'lib/types/message-types.js'; type CalendarQuery,
rawEntryInfoValidator,
} from 'lib/types/entry-types.js';
import {
defaultNumberPerThread,
rawMessageInfoValidator,
messageTruncationStatusesValidator,
} from 'lib/types/message-types.js';
import type { import type {
SIWEAuthRequest, SIWEAuthRequest,
SIWEMessage, SIWEMessage,
SIWESocialProof, SIWESocialProof,
} from 'lib/types/siwe-types.js'; } from 'lib/types/siwe-types.js';
import type { import type {
SubscriptionUpdateRequest, SubscriptionUpdateRequest,
SubscriptionUpdateResponse, SubscriptionUpdateResponse,
} from 'lib/types/subscription-types.js'; } from 'lib/types/subscription-types.js';
import type { PasswordUpdate } from 'lib/types/user-types.js'; import { rawThreadInfoValidator } from 'lib/types/thread-types.js';
import {
type PasswordUpdate,
loggedOutUserInfoValidator,
loggedInUserInfoValidator,
oldLoggedInUserInfoValidator,
userInfoValidator,
} from 'lib/types/user-types.js';
import { updateUserAvatarRequestValidator } from 'lib/utils/avatar-utils.js'; import { updateUserAvatarRequestValidator } from 'lib/utils/avatar-utils.js';
import { import {
identityKeysBlobValidator, identityKeysBlobValidator,
signedIdentityKeysBlobValidator, signedIdentityKeysBlobValidator,
} from 'lib/utils/crypto-utils.js'; } from 'lib/utils/crypto-utils.js';
import { ServerError } from 'lib/utils/errors.js'; import { ServerError } from 'lib/utils/errors.js';
import { values } from 'lib/utils/objects.js'; import { values } from 'lib/utils/objects.js';
import { promiseAll } from 'lib/utils/promises.js'; import { promiseAll } from 'lib/utils/promises.js';
import { import {
getPublicKeyFromSIWEStatement, getPublicKeyFromSIWEStatement,
isValidSIWEMessage, isValidSIWEMessage,
isValidSIWEStatementWithPublicKey, isValidSIWEStatementWithPublicKey,
primaryIdentityPublicKeyRegex, primaryIdentityPublicKeyRegex,
} from 'lib/utils/siwe-utils.js'; } from 'lib/utils/siwe-utils.js';
import { import {
tShape, tShape,
tPlatformDetails, tPlatformDetails,
tPassword, tPassword,
tEmail, tEmail,
tOldValidUsername, tOldValidUsername,
tRegex, tRegex,
tID,
} from 'lib/utils/validation-utils.js'; } from 'lib/utils/validation-utils.js';
import { import {
entryQueryInputValidator, entryQueryInputValidator,
newEntryQueryInputValidator, newEntryQueryInputValidator,
normalizeCalendarQuery, normalizeCalendarQuery,
verifyCalendarQueryThreadIDs, verifyCalendarQueryThreadIDs,
} from './entry-responders.js'; } from './entry-responders.js';
▲ Show 20 Lines • Show All 105 Lines • ▼ Show 20 Lines return {
}, },
}; };
} }
const deleteAccountRequestInputValidator = tShape({ const deleteAccountRequestInputValidator = tShape({
password: t.maybe(tPassword), password: t.maybe(tPassword),
}); });
export const logOutResponseValidator: TInterface<LogOutResponse> =
tShape<LogOutResponse>({
currentUserInfo: loggedOutUserInfoValidator,
});
async function accountDeletionResponder( async function accountDeletionResponder(
viewer: Viewer, viewer: Viewer,
input: any, input: any,
): Promise<LogOutResponse> { ): Promise<LogOutResponse> {
const request: DeleteAccountRequest = input; const request: DeleteAccountRequest = input;
await validateInput(viewer, deleteAccountRequestInputValidator, request); await validateInput(viewer, deleteAccountRequestInputValidator, request);
const result = await deleteAccount(viewer, request); const result = await deleteAccount(viewer, request);
invariant(result, 'deleteAccount should return result if handed request'); invariant(result, 'deleteAccount should return result if handed request');
Show All 13 Linesconst registerRequestInputValidator = tShape({
deviceTokenUpdateRequest: t.maybe(deviceTokenUpdateRequestInputValidator), deviceTokenUpdateRequest: t.maybe(deviceTokenUpdateRequestInputValidator),
platformDetails: tPlatformDetails, platformDetails: tPlatformDetails,
// We include `primaryIdentityPublicKey` to avoid breaking // We include `primaryIdentityPublicKey` to avoid breaking
// old clients, but we no longer do anything with it. // old clients, but we no longer do anything with it.
primaryIdentityPublicKey: t.maybe(tRegex(primaryIdentityPublicKeyRegex)), primaryIdentityPublicKey: t.maybe(tRegex(primaryIdentityPublicKeyRegex)),
signedIdentityKeysBlob: t.maybe(signedIdentityKeysBlobValidator), signedIdentityKeysBlob: t.maybe(signedIdentityKeysBlobValidator),
}); });
export const registerResponseValidator: TInterface<RegisterResponse> =
tShape<RegisterResponse>({
id: t.String,
rawMessageInfos: t.list(rawMessageInfoValidator),
currentUserInfo: t.union([
oldLoggedInUserInfoValidator,
loggedInUserInfoValidator,
]),
cookieChange: tShape({
threadInfos: t.dict(t.String, rawThreadInfoValidator),
userInfos: t.list(userInfoValidator),
}),
});
async function accountCreationResponder( async function accountCreationResponder(
viewer: Viewer, viewer: Viewer,
input: any, input: any,
): Promise<RegisterResponse> { ): Promise<RegisterResponse> {
const request: RegisterRequest = input; const request: RegisterRequest = input;
await validateInput(viewer, registerRequestInputValidator, request); await validateInput(viewer, registerRequestInputValidator, request);
const { signedIdentityKeysBlob } = request; const { signedIdentityKeysBlob } = request;
if (signedIdentityKeysBlob) { if (signedIdentityKeysBlob) {
▲ Show 20 Lines • Show All 131 Lines • ▼ Show 20 Linesconst logInRequestInputValidator = tShape({
platformDetails: tPlatformDetails, platformDetails: tPlatformDetails,
source: t.maybe(t.enums.of(values(logInActionSources))), source: t.maybe(t.enums.of(values(logInActionSources))),
// We include `primaryIdentityPublicKey` to avoid breaking // We include `primaryIdentityPublicKey` to avoid breaking
// old clients, but we no longer do anything with it. // old clients, but we no longer do anything with it.
primaryIdentityPublicKey: t.maybe(tRegex(primaryIdentityPublicKeyRegex)), primaryIdentityPublicKey: t.maybe(tRegex(primaryIdentityPublicKeyRegex)),
signedIdentityKeysBlob: t.maybe(signedIdentityKeysBlobValidator), signedIdentityKeysBlob: t.maybe(signedIdentityKeysBlobValidator),
}); });
export const logInResponseValidator: TInterface<LogInResponse> =
tShape<LogInResponse>({
currentUserInfo: t.union([
loggedInUserInfoValidator,
oldLoggedInUserInfoValidator,
]),
rawMessageInfos: t.list(rawMessageInfoValidator),
truncationStatuses: messageTruncationStatusesValidator,
userInfos: t.list(userInfoValidator),
rawEntryInfos: t.maybe(t.list(rawEntryInfoValidator)),
serverTime: t.Number,
cookieChange: tShape({
threadInfos: t.dict(tID, rawThreadInfoValidator),
userInfos: t.list(userInfoValidator),
}),
notAcknowledgedPolicies: t.maybe(t.list(policyTypeValidator)),
});
async function logInResponder( async function logInResponder(
viewer: Viewer, viewer: Viewer,
input: any, input: any,
): Promise<LogInResponse> { ): Promise<LogInResponse> {
await validateInput(viewer, logInRequestInputValidator, input); await validateInput(viewer, logInRequestInputValidator, input);
const request: LogInRequest = input; const request: LogInRequest = input;
let identityKeys: ?IdentityKeysBlob; let identityKeys: ?IdentityKeysBlob;
▲ Show 20 Lines • Show All 281 Lines • Show Last 20 Lines