Page MenuHomePhabricator
Differential D5077

[Nix] Remove /usr/bin/ from PATH
ClosedPublic
Actions

Authored by • jon on Sep 6 2022, 11:00 AM.
Tags
None
Referenced Files
F4951998: D5077.id16385.diff
Thu, Mar 20, 4:52 PM
Unknown Object (File)
Sat, Mar 15, 10:09 PM
Unknown Object (File)
Sat, Mar 15, 4:58 AM
Unknown Object (File)
Tue, Mar 11, 9:28 PM
Unknown Object (File)
Fri, Mar 7, 7:02 AM
Unknown Object (File)
Wed, Mar 5, 3:20 PM
Unknown Object (File)
Tue, Mar 4, 12:38 PM
Unknown Object (File)
Tue, Mar 4, 4:21 AM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
varun
atul
• max
• abosh
Commits
rCOMMb7e927be208a: [Nix] Remove /usr/bin/ from PATH
Summary

With https://phab.comm.dev/D5076, pod-patch was updated to not
require BSD sed. This removes the workaround put in place to make that previous
workflow happy.

Depends on D5076

Test Plan
arc patch <this revision>
nix develop

# clean npm, and attempt pod install with new `pod-patch`
yarn cleaninstall
cd native/ios
pod cache clean --all
pod install

open -na xcode
# Comm project should build

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
scripts/
2 lines

Diff 16415

View Options

scripts/source_development_defaults.sh

// @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