Compare commits

...
8 Commits
Author SHA1 Message Date
Dominik Sokal 5a730d70d6 v0.29.1 2021-09-29 13:21:17 +02:00
Dominik Sokal 41f58e5e52 fix double prompt for apple credentials (#654)
* add credentials context to build context

* add credentials context to submission context

* use credentials context when authenticating with apple

* don't use chalk.italic

* update CHANGELOG
2021-09-29 11:50:07 +02:00
kgc00 34af57f585 upgraded analytics client (#655) 2021-09-29 09:15:17 +02:00
Quinlan Jung 4674cbebc5 [eas-cli] use existing google service account key (#650)
* [eas-cli] use existing google service account key

* changelog

* pr feedback

* update snap
2021-09-28 15:07:10 -07:00
Quinlan Jung 69add6f523 fix changelog 2021-09-28 14:55:45 -07:00
Quinlan Jung b70e874135 [eas-cli] assign google service account key (#649)
* [eas-cli] assign google service account key

* changelog

* pr feedback
2021-09-28 14:54:41 -07:00
Dominik Sokal 03fa29dd5a make eslint disallow use of sync fs functions (#652)
* make eslint disallow use of sync fs functions

* update CHANGELOG
2021-09-28 13:41:38 +02:00
Wojciech Kozyra 9e467b900e Update CHANGELOG 2021-09-28 12:30:37 +02:00
106 changed files with 1154 additions and 888 deletions

No files matched your search

+2 -1
View File
@@ -1,7 +1,7 @@
module.exports = {
root: true,
extends: ['universe/node'],
plugins: ['async-protect'],
plugins: ['async-protect', 'node'],
rules: {
'no-console': 'warn',
'no-constant-condition': ['warn', { checkLoops: false }],
@@ -41,6 +41,7 @@ module.exports = {
},
],
'async-protect/async-suffix': 'error',
'node/no-sync': 'error',
},
overrides: [
{
+15
View File
@@ -8,6 +8,21 @@ This is the log of notable changes to EAS CLI and related packages.
### 🎉 New features
- More upload support for Google Service Account Keys. ([#649](https://github.com/expo/eas-cli/pull/649) by [@quinlanj](https://github.com/quinlanj))
- Allow the user to assign an existing Google Service Account Key to their project. ([#650](https://github.com/expo/eas-cli/pull/650) by [@quinlanj](https://github.com/quinlanj))
### 🐛 Bug fixes
- Fix double prompt for Apple credentials when running `eas build --auto-submit`. ([#654](https://github.com/expo/eas-cli/pull/654) by [@dsokal](https://github.com/dsokal))
### 🧹 Chores
- Always use async `fs` functions. ([#652](https://github.com/expo/eas-cli/pull/652) by [@dsokal](https://github.com/dsokal))
## [0.29.0](https://github.com/expo/eas-cli/releases/tag/v0.29.0) - 2021-09-28
### 🎉 New features
- Added upload support for Google Service Account Keys. ([#642](https://github.com/expo/eas-cli/pull/642) by [@quinlanj](https://github.com/quinlanj))
- Add Xcode 13 image. ([#651](https://github.com/expo/eas-cli/pull/651) by [@wkozyra95](https://github.com/wkozyra95))
+1 -1
View File
@@ -1,5 +1,5 @@
{
"npmClient": "yarn",
"useWorkspaces": true,
"version": "0.29.0"
"version": "0.29.1"
}
+1
View File
@@ -21,6 +21,7 @@
"eslint": "7.32.0",
"eslint-config-universe": "8.0.0",
"eslint-plugin-async-protect": "1.1.0",
"eslint-plugin-node": "11.1.0",
"jest": "27.1.0",
"jest-watch-typeahead": "0.6.4",
"lerna": "4.0.0",
+26 -26
View File
@@ -73,7 +73,7 @@ ALIASES
$ eas login
```
_See code: [src/commands/account/login.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/account/login.js)_
_See code: [src/commands/account/login.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/account/login.js)_
## `eas account:logout`
@@ -87,7 +87,7 @@ ALIASES
$ eas logout
```
_See code: [src/commands/account/logout.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/account/logout.js)_
_See code: [src/commands/account/logout.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/account/logout.js)_
## `eas account:view`
@@ -101,7 +101,7 @@ ALIASES
$ eas whoami
```
_See code: [src/commands/account/view.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/account/view.js)_
_See code: [src/commands/account/view.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/account/view.js)_
## `eas analytics [STATUS]`
@@ -112,7 +112,7 @@ USAGE
$ eas analytics [STATUS]
```
_See code: [src/commands/analytics.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/analytics.js)_
_See code: [src/commands/analytics.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/analytics.js)_
## `eas build`
@@ -145,7 +145,7 @@ OPTIONS
--[no-]wait Wait for build(s) to complete
```
_See code: [src/commands/build/index.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/build/index.js)_
_See code: [src/commands/build/index.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/build/index.js)_
## `eas build:cancel [BUILD_ID]`
@@ -156,7 +156,7 @@ USAGE
$ eas build:cancel [BUILD_ID]
```
_See code: [src/commands/build/cancel.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/build/cancel.js)_
_See code: [src/commands/build/cancel.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/build/cancel.js)_
## `eas build:configure`
@@ -170,7 +170,7 @@ OPTIONS
-p, --platform=(android|ios|all) Platform to configure
```
_See code: [src/commands/build/configure.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/build/configure.js)_
_See code: [src/commands/build/configure.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/build/configure.js)_
## `eas build:list`
@@ -203,7 +203,7 @@ OPTIONS
--status=(new|in-queue|in-progress|errored|finished|canceled)
```
_See code: [src/commands/build/list.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/build/list.js)_
_See code: [src/commands/build/list.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/build/list.js)_
## `eas build:view [BUILD_ID]`
@@ -217,7 +217,7 @@ OPTIONS
--json Enable JSON output, non-JSON messages will be printed to stderr
```
_See code: [src/commands/build/view.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/build/view.js)_
_See code: [src/commands/build/view.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/build/view.js)_
## `eas config`
@@ -232,7 +232,7 @@ OPTIONS
--profile=profile
```
_See code: [src/commands/config.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/config.js)_
_See code: [src/commands/config.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/config.js)_
## `eas credentials`
@@ -243,7 +243,7 @@ USAGE
$ eas credentials
```
_See code: [src/commands/credentials.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/credentials.js)_
_See code: [src/commands/credentials.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/credentials.js)_
## `eas device:create`
@@ -254,7 +254,7 @@ USAGE
$ eas device:create
```
_See code: [src/commands/device/create.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/device/create.js)_
_See code: [src/commands/device/create.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/device/create.js)_
## `eas device:list`
@@ -268,7 +268,7 @@ OPTIONS
--apple-team-id=apple-team-id
```
_See code: [src/commands/device/list.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/device/list.js)_
_See code: [src/commands/device/list.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/device/list.js)_
## `eas device:view [UDID]`
@@ -279,7 +279,7 @@ USAGE
$ eas device:view [UDID]
```
_See code: [src/commands/device/view.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/device/view.js)_
_See code: [src/commands/device/view.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/device/view.js)_
## `eas diagnostics`
@@ -290,7 +290,7 @@ USAGE
$ eas diagnostics
```
_See code: [src/commands/diagnostics.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/diagnostics.js)_
_See code: [src/commands/diagnostics.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/diagnostics.js)_
## `eas help [COMMAND]`
@@ -318,7 +318,7 @@ USAGE
$ eas project:info
```
_See code: [src/commands/project/info.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/project/info.js)_
_See code: [src/commands/project/info.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/project/info.js)_
## `eas project:init`
@@ -332,7 +332,7 @@ ALIASES
$ eas init
```
_See code: [src/commands/project/init.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/project/init.js)_
_See code: [src/commands/project/init.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/project/init.js)_
## `eas secret:create`
@@ -349,7 +349,7 @@ OPTIONS
--value=value Value of the secret
```
_See code: [src/commands/secret/create.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/secret/create.js)_
_See code: [src/commands/secret/create.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/secret/create.js)_
## `eas secret:delete`
@@ -366,7 +366,7 @@ DESCRIPTION
Unsure where to find the secret's ID? Run eas secrets:list
```
_See code: [src/commands/secret/delete.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/secret/delete.js)_
_See code: [src/commands/secret/delete.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/secret/delete.js)_
## `eas secret:list`
@@ -377,7 +377,7 @@ USAGE
$ eas secret:list
```
_See code: [src/commands/secret/list.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/secret/list.js)_
_See code: [src/commands/secret/list.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/secret/list.js)_
## `eas submit`
@@ -410,7 +410,7 @@ ALIASES
$ eas build:submit
```
_See code: [src/commands/submit.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/submit.js)_
_See code: [src/commands/submit.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/submit.js)_
## `eas webhook:create`
@@ -429,7 +429,7 @@ OPTIONS
--url=url Webhook URL
```
_See code: [src/commands/webhook/create.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/webhook/create.js)_
_See code: [src/commands/webhook/create.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/webhook/create.js)_
## `eas webhook:delete [ID]`
@@ -443,7 +443,7 @@ ARGUMENTS
ID ID of the webhook to delete
```
_See code: [src/commands/webhook/delete.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/webhook/delete.js)_
_See code: [src/commands/webhook/delete.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/webhook/delete.js)_
## `eas webhook:list`
@@ -457,7 +457,7 @@ OPTIONS
--event=(BUILD) Event type that triggers the webhook
```
_See code: [src/commands/webhook/list.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/webhook/list.js)_
_See code: [src/commands/webhook/list.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/webhook/list.js)_
## `eas webhook:update`
@@ -477,7 +477,7 @@ OPTIONS
--url=url Webhook URL
```
_See code: [src/commands/webhook/update.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/webhook/update.js)_
_See code: [src/commands/webhook/update.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/webhook/update.js)_
## `eas webhook:view ID`
@@ -491,5 +491,5 @@ ARGUMENTS
ID ID of the webhook to view
```
_See code: [src/commands/webhook/view.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/webhook/view.js)_
_See code: [src/commands/webhook/view.js](https://github.com/expo/eas-cli/blob/v0.29.1/packages/eas-cli/src/commands/webhook/view.js)_
<!-- commandsstop -->
+2
View File
@@ -1,8 +1,10 @@
import { fs } from 'memfs';
// needed because of a weird bug with tempy (dependency of @expo/config-plugins)
// eslint-disable-next-line node/no-sync
fs.mkdirSync('/tmp');
if (process.env.TMPDIR) {
// eslint-disable-next-line node/no-sync
fs.mkdirSync(process.env.TMPDIR, { recursive: true });
}
+61 -1
View File
@@ -15034,7 +15034,7 @@
"fields": [
{
"name": "createGoogleServiceAccountKey",
"description": "Create an Google Service Account Key",
"description": "Create a Google Service Account Key",
"args": [
{
"name": "googleServiceAccountKeyInput",
@@ -15080,6 +15080,39 @@
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "deleteGoogleServiceAccountKey",
"description": "Delete a Google Service Account Key",
"args": [
{
"name": "id",
"description": null,
"type": {
"kind": "NON_NULL",
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "ID",
"ofType": null
}
},
"defaultValue": null,
"isDeprecated": false,
"deprecationReason": null
}
],
"type": {
"kind": "NON_NULL",
"name": null,
"ofType": {
"kind": "OBJECT",
"name": "DeleteGoogleServiceAccountKeyResult",
"ofType": null
}
},
"isDeprecated": false,
"deprecationReason": null
}
],
"inputFields": null,
@@ -15114,6 +15147,33 @@
"enumValues": null,
"possibleTypes": null
},
{
"kind": "OBJECT",
"name": "DeleteGoogleServiceAccountKeyResult",
"description": "",
"fields": [
{
"name": "id",
"description": "",
"args": [],
"type": {
"kind": "NON_NULL",
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "ID",
"ofType": null
}
},
"isDeprecated": false,
"deprecationReason": null
}
],
"inputFields": null,
"interfaces": [],
"enumValues": null,
"possibleTypes": null
},
{
"kind": "OBJECT",
"name": "AppleAppIdentifierMutation",
+2 -2
View File
@@ -1,7 +1,7 @@
{
"name": "eas-cli",
"description": "EAS command line tool",
"version": "0.29.0",
"version": "0.29.1",
"author": "Expo <[email protected]>",
"bin": {
"eas": "./bin/run"
@@ -19,7 +19,7 @@
"@expo/plugin-warn-if-update-available": "1.7.0",
"@expo/prebuild-config": "2.1.0",
"@expo/results": "1.0.0",
"@expo/rudder-sdk-node": "1.0.7",
"@expo/rudder-sdk-node": "1.1.0",
"@expo/sdk-runtime-versions": "1.0.0",
"@expo/spawn-async": "1.5.0",
"@expo/timeago.js": "1.0.0",
+10 -8
View File
@@ -1,10 +1,12 @@
const fs = require('fs');
const { promises: fs } = require('fs');
// Patch `oclif-dev readme` path and link generation
let readmeContent = fs.readFileSync('README.md', 'utf8');
readmeContent = readmeContent.replace(/\[build\//g, '[src/');
readmeContent = readmeContent.replace(/build\/commands/g, 'packages/eas-cli/src/commands');
fs.writeFileSync('README.md', readmeContent);
(async () => {
// Patch `oclif-dev readme` path and link generation
let readmeContent = await fs.readFile('README.md', 'utf8');
readmeContent = readmeContent.replace(/\[build\//g, '[src/');
readmeContent = readmeContent.replace(/build\/commands/g, 'packages/eas-cli/src/commands');
await fs.writeFile('README.md', readmeContent);
// eslint-disable-next-line no-console
console.log('Patched README path generation');
// eslint-disable-next-line no-console
console.log('Patched README path generation');
})();
+6 -9
View File
@@ -65,7 +65,6 @@ export async function initAsync(): Promise<void> {
flushInterval: 300,
}
);
rudderstackClient.logger.silent = true;
}
}
@@ -87,7 +86,7 @@ export async function setUserDataAsync(userId: string, traits: Record<string, an
export async function flushAsync(): Promise<void> {
if (rudderstackClient) {
rudderstackClient.flush();
await rudderstackClient.flush();
}
}
@@ -114,13 +113,11 @@ function ensureUserIdentified(): void {
return;
}
if (rudderstackClient) {
rudderstackClient.identify({
userId: identifyData.userId,
anonymousId: identifyData.deviceId,
traits: identifyData.traits,
});
}
rudderstackClient.identify({
userId: identifyData.userId,
anonymousId: identifyData.deviceId,
traits: identifyData.traits,
});
userIdentified = true;
}
@@ -6,17 +6,17 @@ import { readChannelSafelyAsync } from '../UpdatesModule';
jest.mock('fs');
afterAll(() => {
afterAll(async () => {
// do not remove the following line
// this fixes a weird error with tempy in @expo/image-utils
fs.removeSync(os.tmpdir());
await fs.remove(os.tmpdir());
});
beforeEach(() => {
beforeEach(async () => {
vol.reset();
// do not remove the following line
// this fixes a weird error with tempy in @expo/image-utils
fs.mkdirpSync(os.tmpdir());
await fs.mkdirp(os.tmpdir());
});
const testChannel = 'test-channel';
@@ -9,17 +9,17 @@ import { maybeResolveVersionsAsync } from '../version';
jest.mock('fs');
afterAll(() => {
afterAll(async () => {
// do not remove the following line
// this fixes a weird error with tempy in @expo/image-utils
fs.removeSync(os.tmpdir());
await fs.remove(os.tmpdir());
});
beforeEach(() => {
beforeEach(async () => {
vol.reset();
// do not remove the following line
// this fixes a weird error with tempy in @expo/image-utils
fs.mkdirpSync(os.tmpdir());
await fs.mkdirp(os.tmpdir());
});
describe(maybeResolveVersionsAsync, () => {
+10 -17
View File
@@ -5,7 +5,6 @@ import nullthrows from 'nullthrows';
import AndroidCredentialsProvider, {
AndroidCredentials,
} from '../../credentials/android/AndroidCredentialsProvider';
import { createCredentialsContextAsync } from '../../credentials/context';
import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
import Log from '../../log';
import {
@@ -110,22 +109,16 @@ async function ensureAndroidCredentialsAsync(
ctx.exp,
gradleContext
);
const provider = new AndroidCredentialsProvider(
await createCredentialsContextAsync(ctx.projectDir, {
exp: ctx.exp,
nonInteractive: ctx.nonInteractive,
}),
{
app: {
account: nullthrows(
findAccountByName(ctx.user.accounts, ctx.accountName),
`You do not have access to account: ${ctx.accountName}`
),
projectName: ctx.projectName,
androidApplicationIdentifier,
},
}
);
const provider = new AndroidCredentialsProvider(ctx.credentialsCtx, {
app: {
account: nullthrows(
findAccountByName(ctx.user.accounts, ctx.accountName),
`You do not have access to account: ${ctx.accountName}`
),
projectName: ctx.projectName,
androidApplicationIdentifier,
},
});
const { credentialsSource } = ctx.buildProfile;
logCredentialsSource(credentialsSource, Platform.ANDROID);
return {
+12 -1
View File
@@ -5,6 +5,7 @@ import JsonFile from '@expo/json-file';
import resolveFrom from 'resolve-from';
import { v4 as uuidv4 } from 'uuid';
import { CredentialsContext } from '../credentials/context';
import { RequestedPlatform } from '../platform';
import { getExpoConfig } from '../project/expoConfig';
import { getProjectAccountName, getProjectIdAsync } from '../project/projectUtils';
@@ -31,6 +32,7 @@ export interface BuildContext<T extends Platform> {
buildProfile: BuildProfile<T>;
buildProfileName: string;
clearCache: boolean;
credentialsCtx: CredentialsContext;
exp: ExpoConfig;
local: boolean;
nonInteractive: boolean;
@@ -69,9 +71,16 @@ export async function createBuildContextAsync<T extends Platform>({
const accountName = getProjectAccountName(exp, user);
const projectName = exp.slug;
const projectId = await getProjectIdAsync(exp, { env: buildProfile.env });
const workflow = await resolveWorkflowAsync(projectDir, platform);
const accountId = findAccountByName(user.accounts, accountName)?.id;
const credentialsCtx = new CredentialsContext({
exp,
nonInteractive,
projectDir,
user,
});
const devClientProperties = getDevClientEventProperties({
platform,
projectDir,
@@ -87,11 +96,13 @@ export async function createBuildContextAsync<T extends Platform>({
...devClientProperties,
};
Analytics.logEvent(Event.BUILD_COMMAND, trackingCtx);
return {
accountName,
buildProfile,
buildProfileName,
clearCache,
credentialsCtx,
exp,
local,
nonInteractive,
@@ -19,7 +19,11 @@ export async function configureUpdatesAsync(projectDir: string, exp: ExpoConfig)
projectDir,
xcodeProject
);
await fs.writeFile(IOSConfig.Paths.getPBXProjectPath(projectDir), xcodeProject.writeSync());
await fs.writeFile(
IOSConfig.Paths.getPBXProjectPath(projectDir),
// eslint-disable-next-line node/no-sync
xcodeProject.writeSync()
);
}
let expoPlist = await readExpoPlistAsync(projectDir);
@@ -6,17 +6,17 @@ import { readChannelSafelyAsync } from '../UpdatesModule';
jest.mock('fs');
afterAll(() => {
afterAll(async () => {
// do not remove the following line
// this fixes a weird error with tempy in @expo/image-utils
fs.removeSync(os.tmpdir());
await fs.remove(os.tmpdir());
});
beforeEach(() => {
beforeEach(async () => {
vol.reset();
// do not remove the following line
// this fixes a weird error with tempy in @expo/image-utils
fs.mkdirpSync(os.tmpdir());
await fs.mkdirp(os.tmpdir());
});
const testChannel = 'test-channel';
@@ -17,17 +17,17 @@ import {
jest.mock('fs');
afterAll(() => {
afterAll(async () => {
// do not remove the following line
// this fixes a weird error with tempy in @expo/image-utils
fs.removeSync(os.tmpdir());
await fs.remove(os.tmpdir());
});
beforeEach(() => {
beforeEach(async () => {
vol.reset();
// do not remove the following line
// this fixes a weird error with tempy in @expo/image-utils
fs.mkdirpSync(os.tmpdir());
await fs.mkdirp(os.tmpdir());
});
describe(evaluateTemplateString, () => {
@@ -1,6 +1,5 @@
import { Platform } from '@expo/eas-build-job';
import { createCredentialsContextAsync } from '../../credentials/context';
import IosCredentialsProvider from '../../credentials/ios/IosCredentialsProvider';
import { getAppFromContext } from '../../credentials/ios/actions/BuildCredentialsUtils';
import { resolveEntitlementsJsonAsync } from '../../credentials/ios/appstore/entitlements';
@@ -17,13 +16,8 @@ export async function ensureIosCredentialsAsync(
return;
}
const credentialsCtx = await createCredentialsContextAsync(buildCtx.projectDir, {
exp: buildCtx.exp,
nonInteractive: buildCtx.nonInteractive,
});
const provider = new IosCredentialsProvider(credentialsCtx, {
app: getAppFromContext(credentialsCtx),
const provider = new IosCredentialsProvider(buildCtx.credentialsCtx, {
app: getAppFromContext(buildCtx.credentialsCtx),
targets,
iosCapabilitiesOptions: {
entitlements: await resolveEntitlementsJsonAsync(buildCtx.projectDir, buildCtx.workflow),
@@ -25,7 +25,7 @@ import {
PublishPlatform,
buildBundlesAsync,
buildUnsortedUpdateInfoGroupAsync,
collectAssets,
collectAssetsAsync,
uploadAssetsAsync,
} from '../../project/publish';
import { promptAsync, selectAsync } from '../../prompts';
@@ -290,7 +290,7 @@ export default class BranchPublish extends EasCommand {
const assetSpinner = ora('Uploading assets...').start();
try {
const platforms = platformFlag === 'all' ? defaultPublishPlatforms : [platformFlag];
const assets = collectAssets({ inputDir: inputDir!, platforms });
const assets = await collectAssetsAsync({ inputDir: inputDir!, platforms });
await uploadAssetsAsync(assets);
unsortedUpdateInfoGroups = await buildUnsortedUpdateInfoGroupAsync(assets, exp);
assetSpinner.succeed('Uploaded assets!');
+28 -11
View File
@@ -8,6 +8,7 @@ import {
import { flags } from '@oclif/command';
import { error } from '@oclif/errors';
import chalk from 'chalk';
import nullthrows from 'nullthrows';
import { prepareAndroidBuildAsync } from '../../build/android/build';
import { BuildRequestSender, waitForBuildEndAsync } from '../../build/build';
@@ -18,7 +19,13 @@ import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from '../../build
import { printBuildResults, printLogsUrls } from '../../build/utils/printBuildInfo';
import { ensureRepoIsCleanAsync } from '../../build/utils/repository';
import EasCommand from '../../commandUtils/EasCommand';
import { BuildFragment, BuildStatus, SubmissionFragment } from '../../graphql/generated';
import { CredentialsContext } from '../../credentials/context';
import {
AppPlatform,
BuildFragment,
BuildStatus,
SubmissionFragment,
} from '../../graphql/generated';
import { toAppPlatform, toPlatform } from '../../graphql/types/AppPlatform';
import Log from '../../log';
import {
@@ -35,7 +42,7 @@ import {
import { validateMetroConfigForManagedWorkflowAsync } from '../../project/metroConfig';
import { findProjectRootAsync } from '../../project/projectUtils';
import { confirmAsync } from '../../prompts';
import { createSubmissionContext } from '../../submit/context';
import { createSubmissionContextAsync } from '../../submit/context';
import {
submitAsync,
waitToCompleteAsync as waitForSubmissionsToCompleteAsync,
@@ -153,8 +160,9 @@ export default class Build extends EasCommand {
});
const startedBuilds: BuildFragment[] = [];
const buildCtxByPlatform: { [p in AppPlatform]?: BuildContext<Platform> } = {};
for (const platform of platforms) {
const maybeBuild = await this.prepareAndStartBuildAsync({
const { build: maybeBuild, buildCtx } = await this.prepareAndStartBuildAsync({
projectDir,
platform,
flags,
@@ -163,6 +171,7 @@ export default class Build extends EasCommand {
if (maybeBuild) {
startedBuilds.push(maybeBuild);
}
buildCtxByPlatform[toAppPlatform(platform)] = buildCtx;
}
if (flags.local) {
return;
@@ -176,10 +185,11 @@ export default class Build extends EasCommand {
if (flags.autoSubmit) {
for (const build of startedBuilds) {
const submission = await this.prepareAndStartSubmissionAsync({
projectDir,
build,
credentialsCtx: nullthrows(buildCtxByPlatform[build.platform]?.credentialsCtx),
flags,
moreBuilds: startedBuilds.length > 1,
projectDir,
});
submissions.push(submission);
}
@@ -253,17 +263,17 @@ export default class Build extends EasCommand {
};
}
private async prepareAndStartBuildAsync({
private async prepareAndStartBuildAsync<T extends Platform>({
projectDir,
platform,
flags,
moreBuilds,
}: {
projectDir: string;
platform: Platform;
platform: T;
flags: BuildFlags;
moreBuilds: boolean;
}): Promise<BuildFragment | undefined> {
}): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<T> }> {
const easJsonReader = new EasJsonReader(projectDir);
const buildProfile = await easJsonReader.readBuildProfileAsync(platform, flags.profile);
@@ -297,7 +307,11 @@ export default class Build extends EasCommand {
error(EAS_UNAVAILABLE_MESSAGE, { exit: 1 });
}
return await this.startBuildAsync(buildCtx);
const build = await this.startBuildAsync(buildCtx);
return {
build,
buildCtx,
};
}
private async startBuildAsync(ctx: BuildContext<Platform>): Promise<BuildFragment | undefined> {
@@ -311,21 +325,23 @@ export default class Build extends EasCommand {
}
private async prepareAndStartSubmissionAsync({
projectDir,
build,
credentialsCtx,
flags,
moreBuilds,
projectDir,
}: {
projectDir: string;
build: BuildFragment;
credentialsCtx: CredentialsContext;
flags: BuildFlags;
moreBuilds: boolean;
projectDir: string;
}): Promise<SubmissionFragment> {
const easJsonReader = new EasJsonReader(projectDir);
const platform = toPlatform(build.platform);
const buildProfile = await easJsonReader.readBuildProfileAsync(platform, flags.profile);
const submitProfile = await easJsonReader.readSubmitProfileAsync(platform, flags.submitProfile);
const submissionCtx = createSubmissionContext({
const submissionCtx = await createSubmissionContextAsync({
platform,
projectDir,
projectId: build.project.id,
@@ -333,6 +349,7 @@ export default class Build extends EasCommand {
archiveFlags: { id: build.id },
nonInteractive: flags.nonInteractive,
env: buildProfile.env,
credentialsCtx,
});
if (moreBuilds) {
+6 -2
View File
@@ -1,12 +1,16 @@
import EasCommand from '../commandUtils/EasCommand';
import { createCredentialsContextAsync } from '../credentials/context';
import { CredentialsContext } from '../credentials/context';
import { SelectPlatform } from '../credentials/manager/SelectPlatform';
import { ensureLoggedInAsync } from '../user/actions';
export default class Credentials extends EasCommand {
static description = 'manage your credentials';
async runAsync(): Promise<void> {
const ctx = await createCredentialsContextAsync(process.cwd(), {});
const ctx = new CredentialsContext({
projectDir: process.cwd(),
user: await ensureLoggedInAsync(),
});
await new SelectPlatform().runAsync(ctx);
}
}
+2 -2
View File
@@ -17,7 +17,7 @@ import {
} from '../platform';
import { isEasEnabledForProjectAsync, warnEasUnavailable } from '../project/isEasEnabledForProject';
import { findProjectRootAsync, getProjectIdAsync } from '../project/projectUtils';
import { SubmitArchiveFlags, createSubmissionContext } from '../submit/context';
import { SubmitArchiveFlags, createSubmissionContextAsync } from '../submit/context';
import { submitAsync, waitToCompleteAsync } from '../submit/submit';
import { printSubmissionDetailsUrls } from '../submit/utils/urls';
@@ -108,7 +108,7 @@ See how to configure submits with eas.json: ${learnMore('https://docs.expo.dev/s
const submissions: SubmissionFragment[] = [];
for (const platform of platforms) {
const profile = await easJsonReader.readSubmitProfileAsync(platform, flags.profile);
const ctx = createSubmissionContext({
const ctx = await createSubmissionContextAsync({
platform,
projectDir,
projectId,
@@ -6,6 +6,7 @@ import {
AndroidKeystoreType,
AppFragment,
CommonAndroidAppCredentialsFragment,
GoogleServiceAccountKeyFragment,
} from '../../graphql/generated';
import * as AndroidGraphqlClient from '../android/api/GraphqlClient';
import { Keystore } from '../android/credentials';
@@ -68,6 +69,16 @@ export const testLegacyAndroidFcmFragment: AndroidFcmFragment = {
updatedAt: now,
};
export const testGoogleServiceAccountKeyFragment: GoogleServiceAccountKeyFragment = {
id: 'test-id',
projectIdentifier: 'sdf.sdf.sdf',
privateKeyIdentifier: 'test-private-key-identifier',
clientEmail: '[email protected]',
clientIdentifier: 'test-client-identifier',
createdAt: now,
updatedAt: now,
};
export const testJksAndroidKeystoreFragment: AndroidKeystoreFragment = {
id: 'test-id',
type: AndroidKeystoreType.Jks,
@@ -113,6 +124,7 @@ export const testAndroidAppCredentialsFragment: CommonAndroidAppCredentialsFragm
isLegacy: false,
app: testAppFragment,
androidFcm: testLegacyAndroidFcmFragment,
googleServiceAccountKeyForSubmissions: testGoogleServiceAccountKeyFragment,
androidAppBuildCredentialsList: [testLegacyAndroidBuildCredentialsFragment],
};
@@ -131,6 +143,7 @@ export function getNewAndroidApiMock(): { [key in keyof typeof AndroidGraphqlCli
createOrUpdateAndroidAppBuildCredentialsByNameAsync: jest.fn(),
createKeystoreAsync: jest.fn(),
createGoogleServiceAccountKeyAsync: jest.fn(),
getGoogleServiceAccountKeysForAccountAsync: jest.fn(),
createFcmAsync: jest.fn(),
deleteKeystoreAsync: jest.fn(),
deleteFcmAsync: jest.fn(),
@@ -1,12 +1,12 @@
import merge from 'ts-deepmerge';
import { Context } from '../context';
import { CredentialsContext } from '../context';
import { getNewAndroidApiMock } from './fixtures-android';
import { getAppstoreMock } from './fixtures-appstore';
import { testAppJson, testUsername } from './fixtures-constants';
import { getNewIosApiMock } from './fixtures-ios';
export function createCtxMock(mockOverride: Record<string, any> = {}): Context {
export function createCtxMock(mockOverride: Record<string, any> = {}): CredentialsContext {
const defaultMock = {
ios: getNewIosApiMock(),
android: getNewAndroidApiMock(),
@@ -3,7 +3,7 @@ import { CredentialsSource } from '@expo/eas-json';
import nullthrows from 'nullthrows';
import { AndroidAppBuildCredentialsFragment } from '../../graphql/generated';
import { Context } from '../context';
import { CredentialsContext } from '../context';
import * as credentialsJsonReader from '../credentialsJson/read';
import { SetupBuildCredentials } from './actions/SetupBuildCredentials';
import { AppLookupParams } from './api/GraphqlClient';
@@ -20,7 +20,7 @@ interface Options {
export default class AndroidCredentialsProvider {
public readonly platform = Platform.ANDROID;
constructor(private ctx: Context, private options: Options) {}
constructor(private ctx: CredentialsContext, private options: Options) {}
public async getCredentialsAsync(
src: CredentialsSource.LOCAL | CredentialsSource.REMOTE
@@ -3,14 +3,14 @@ import {
CommonAndroidAppCredentialsFragment,
} from '../../../graphql/generated';
import Log from '../../../log';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { AppLookupParams } from '../api/GraphqlClient';
export class AssignFcm {
constructor(private app: AppLookupParams) {}
public async runAsync(
ctx: Context,
ctx: CredentialsContext,
fcm: AndroidFcmFragment
): Promise<CommonAndroidAppCredentialsFragment> {
const appCredentials =
@@ -0,0 +1,29 @@
import {
CommonAndroidAppCredentialsFragment,
GoogleServiceAccountKeyFragment,
} from '../../../graphql/generated';
import Log from '../../../log';
import { CredentialsContext } from '../../context';
import { AppLookupParams } from '../api/GraphqlClient';
export class AssignGoogleServiceAccountKey {
constructor(private app: AppLookupParams) {}
public async runAsync(
ctx: CredentialsContext,
googleServiceAccountKey: GoogleServiceAccountKeyFragment
): Promise<CommonAndroidAppCredentialsFragment> {
const appCredentials =
await ctx.android.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync(this.app);
const updatedAppCredentials = await ctx.android.updateAndroidAppCredentialsAsync(
appCredentials,
{
googleServiceAccountKeyForSubmissionsId: googleServiceAccountKey.id,
}
);
Log.succeed(
`Google Service Account Key assigned to ${this.app.androidApplicationIdentifier} for submissions`
);
return updatedAppCredentials;
}
}
@@ -8,7 +8,7 @@ import { GradleBuildContext } from '../../../project/android/gradle';
import { getProjectAccountName, getProjectConfigDescription } from '../../../project/projectUtils';
import { promptAsync } from '../../../prompts';
import { findAccountByName } from '../../../user/Account';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { AppLookupParams } from '../api/GraphqlClient';
/**
@@ -16,7 +16,7 @@ import { AppLookupParams } from '../api/GraphqlClient';
* EAS credentials set up yet
*/
export async function canCopyLegacyCredentialsAsync(
ctx: Context,
ctx: CredentialsContext,
app: AppLookupParams
): Promise<boolean> {
const appCredentials = await ctx.android.getAndroidAppCredentialsWithCommonFieldsAsync(app);
@@ -30,7 +30,7 @@ export async function canCopyLegacyCredentialsAsync(
}
export async function promptUserAndCopyLegacyCredentialsAsync(
ctx: Context,
ctx: CredentialsContext,
app: AppLookupParams
): Promise<void> {
assert(
@@ -85,7 +85,7 @@ export async function promptUserAndCopyLegacyCredentialsAsync(
}
export async function getAppLookupParamsFromContextAsync(
ctx: Context,
ctx: CredentialsContext,
gradleContext?: GradleBuildContext
): Promise<AppLookupParams> {
ctx.ensureProjectContext();
@@ -113,7 +113,7 @@ export async function getAppLookupParamsFromContextAsync(
}
export async function createOrUpdateDefaultAndroidAppBuildCredentialsAsync(
ctx: Context,
ctx: CredentialsContext,
appLookupParams: AppLookupParams,
{
androidKeystoreId,
@@ -2,12 +2,12 @@ import { AndroidFcmFragment, AndroidFcmVersion } from '../../../graphql/generate
import Log from '../../../log';
import { promptAsync } from '../../../prompts';
import { Account } from '../../../user/Account';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
export class CreateFcm {
constructor(private account: Account) {}
public async runAsync(ctx: Context): Promise<AndroidFcmFragment> {
public async runAsync(ctx: CredentialsContext): Promise<AndroidFcmFragment> {
if (ctx.nonInteractive) {
throw new Error(`FCM API Key cannot be uploaded in non-interactive mode.`);
}
@@ -2,14 +2,14 @@ import { GoogleServiceAccountKeyFragment } from '../../../graphql/generated';
import Log from '../../../log';
import { promptAsync } from '../../../prompts';
import { Account } from '../../../user/Account';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { GoogleServiceAccountKey } from '../credentials';
import { readAndValidateServiceAccountKey } from '../utils/googleServiceAccountKey';
export class CreateGoogleServiceAccountKey {
constructor(private account: Account) {}
public async runAsync(ctx: Context): Promise<GoogleServiceAccountKeyFragment> {
public async runAsync(ctx: CredentialsContext): Promise<GoogleServiceAccountKeyFragment> {
if (ctx.nonInteractive) {
throw new Error(`New Google Service Account Key cannot be created in non-interactive mode.`);
}
@@ -2,7 +2,7 @@ import { AndroidKeystoreFragment } from '../../../graphql/generated';
import Log from '../../../log';
import { getProjectIdAsync } from '../../../project/projectUtils';
import { Account } from '../../../user/Account';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { askForUserProvidedAsync } from '../../utils/promptForCredentials';
import { KeystoreWithType, keystoreSchema } from '../credentials';
import { generateRandomKeystoreAsync } from '../utils/keystore';
@@ -11,7 +11,7 @@ import { getKeystoreWithType, validateKeystore } from '../utils/keystoreNew';
export class CreateKeystore {
constructor(private account: Account) {}
public async runAsync(ctx: Context): Promise<AndroidKeystoreFragment> {
public async runAsync(ctx: CredentialsContext): Promise<AndroidKeystoreFragment> {
if (ctx.nonInteractive) {
throw new Error(`New keystore cannot be created in non-interactive mode.`);
}
@@ -5,7 +5,7 @@ import { AndroidAppBuildCredentialsFragment } from '../../../graphql/generated';
import Log from '../../../log';
import { confirmAsync } from '../../../prompts';
import { maybeRenameExistingFileAsync } from '../../../utils/files';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { AppLookupParams, formatProjectFullName } from '../api/GraphqlClient';
import { displayAndroidKeystore } from '../utils/printCredentials';
@@ -19,7 +19,7 @@ export class DownloadKeystore {
constructor(private options: DownloadKeystoreOptions) {}
public async runAsync(
ctx: Context,
ctx: CredentialsContext,
buildCredentials: AndroidAppBuildCredentialsFragment
): Promise<void> {
const keystore = buildCredentials.androidKeystore;
@@ -65,7 +65,7 @@ export class BackupKeystore {
constructor(private app: AppLookupParams) {}
public async runAsync(
ctx: Context,
ctx: CredentialsContext,
buildCredentials: AndroidAppBuildCredentialsFragment
): Promise<void> {
if (!buildCredentials.androidKeystore) {
@@ -1,12 +1,12 @@
import Log from '../../../log';
import { confirmAsync } from '../../../prompts';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { AppLookupParams, formatProjectFullName } from '../api/GraphqlClient';
export class RemoveFcm {
constructor(private app: AppLookupParams) {}
async runAsync(ctx: Context): Promise<void> {
async runAsync(ctx: CredentialsContext): Promise<void> {
if (ctx.nonInteractive) {
throw new Error(
"Deleting an FCM Api Key is a destructive operation. Start the CLI without the '--non-interactive' flag to delete the credentials."
@@ -3,7 +3,7 @@ import chalk from 'chalk';
import { AndroidAppBuildCredentialsFragment } from '../../../graphql/generated';
import Log from '../../../log';
import { confirmAsync } from '../../../prompts';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { AppLookupParams } from '../api/GraphqlClient';
import { BackupKeystore } from './DownloadKeystore';
@@ -11,7 +11,7 @@ export class RemoveKeystore {
constructor(private app: AppLookupParams) {}
async runAsync(
ctx: Context,
ctx: CredentialsContext,
buildCredentials: AndroidAppBuildCredentialsFragment
): Promise<void> {
if (ctx.nonInteractive) {
@@ -6,7 +6,7 @@ import {
} from '../../../graphql/generated';
import Log from '../../../log';
import { ora } from '../../../ora';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { MissingCredentialsNonInteractiveError } from '../../errors';
import { AppLookupParams } from '../api/GraphqlClient';
import {
@@ -28,7 +28,7 @@ interface Options {
export class SetupBuildCredentials {
constructor(private options: Options) {}
async runAsync(ctx: Context): Promise<AndroidAppBuildCredentialsFragment> {
async runAsync(ctx: CredentialsContext): Promise<AndroidAppBuildCredentialsFragment> {
const { app, name: maybeName } = this.options;
if (!ctx.nonInteractive) {
@@ -62,7 +62,7 @@ export class SetupBuildCredentials {
name,
keystore,
}: {
ctx: Context;
ctx: CredentialsContext;
app: AppLookupParams;
name?: string;
keystore: AndroidKeystoreFragment;
@@ -82,7 +82,7 @@ export class SetupBuildCredentials {
app,
name,
}: {
ctx: Context;
ctx: CredentialsContext;
app: AppLookupParams;
name?: string;
}): Promise<AndroidAppBuildCredentialsFragment | null> {
@@ -108,7 +108,7 @@ export class SetupBuildCredentials {
app,
name,
}: {
ctx: Context;
ctx: CredentialsContext;
app: AppLookupParams;
name: string;
}): Promise<AndroidAppBuildCredentialsFragment | null> {
@@ -4,7 +4,7 @@ import {
} from '../../../graphql/generated';
import Log from '../../../log';
import { confirmAsync } from '../../../prompts';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { readAndroidCredentialsAsync } from '../../credentialsJson/read';
import {
SelectAndroidBuildCredentials,
@@ -17,7 +17,7 @@ import { BackupKeystore } from './DownloadKeystore';
export class SetupBuildCredentialsFromCredentialsJson {
constructor(private app: AppLookupParams) {}
async runAsync(ctx: Context): Promise<AndroidAppBuildCredentialsFragment | null> {
async runAsync(ctx: CredentialsContext): Promise<AndroidAppBuildCredentialsFragment | null> {
if (ctx.nonInteractive) {
throw new Error(
'Setting up build credentials from credentials.json is only available in interactive mode'
@@ -1,11 +1,11 @@
import { AndroidAppBuildCredentialsFragment } from '../../../graphql/generated';
import Log from '../../../log';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { updateAndroidCredentialsAsync } from '../../credentialsJson/update';
export class UpdateCredentialsJson {
async runAsync(
ctx: Context,
ctx: CredentialsContext,
buildCredentials: AndroidAppBuildCredentialsFragment
): Promise<void> {
Log.log('Updating Android credentials in credentials.json');
@@ -0,0 +1,69 @@
import chalk from 'chalk';
import { GoogleServiceAccountKeyFragment } from '../../../graphql/generated';
import Log from '../../../log';
import { promptAsync } from '../../../prompts';
import { Account } from '../../../user/Account';
import { fromNow } from '../../../utils/date';
import { CredentialsContext } from '../../context';
export class UseExistingGoogleServiceAccountKey {
constructor(private account: Account) {}
public async runAsync(ctx: CredentialsContext): Promise<GoogleServiceAccountKeyFragment | null> {
if (ctx.nonInteractive) {
throw new Error(
`Existing Google Service Account Key cannot be chosen in non-interactive mode.`
);
}
const gsaKeyFragments = await ctx.android.getGoogleServiceAccountKeysForAccountAsync(
this.account
);
if (gsaKeyFragments.length === 0) {
Log.error("There aren't any Google Service Account Keys associated with your account.");
return null;
}
return await this.selectGoogleServiceAccountKeyAsync(gsaKeyFragments);
}
private async selectGoogleServiceAccountKeyAsync(
keys: GoogleServiceAccountKeyFragment[]
): Promise<GoogleServiceAccountKeyFragment | null> {
const sortedKeys = this.sortGoogleServiceAccountKeysByUpdatedAtDesc(keys);
const { chosenKey } = await promptAsync({
type: 'select',
name: 'chosenKey',
message: 'Select a Google Service Account Key:',
choices: sortedKeys.map(key => ({
title: this.formatGoogleServiceAccountKey(key),
value: key,
})),
});
return chosenKey;
}
private sortGoogleServiceAccountKeysByUpdatedAtDesc(
keys: GoogleServiceAccountKeyFragment[]
): GoogleServiceAccountKeyFragment[] {
return keys.sort(
(keyA, keyB) =>
new Date(keyB.updatedAt).getMilliseconds() - new Date(keyA.updatedAt).getMilliseconds()
);
}
private formatGoogleServiceAccountKey({
projectIdentifier,
privateKeyIdentifier,
clientEmail,
clientIdentifier,
updatedAt,
}: GoogleServiceAccountKeyFragment): string {
let line: string = '';
line += `Client Email: ${clientEmail}, Project Id: ${projectIdentifier}`;
line += chalk.gray(
`\n Client Id: ${clientIdentifier}, Private Key Id: ${privateKeyIdentifier}`
);
line += chalk.gray(`\n Updated: ${fromNow(new Date(updatedAt))} ago,`);
return line;
}
}
@@ -0,0 +1,33 @@
import { testGoogleServiceAccountKeyFragment } from '../../../__tests__/fixtures-android';
import { createCtxMock } from '../../../__tests__/fixtures-context';
import { AssignGoogleServiceAccountKey } from '../AssignGoogleServiceAccountKey';
import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
describe(AssignGoogleServiceAccountKey, () => {
it('assigns a Google Service Account key in Interactive Mode', async () => {
const ctx = createCtxMock({
nonInteractive: false,
});
const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
const assignGoogleServiceAccountKeyAction = new AssignGoogleServiceAccountKey(appLookupParams);
await assignGoogleServiceAccountKeyAction.runAsync(ctx, testGoogleServiceAccountKeyFragment);
// expect app credentials to be fetched/created, then updated
expect(
ctx.android.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync
).toHaveBeenCalledTimes(1);
expect(ctx.android.updateAndroidAppCredentialsAsync).toHaveBeenCalledTimes(1);
});
it('works in Non-Interactive Mode', async () => {
const ctx = createCtxMock({
nonInteractive: true,
});
const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
const assignGoogleServiceAccountKeyAction = new AssignGoogleServiceAccountKey(appLookupParams);
// dont fail if users are running in non-interactive mode
await expect(
assignGoogleServiceAccountKeyAction.runAsync(ctx, testGoogleServiceAccountKeyFragment)
).resolves.not.toThrowError();
});
});
@@ -0,0 +1,59 @@
import { asMock } from '../../../../__tests__/utils';
import { promptAsync } from '../../../../prompts';
import {
getNewAndroidApiMock,
testGoogleServiceAccountKeyFragment,
} from '../../../__tests__/fixtures-android';
import { createCtxMock } from '../../../__tests__/fixtures-context';
import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
import { UseExistingGoogleServiceAccountKey } from '../UseExistingGoogleServiceAccountKey';
jest.mock('../../../../prompts');
asMock(promptAsync).mockImplementation(() => ({ chosenKey: testGoogleServiceAccountKeyFragment }));
describe(UseExistingGoogleServiceAccountKey, () => {
it('uses an existing Google Service Account Key in Interactive Mode', async () => {
const ctx = createCtxMock({
nonInteractive: false,
android: {
...getNewAndroidApiMock(),
getGoogleServiceAccountKeysForAccountAsync: jest.fn(() => [
testGoogleServiceAccountKeyFragment,
]),
},
});
const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
const useExistingGoogleServiceAccountKeyAction = new UseExistingGoogleServiceAccountKey(
appLookupParams.account
);
const selectedKey = await useExistingGoogleServiceAccountKeyAction.runAsync(ctx);
expect(ctx.android.getGoogleServiceAccountKeysForAccountAsync).toHaveBeenCalledTimes(1);
expect(selectedKey).toMatchObject(testGoogleServiceAccountKeyFragment);
});
it("returns null if the account doesn't have any Google Service Account Keys", async () => {
const ctx = createCtxMock({
nonInteractive: false,
android: {
...getNewAndroidApiMock(),
getGoogleServiceAccountKeysForAccountAsync: jest.fn(() => []),
},
});
const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
const useExistingGoogleServiceAccountKeyAction = new UseExistingGoogleServiceAccountKey(
appLookupParams.account
);
const selectedKey = await useExistingGoogleServiceAccountKeyAction.runAsync(ctx);
expect(ctx.android.getGoogleServiceAccountKeysForAccountAsync).toHaveBeenCalledTimes(1);
expect(selectedKey).toBe(null);
});
it('errors in Non-Interactive Mode', async () => {
const ctx = createCtxMock({ nonInteractive: true });
const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
const useExistingGoogleServiceAccountKeyAction = new UseExistingGoogleServiceAccountKey(
appLookupParams.account
);
// fail if users are running in non-interactive mode
await expect(useExistingGoogleServiceAccountKeyAction.runAsync(ctx)).rejects.toThrowError();
});
});
@@ -16,6 +16,7 @@ import { AndroidFcmMutation } from './graphql/mutations/AndroidFcmMutation';
import { AndroidKeystoreMutation } from './graphql/mutations/AndroidKeystoreMutation';
import { GoogleServiceAccountKeyMutation } from './graphql/mutations/GoogleServiceAccountKeyMutation';
import { AndroidAppCredentialsQuery } from './graphql/queries/AndroidAppCredentialsQuery';
import { GoogleServiceAccountKeyQuery } from './graphql/queries/GoogleServiceAccountKeyQuery';
export interface AppLookupParams {
account: Account;
@@ -89,11 +90,27 @@ export async function updateAndroidAppCredentialsAsync(
appCredentials: CommonAndroidAppCredentialsFragment,
{
androidFcmId,
googleServiceAccountKeyForSubmissionsId,
}: {
androidFcmId: string;
androidFcmId?: string;
googleServiceAccountKeyForSubmissionsId?: string;
}
): Promise<CommonAndroidAppCredentialsFragment> {
return await AndroidAppCredentialsMutation.setFcmKeyAsync(appCredentials.id, androidFcmId);
let updatedAppCredentials = appCredentials;
if (androidFcmId) {
updatedAppCredentials = await AndroidAppCredentialsMutation.setFcmKeyAsync(
appCredentials.id,
androidFcmId
);
}
if (googleServiceAccountKeyForSubmissionsId) {
updatedAppCredentials =
await AndroidAppCredentialsMutation.setGoogleServiceAccountKeyForSubmissionsAsync(
appCredentials.id,
googleServiceAccountKeyForSubmissionsId
);
}
return updatedAppCredentials;
}
export async function updateAndroidAppBuildCredentialsAsync(
@@ -235,6 +252,12 @@ export async function createGoogleServiceAccountKeyAsync(
);
}
export async function getGoogleServiceAccountKeysForAccountAsync(
account: Account
): Promise<GoogleServiceAccountKeyFragment[]> {
return await GoogleServiceAccountKeyQuery.getAllForAccountAsync(account.name);
}
async function getAppAsync(appLookupParams: AppLookupParams): Promise<AppFragment> {
const projectFullName = formatProjectFullName(appLookupParams);
return await AppQuery.byFullNameAsync(projectFullName);
@@ -7,6 +7,7 @@ import {
CommonAndroidAppCredentialsFragment,
CreateAndroidAppCredentialsMutation,
SetFcmMutation,
SetGoogleServiceAccountKeyForSubmissionsMutation,
} from '../../../../../graphql/generated';
import { CommonAndroidAppCredentialsFragmentNode } from '../../../../../graphql/types/credentials/AndroidAppCredentials';
@@ -82,4 +83,41 @@ export const AndroidAppCredentialsMutation = {
assert(data.androidAppCredentials.setFcm, 'GraphQL: `setFcm` not defined in server response');
return data.androidAppCredentials.setFcm;
},
async setGoogleServiceAccountKeyForSubmissionsAsync(
androidAppCredentialsId: string,
googleServiceAccountKeyId: string
): Promise<CommonAndroidAppCredentialsFragment> {
const data = await withErrorHandlingAsync(
graphqlClient
.mutation<SetGoogleServiceAccountKeyForSubmissionsMutation>(
gql`
mutation SetGoogleServiceAccountKeyForSubmissionsMutation(
$androidAppCredentialsId: ID!
$googleServiceAccountKeyId: ID!
) {
androidAppCredentials {
setGoogleServiceAccountKeyForSubmissions(
id: $androidAppCredentialsId
googleServiceAccountKeyId: $googleServiceAccountKeyId
) {
id
...CommonAndroidAppCredentialsFragment
}
}
}
${print(CommonAndroidAppCredentialsFragmentNode)}
`,
{
androidAppCredentialsId,
googleServiceAccountKeyId,
}
)
.toPromise()
);
assert(
data.androidAppCredentials.setGoogleServiceAccountKeyForSubmissions,
'GraphQL: `setGoogleServiceAccountKeyForSubmissions` not defined in server response'
);
return data.androidAppCredentials.setGoogleServiceAccountKeyForSubmissions;
},
};
@@ -0,0 +1,38 @@
import { print } from 'graphql';
import gql from 'graphql-tag';
import { graphqlClient, withErrorHandlingAsync } from '../../../../../graphql/client';
import {
GoogleServiceAccountKeyByAccountQuery,
GoogleServiceAccountKeyFragment,
} from '../../../../../graphql/generated';
import { GoogleServiceAccountKeyFragmentNode } from '../../../../../graphql/types/credentials/GoogleServiceAccountKey';
export const GoogleServiceAccountKeyQuery = {
async getAllForAccountAsync(accountName: string): Promise<GoogleServiceAccountKeyFragment[]> {
const data = await withErrorHandlingAsync(
graphqlClient
.query<GoogleServiceAccountKeyByAccountQuery>(
gql`
query GoogleServiceAccountKeyByAccountQuery($accountName: String!) {
account {
byName(accountName: $accountName) {
id
googleServiceAccountKeys {
id
...GoogleServiceAccountKeyFragment
}
}
}
}
${print(GoogleServiceAccountKeyFragmentNode)}
`,
{
accountName,
}
)
.toPromise()
);
return data.account.byName.googleServiceAccountKeys;
},
};
@@ -1,3 +1,9 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`print credentials prints the AndroidAppCredentials fragment 1`] = `"Android Credentials Project: testApp Application Identifier: test.com.app Push Notifications (FCM): Key: abcd...efgh Updated 0 second ago Configuration: legacy (Default) Keystore: Type: JKS Key Alias: QHdrb3p5cmEvY3JlZGVudGlhbHMtdGVzdA== MD5 Fingerprint: TE:ST:-M:D5 SHA1 Fingerprint: TE:ST:-S:HA:1 SHA256 Fingerprint: TE:ST:-S:HA:25:6 Updated 0 second ago"`;
exports[`print credentials prints the AndroidAppCredentials fragment 1`] = `
"Android Credentials Project: testApp Application Identifier: test.com.app Push Notifications (FCM): Key: abcd...efgh Updated 0 second agoGoogle Service Account Key For Submissions Project ID sdf.sdf.sdf
Client Email [email protected]
Client ID test-client-identifier
Private Key ID test-private-key-identifier
Updated 0 second ago Configuration: legacy (Default) Keystore: Type: JKS Key Alias: QHdrb3p5cmEvY3JlZGVudGlhbHMtdGVzdA== MD5 Fingerprint: TE:ST:-M:D5 SHA1 Fingerprint: TE:ST:-S:HA:1 SHA256 Fingerprint: TE:ST:-S:HA:25:6 Updated 0 second ago"
`;
@@ -4,6 +4,7 @@ import { asMock } from '../../../../__tests__/utils';
import Log from '../../../../log';
import {
testAndroidAppCredentialsFragment,
testGoogleServiceAccountKeyFragment,
testLegacyAndroidFcmFragment,
} from '../../../__tests__/fixtures-android';
import { createCtxMock } from '../../../__tests__/fixtures-context';
@@ -11,9 +12,10 @@ import { getAppLookupParamsFromContextAsync } from '../../actions/BuildCredentia
import { displayAndroidAppCredentials } from '../printCredentials';
jest.mock('../../../../log');
jest.mock('chalk', () => ({ bold: jest.fn(log => log) }));
jest.mock('chalk', () => ({ bold: jest.fn(log => log), cyan: { bold: jest.fn(log => log) } }));
mockdate.set(testLegacyAndroidFcmFragment.updatedAt);
mockdate.set(testGoogleServiceAccountKeyFragment.updatedAt);
describe('print credentials', () => {
it('prints the AndroidAppCredentials fragment', async () => {
@@ -10,6 +10,7 @@ import {
} from '../../../graphql/generated';
import Log from '../../../log';
import { fromNow } from '../../../utils/date';
import formatFields from '../../../utils/formatFields';
import { sortBuildCredentials } from '../actions/BuildCredentialsUtils';
import { AppLookupParams } from '../api/GraphqlClient';
@@ -44,10 +45,43 @@ function displayAndroidFcmCredentials(appCredentials: CommonAndroidAppCredential
Log.newLine();
}
function displayGoogleServiceAccountKeyForSubmissions(
appCredentials: CommonAndroidAppCredentialsFragment
): void {
const maybeGsaKey = appCredentials.googleServiceAccountKeyForSubmissions;
Log.log(
formatFields([{ label: 'Google Service Account Key For Submissions', value: '' }], {
labelFormat: chalk.cyan.bold,
})
);
if (!maybeGsaKey) {
Log.log(
formatFields([{ label: '', value: 'None assigned yet' }], {
labelFormat: chalk.cyan.bold,
})
);
Log.newLine();
return;
}
const { projectIdentifier, privateKeyIdentifier, clientEmail, clientIdentifier, updatedAt } =
maybeGsaKey;
const fields = [
{ label: 'Project ID', value: projectIdentifier },
{ label: 'Client Email', value: clientEmail },
{ label: 'Client ID', value: clientIdentifier },
{ label: 'Private Key ID', value: privateKeyIdentifier },
{ label: 'Updated', value: `${fromNow(new Date(updatedAt))} ago` },
];
Log.log(formatFields(fields, { labelFormat: chalk.cyan.bold }));
Log.newLine();
}
function displayEASAndroidAppCredentials(
appCredentials: CommonAndroidAppCredentialsFragment
): void {
displayAndroidFcmCredentials(appCredentials);
displayGoogleServiceAccountKeyForSubmissions(appCredentials);
const sortedBuildCredentialsList = sortBuildCredentials(
appCredentials.androidAppBuildCredentialsList
);
+28 -60
View File
@@ -6,74 +6,41 @@ import { getExpoConfig } from '../project/expoConfig';
import { getProjectAccountName } from '../project/projectUtils';
import { confirmAsync } from '../prompts';
import { Actor, getActorDisplayName } from '../user/User';
import { ensureLoggedInAsync } from '../user/actions';
import pick from '../utils/expodash/pick';
import * as AndroidGraphqlClient from './android/api/GraphqlClient';
import * as IosGraphqlClient from './ios/api/GraphqlClient';
import AppStoreApi from './ios/appstore/AppStoreApi';
export interface Action<T = void> {
runAsync(ctx: Context): Promise<T>;
}
interface AppleCtxOptions {
appleId?: string;
appleIdPassword?: string;
teamId?: string;
}
interface Options extends AppleCtxOptions {
nonInteractive?: boolean;
exp?: ExpoConfig;
}
export interface Context {
readonly projectDir: string;
readonly user: Actor;
readonly nonInteractive: boolean;
readonly android: typeof AndroidGraphqlClient;
readonly ios: typeof IosGraphqlClient;
readonly appStore: AppStoreApi;
readonly hasProjectContext: boolean;
readonly exp: ExpoConfig;
ensureProjectContext(): void;
bestEffortAppStoreAuthenticateAsync(): Promise<void>;
}
export async function createCredentialsContextAsync(
projectDir: string,
options: Options
): Promise<Context> {
const user = await ensureLoggedInAsync();
let expoConfig: ExpoConfig | undefined = options.exp;
if (!expoConfig) {
try {
expoConfig = getExpoConfig(projectDir);
} catch (error) {
// ignore error, context might be created outside of expo project
}
}
return new CredentialsContext(projectDir, user, expoConfig, options);
}
class CredentialsContext implements Context {
export class CredentialsContext {
public readonly android = AndroidGraphqlClient;
public readonly appStore = new AppStoreApi();
public readonly ios = IosGraphqlClient;
public readonly appStore: AppStoreApi;
public readonly nonInteractive: boolean;
public readonly projectDir: string;
public readonly user: Actor;
private shouldAskAuthenticateAppStore: boolean = true;
private _exp?: ExpoConfig;
constructor(
public readonly projectDir: string,
public readonly user: Actor,
private _exp: ExpoConfig | undefined,
options: Options
private options: {
exp?: ExpoConfig;
nonInteractive?: boolean;
projectDir: string;
user: Actor;
}
) {
this.appStore = new AppStoreApi(pick(options, ['appleId', 'appleIdPassword', 'teamId']));
this.projectDir = options.projectDir;
this.user = options.user;
this.nonInteractive = options.nonInteractive ?? false;
this._exp = options.exp;
if (!this._exp) {
try {
this._exp = getExpoConfig(options.projectDir);
} catch (error) {
// ignore error, context might be created outside of expo project
}
}
}
get hasProjectContext(): boolean {
@@ -90,14 +57,15 @@ class CredentialsContext implements Context {
return;
}
// trigger getConfig error
getConfig(this.projectDir, { skipSDKVersionRequirement: true });
getConfig(this.options.projectDir, { skipSDKVersionRequirement: true });
}
public logOwnerAndProject(): void {
const { user } = this.options;
if (this.hasProjectContext) {
const owner = getProjectAccountName(this.exp, this.user);
const owner = getProjectAccountName(this.exp, user);
// Figure out if User A is configuring credentials as admin for User B's project
const isProxyUser = this.user.__typename === 'Robot' || owner !== this.user.username;
const isProxyUser = user.__typename === 'Robot' || owner !== user.username;
Log.log(
`Accessing credentials ${isProxyUser ? 'on behalf of' : 'for'} ${owner} in project ${
@@ -105,7 +73,7 @@ class CredentialsContext implements Context {
}`
);
} else {
Log.log(`Accessing credentials for ${this.exp.owner ?? getActorDisplayName(this.user)}`);
Log.log(`Accessing credentials for ${this.exp.owner ?? getActorDisplayName(user)}`);
}
}
@@ -8,7 +8,7 @@ import { findApplicationTarget, findTargetByName } from '../../project/ios/targe
import zipObject from '../../utils/expodash/zipObject';
import vcs from '../../vcs';
import GitClient from '../../vcs/git';
import { Context } from '../context';
import { CredentialsContext } from '../context';
import { App, Target, TargetCredentials } from '../ios/types';
import { readRawAsync } from './read';
import {
@@ -23,7 +23,7 @@ import { getCredentialsJsonPath } from './utils';
* is not validated
*/
export async function updateAndroidCredentialsAsync(
ctx: Context,
ctx: CredentialsContext,
buildCredentials: AndroidAppBuildCredentialsFragment
): Promise<void> {
const rawCredentialsJson: any =
@@ -70,7 +70,7 @@ export async function updateAndroidCredentialsAsync(
* credentials.json will be updated partially
*/
export async function updateIosCredentialsAsync(
ctx: Context,
ctx: CredentialsContext,
app: App,
targets: Target[],
distributionType: IosDistributionType
@@ -205,7 +205,7 @@ function createTargetCredentialsPathsMap(
}
async function getTargetBuildCredentialsAsync(
ctx: Context,
ctx: CredentialsContext,
app: App,
target: Target,
iosDistributionType: IosDistributionType
@@ -244,7 +244,7 @@ async function getTargetBuildCredentialsAsync(
}
async function backupTargetCredentialsAsync(
ctx: Context,
ctx: CredentialsContext,
{
targetCredentials,
targetCredentialsPaths,
@@ -5,7 +5,7 @@ import { CommonIosAppCredentialsFragment } from '../../graphql/generated';
import Log from '../../log';
import { findApplicationTarget } from '../../project/ios/target';
import { confirmAsync } from '../../prompts';
import { Context } from '../context';
import { CredentialsContext } from '../context';
import * as credentialsJsonReader from '../credentialsJson/read';
import { ensureAllTargetsAreConfigured } from '../credentialsJson/utils';
import { getAppFromContext } from './actions/BuildCredentialsUtils';
@@ -26,7 +26,7 @@ interface Options {
export default class IosCredentialsProvider {
public readonly platform = Platform.IOS;
constructor(private ctx: Context, private options: Options) {}
constructor(private ctx: CredentialsContext, private options: Options) {}
public async getCredentialsAsync(
src: CredentialsSource.LOCAL | CredentialsSource.REMOTE
@@ -68,7 +68,7 @@ export default class IosCredentialsProvider {
}
private async getPushKeyAsync(
ctx: Context,
ctx: CredentialsContext,
targets: Target[]
): Promise<CommonIosAppCredentialsFragment | null> {
if (ctx.nonInteractive) {
@@ -1,9 +1,9 @@
import { AppleTeamFragment } from '../../../graphql/generated';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { AppLookupParams } from '../api/GraphqlClient';
export async function resolveAppleTeamIfAuthenticatedAsync(
ctx: Context,
ctx: CredentialsContext,
app: AppLookupParams
): Promise<AppleTeamFragment | null> {
if (!ctx.appStore.authCtx) {
@@ -1,6 +1,6 @@
import { ApplePushKeyFragment, CommonIosAppCredentialsFragment } from '../../../graphql/generated';
import Log from '../../../log';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { AppLookupParams } from '../api/GraphqlClient';
import { resolveAppleTeamIfAuthenticatedAsync } from './AppleTeamUtils';
@@ -8,7 +8,7 @@ export class AssignPushKey {
constructor(private app: AppLookupParams) {}
public async runAsync(
ctx: Context,
ctx: CredentialsContext,
pushKey: ApplePushKeyFragment
): Promise<CommonIosAppCredentialsFragment> {
const appleTeam =
@@ -9,13 +9,13 @@ import {
} from '../../../graphql/generated';
import { getProjectAccountName } from '../../../project/projectUtils';
import { findAccountByName } from '../../../user/Account';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { AppLookupParams } from '../api/GraphqlClient';
import { App, Target } from '../types';
import { resolveAppleTeamIfAuthenticatedAsync } from './AppleTeamUtils';
export async function getAllBuildCredentialsAsync(
ctx: Context,
ctx: CredentialsContext,
app: AppLookupParams
): Promise<IosAppBuildCredentialsFragment[]> {
const appCredentials = await ctx.ios.getIosAppCredentialsWithBuildCredentialsAsync(app, {});
@@ -26,7 +26,7 @@ export async function getAllBuildCredentialsAsync(
}
export async function getBuildCredentialsAsync(
ctx: Context,
ctx: CredentialsContext,
app: AppLookupParams,
iosDistributionType: GraphQLIosDistributionType
): Promise<IosAppBuildCredentialsFragment | null> {
@@ -41,7 +41,7 @@ export async function getBuildCredentialsAsync(
}
export async function getProvisioningProfileAsync(
ctx: Context,
ctx: CredentialsContext,
app: AppLookupParams,
iosDistributionType: GraphQLIosDistributionType
): Promise<AppleProvisioningProfileFragment | null> {
@@ -50,7 +50,7 @@ export async function getProvisioningProfileAsync(
}
export async function getDistributionCertificateAsync(
ctx: Context,
ctx: CredentialsContext,
app: AppLookupParams,
iosDistributionType: GraphQLIosDistributionType
): Promise<AppleDistributionCertificateFragment | null> {
@@ -59,7 +59,7 @@ export async function getDistributionCertificateAsync(
}
export async function assignBuildCredentialsAsync(
ctx: Context,
ctx: CredentialsContext,
app: AppLookupParams,
iosDistributionType: GraphQLIosDistributionType,
distCert: AppleDistributionCertificateFragment,
@@ -82,7 +82,7 @@ export async function assignBuildCredentialsAsync(
});
}
export function getAppFromContext(ctx: Context): App {
export function getAppFromContext(ctx: CredentialsContext): App {
ctx.ensureProjectContext();
const projectName = ctx.exp.slug;
const accountName = getProjectAccountName(ctx.exp, ctx.user);
@@ -96,7 +96,10 @@ export function getAppFromContext(ctx: Context): App {
};
}
export function getAppLookupParamsFromContext(ctx: Context, target: Target): AppLookupParams {
export function getAppLookupParamsFromContext(
ctx: CredentialsContext,
target: Target
): AppLookupParams {
const app = getAppFromContext(ctx);
return { ...app, bundleIdentifier: target.bundleIdentifier };
}
@@ -7,7 +7,7 @@ import {
} from '../../../graphql/generated';
import Log from '../../../log';
import { ora } from '../../../ora';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { MissingCredentialsNonInteractiveError } from '../../errors';
import { AppLookupParams } from '../api/GraphqlClient';
import { AppleProvisioningProfileMutationResult } from '../api/graphql/mutations/AppleProvisioningProfileMutation';
@@ -21,7 +21,9 @@ export class ConfigureProvisioningProfile {
private originalProvisioningProfile: AppleProvisioningProfileFragment
) {}
public async runAsync(ctx: Context): Promise<AppleProvisioningProfileMutationResult | null> {
public async runAsync(
ctx: CredentialsContext
): Promise<AppleProvisioningProfileMutationResult | null> {
if (ctx.nonInteractive) {
throw new MissingCredentialsNonInteractiveError(
'Configuring Provisioning Profiles is only supported in interactive mode.'
@@ -62,7 +64,7 @@ export class ConfigureProvisioningProfile {
}
private async configureAndUpdateAsync(
ctx: Context,
ctx: CredentialsContext,
authCtx: AuthCtx,
app: AppLookupParams,
profileFromApple: ProvisioningProfileStoreInfo
@@ -1,13 +1,15 @@
import Log from '../../../log';
import { Account } from '../../../user/Account';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { AppleDistributionCertificateMutationResult } from '../api/graphql/mutations/AppleDistributionCertificateMutation';
import { provideOrGenerateDistributionCertificateAsync } from './DistributionCertificateUtils';
export class CreateDistributionCertificate {
constructor(private account: Account) {}
public async runAsync(ctx: Context): Promise<AppleDistributionCertificateMutationResult> {
public async runAsync(
ctx: CredentialsContext
): Promise<AppleDistributionCertificateMutationResult> {
const distCert = await provideOrGenerateDistributionCertificateAsync(ctx, this.account.name);
const result = await ctx.ios.createDistributionCertificateAsync(this.account, distCert);
Log.succeed('Created distribution certificate');
@@ -3,7 +3,7 @@ import nullthrows from 'nullthrows';
import { AppleDistributionCertificateFragment } from '../../../graphql/generated';
import Log from '../../../log';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { MissingCredentialsNonInteractiveError } from '../../errors';
import { askForUserProvidedAsync } from '../../utils/promptForCredentials';
import { AppLookupParams } from '../api/GraphqlClient';
@@ -20,7 +20,7 @@ export class CreateProvisioningProfile {
private distributionCertificate: AppleDistributionCertificateFragment
) {}
async runAsync(ctx: Context): Promise<AppleProvisioningProfileMutationResult> {
async runAsync(ctx: CredentialsContext): Promise<AppleProvisioningProfileMutationResult> {
if (ctx.nonInteractive) {
throw new MissingCredentialsNonInteractiveError(
'Creating Provisioning Profiles is only supported in interactive mode.'
@@ -46,7 +46,7 @@ export class CreateProvisioningProfile {
}
private async provideOrGenerateAsync(
ctx: Context,
ctx: CredentialsContext,
appleAuthCtx: AuthCtx
): Promise<ProvisioningProfile> {
const userProvided = await askForUserProvidedAsync(provisioningProfileSchema);
@@ -1,13 +1,13 @@
import { ApplePushKeyFragment } from '../../../graphql/generated';
import Log from '../../../log';
import { Account } from '../../../user/Account';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { provideOrGeneratePushKeyAsync } from './PushKeyUtils';
export class CreatePushKey {
constructor(private account: Account) {}
public async runAsync(ctx: Context): Promise<ApplePushKeyFragment> {
public async runAsync(ctx: CredentialsContext): Promise<ApplePushKeyFragment> {
if (ctx.nonInteractive) {
throw new Error(`A new push key cannot be created in non-interactive mode.`);
}
@@ -7,15 +7,15 @@ import Log, { learnMore } from '../../../log';
import { promptAsync } from '../../../prompts';
import { Account } from '../../../user/Account';
import { fromNow } from '../../../utils/date';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { askForUserProvidedAsync } from '../../utils/promptForCredentials';
import { AppLookupParams } from '../api/GraphqlClient';
import { AppleTooManyCertsError } from '../appstore/AppStoreApi';
import {
DistributionCertificate,
DistributionCertificateStoreInfo,
} from '../appstore/Credentials.types';
import { filterRevokedDistributionCertsFromEasServers } from '../appstore/CredentialsUtils';
import { AppleTooManyCertsError } from '../appstore/distributionCertificate';
import { distributionCertificateSchema } from '../credentials';
import { validateDistributionCertificateAsync } from '../validators/validateDistributionCertificate';
import { formatAppleTeam } from './AppleTeamUtils';
@@ -84,7 +84,7 @@ async function _selectDistributionCertificateAsync(
* select a distribution certificate from an account (validity status shown on a best effort basis)
* */
export async function selectDistributionCertificateWithDependenciesAsync(
ctx: Context,
ctx: CredentialsContext,
account: Account
): Promise<AppleDistributionCertificateFragment | null> {
const distCertsForAccount = await ctx.ios.getDistributionCertificatesForAccountAsync(account);
@@ -110,7 +110,7 @@ export async function selectDistributionCertificateWithDependenciesAsync(
* select a distribution certificate from a valid set (curated on a best effort basis)
* */
export async function selectValidDistributionCertificateAsync(
ctx: Context,
ctx: CredentialsContext,
appLookupParams: AppLookupParams
): Promise<AppleDistributionCertificateFragment | null> {
const distCertsForAccount = await ctx.ios.getDistributionCertificatesForAccountAsync(
@@ -133,7 +133,7 @@ export async function selectValidDistributionCertificateAsync(
// filter by valid certs on the developer portal
const certInfoFromApple = await ctx.appStore.listDistributionCertificatesAsync();
const validDistCerts = await filterRevokedDistributionCertsFromEasServers(
const validDistCerts = filterRevokedDistributionCertsFromEasServers(
distCertsForAppleTeam,
certInfoFromApple
);
@@ -152,7 +152,7 @@ Please remember that Apple Distribution Certificates are not application specifi
`;
export async function provideOrGenerateDistributionCertificateAsync(
ctx: Context,
ctx: CredentialsContext,
accountName: string
): Promise<DistributionCertificate> {
if (!ctx.nonInteractive) {
@@ -177,7 +177,9 @@ export async function provideOrGenerateDistributionCertificateAsync(
return await generateDistributionCertificateAsync(ctx, accountName);
}
async function promptForDistCertAsync(ctx: Context): Promise<DistributionCertificate | null> {
async function promptForDistCertAsync(
ctx: CredentialsContext
): Promise<DistributionCertificate | null> {
let initialValues: { teamId?: string } = {};
if (ctx.appStore.authCtx) {
initialValues = {
@@ -198,7 +200,7 @@ async function promptForDistCertAsync(ctx: Context): Promise<DistributionCertifi
}
async function generateDistributionCertificateAsync(
ctx: Context,
ctx: CredentialsContext,
accountName: string
): Promise<DistributionCertificate> {
await ctx.appStore.ensureAuthenticatedAsync();
@@ -1,6 +1,6 @@
import chalk from 'chalk';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import {
DistributionCertificate,
ProvisioningProfile,
@@ -19,7 +19,7 @@ export function formatProvisioningProfileFromApple(
}
export async function generateProvisioningProfileAsync(
ctx: Context,
ctx: CredentialsContext,
bundleIdentifier: string,
distCert: DistributionCertificate
): Promise<ProvisioningProfile> {
@@ -5,7 +5,7 @@ import Log, { learnMore } from '../../../log';
import { confirmAsync, promptAsync } from '../../../prompts';
import { Account } from '../../../user/Account';
import { fromNow } from '../../../utils/date';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { askForUserProvidedAsync } from '../../utils/promptForCredentials';
import { PushKey, PushKeyStoreInfo } from '../appstore/Credentials.types';
import { filterRevokedAndUntrackedPushKeysFromEasServersAsync } from '../appstore/CredentialsUtils';
@@ -15,7 +15,7 @@ import { isPushKeyValidAndTrackedAsync } from '../validators/validatePushKey';
import { formatAppleTeam } from './AppleTeamUtils';
export async function provideOrGeneratePushKeyAsync(
ctx: Context,
ctx: CredentialsContext,
accountName: string
): Promise<PushKey> {
if (!ctx.nonInteractive) {
@@ -43,7 +43,7 @@ export async function provideOrGeneratePushKeyAsync(
return await generatePushKeyAsync(ctx, accountName);
}
async function promptForPushKeyAsync(ctx: Context): Promise<PushKey | null> {
async function promptForPushKeyAsync(ctx: CredentialsContext): Promise<PushKey | null> {
let initialValues: { teamId?: string } = {};
if (ctx.appStore.authCtx) {
initialValues = {
@@ -63,7 +63,10 @@ async function promptForPushKeyAsync(ctx: Context): Promise<PushKey | null> {
return userProvided;
}
async function generatePushKeyAsync(ctx: Context, accountName: string): Promise<PushKey> {
async function generatePushKeyAsync(
ctx: CredentialsContext,
accountName: string
): Promise<PushKey> {
await ctx.appStore.ensureAuthenticatedAsync();
try {
return await ctx.appStore.createPushKeyAsync();
@@ -116,7 +119,7 @@ function formatPushKeyFromApple(pushKey: PushKeyStoreInfo): string {
* select a push key from an account (validity status shown on a best effort basis)
* */
export async function selectPushKeyAsync(
ctx: Context,
ctx: CredentialsContext,
account: Account
): Promise<ApplePushKeyFragment | null> {
const pushKeysForAccount = await ctx.ios.getPushKeysForAccountAsync(account);
@@ -133,7 +136,7 @@ export async function selectPushKeyAsync(
}
export async function getValidAndTrackedPushKeysOnEasServersAsync(
ctx: Context,
ctx: CredentialsContext,
pushKeysForAccount: ApplePushKeyFragment[]
): Promise<ApplePushKeyFragment[]> {
const pushInfoFromApple = await ctx.appStore.listPushKeysAsync();
@@ -5,7 +5,7 @@ import {
import Log from '../../../log';
import { confirmAsync } from '../../../prompts';
import { Account } from '../../../user/Account';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { AppLookupParams } from '../api/GraphqlClient';
import { selectDistributionCertificateWithDependenciesAsync } from './DistributionCertificateUtils';
import { RemoveProvisioningProfiles } from './RemoveProvisioningProfile';
@@ -13,7 +13,7 @@ import { RemoveProvisioningProfiles } from './RemoveProvisioningProfile';
export class SelectAndRemoveDistributionCertificate {
constructor(private account: Account) {}
async runAsync(ctx: Context): Promise<void> {
async runAsync(ctx: CredentialsContext): Promise<void> {
const selected = await selectDistributionCertificateWithDependenciesAsync(ctx, this.account);
if (selected) {
await new RemoveDistributionCertificate(this.account, selected).runAsync(ctx);
@@ -29,7 +29,7 @@ export class RemoveDistributionCertificate {
private distributionCertificate: AppleDistributionCertificateFragment
) {}
public async runAsync(ctx: Context): Promise<void> {
public async runAsync(ctx: CredentialsContext): Promise<void> {
const apps = this.distributionCertificate.iosAppBuildCredentialsList.map(
buildCredentials => buildCredentials.iosAppCredentials.app
);
@@ -71,7 +71,7 @@ export class RemoveDistributionCertificate {
await this.removeInvalidProvisioningProfilesAsync(ctx);
}
private async removeInvalidProvisioningProfilesAsync(ctx: Context): Promise<void> {
private async removeInvalidProvisioningProfilesAsync(ctx: CredentialsContext): Promise<void> {
const buildCredentialsList = this.distributionCertificate.iosAppBuildCredentialsList;
const appsWithProfilesToRemove: AppLookupParams[] = [];
const profilesToRemove: AppleProvisioningProfileIdentifiersFragment[] = [];
@@ -2,7 +2,7 @@ import assert from 'assert';
import { AppleProvisioningProfileIdentifiersFragment } from '../../../graphql/generated';
import Log from '../../../log';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { AppLookupParams } from '../api/GraphqlClient';
export class RemoveProvisioningProfiles {
@@ -16,7 +16,7 @@ export class RemoveProvisioningProfiles {
);
}
async runAsync(ctx: Context): Promise<void> {
async runAsync(ctx: CredentialsContext): Promise<void> {
if (this.provisioningProfiles.length === 0) {
Log.log(`Skipping deletion of Provisioning Profiles`);
return;
@@ -2,13 +2,13 @@ import { ApplePushKeyFragment } from '../../../graphql/generated';
import Log from '../../../log';
import { confirmAsync } from '../../../prompts';
import { Account } from '../../../user/Account';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { selectPushKeyAsync } from './PushKeyUtils';
export class SelectAndRemovePushKey {
constructor(private account: Account) {}
async runAsync(ctx: Context): Promise<void> {
async runAsync(ctx: CredentialsContext): Promise<void> {
const selected = await selectPushKeyAsync(ctx, this.account);
if (selected) {
await new RemovePushKey(this.account, selected).runAsync(ctx);
@@ -21,7 +21,7 @@ export class SelectAndRemovePushKey {
export class RemovePushKey {
constructor(private account: Account, private pushKey: ApplePushKeyFragment) {}
public async runAsync(ctx: Context): Promise<void> {
public async runAsync(ctx: CredentialsContext): Promise<void> {
if (ctx.nonInteractive) {
throw new Error(`Cannot remove push keys in non-interactive mode`);
}
@@ -14,7 +14,7 @@ import {
import Log from '../../../log';
import { confirmAsync, pressAnyKeyToContinueAsync } from '../../../prompts';
import differenceBy from '../../../utils/expodash/differenceBy';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { MissingCredentialsNonInteractiveError } from '../../errors';
import { AppLookupParams } from '../api/GraphqlClient';
import { validateProvisioningProfileAsync } from '../validators/validateProvisioningProfile';
@@ -26,7 +26,7 @@ import { SetupDistributionCertificate } from './SetupDistributionCertificate';
export class SetupAdhocProvisioningProfile {
constructor(private app: AppLookupParams) {}
async runAsync(ctx: Context): Promise<IosAppBuildCredentialsFragment> {
async runAsync(ctx: CredentialsContext): Promise<IosAppBuildCredentialsFragment> {
const distCert = await new SetupDistributionCertificate(
this.app,
IosDistributionType.AdHoc
@@ -60,7 +60,7 @@ export class SetupAdhocProvisioningProfile {
}
async runWithDistributionCertificateAsync(
ctx: Context,
ctx: CredentialsContext,
distCert: AppleDistributionCertificateFragment
): Promise<IosAppBuildCredentialsFragment> {
const currentBuildCredentials = await getBuildCredentialsAsync(
@@ -158,7 +158,7 @@ export class SetupAdhocProvisioningProfile {
);
}
private async areBuildCredentialsSetupAsync(ctx: Context): Promise<boolean> {
private async areBuildCredentialsSetupAsync(ctx: CredentialsContext): Promise<boolean> {
const buildCredentials = await getBuildCredentialsAsync(
ctx,
this.app,
@@ -168,7 +168,7 @@ export class SetupAdhocProvisioningProfile {
}
private async shouldUseExistingProfileAsync(
ctx: Context,
ctx: CredentialsContext,
buildCredentials: IosAppBuildCredentialsFragment
): Promise<boolean> {
const provisioningProfile = nullthrows(buildCredentials.provisioningProfile);
@@ -202,7 +202,7 @@ export class SetupAdhocProvisioningProfile {
}
private async registerDevicesAsync(
ctx: Context,
ctx: CredentialsContext,
appleTeam: AppleTeamFragment
): Promise<AppleDeviceFragment[]> {
const action = new DeviceCreateAction(this.app.account, appleTeam);
@@ -3,7 +3,7 @@ import chalk from 'chalk';
import nullthrows from 'nullthrows';
import Log from '../../../log';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { IosCapabilitiesOptions } from '../appstore/ensureAppExists';
import { App, IosAppBuildCredentialsMap, IosCredentials, Target } from '../types';
import { displayProjectCredentials } from '../utils/printCredentials';
@@ -20,7 +20,7 @@ interface Options {
export class SetupBuildCredentials {
constructor(private options: Options) {}
async runAsync(ctx: Context): Promise<IosCredentials> {
async runAsync(ctx: CredentialsContext): Promise<IosCredentials> {
const hasManyTargets = this.options.targets.length > 1;
const iosAppBuildCredentialsMap: IosAppBuildCredentialsMap = {};
if (hasManyTargets) {
@@ -3,7 +3,7 @@ import chalk from 'chalk';
import { IosDistributionType } from '../../../graphql/generated';
import Log from '../../../log';
import { findApplicationTarget } from '../../../project/ios/target';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { readIosCredentialsAsync } from '../../credentialsJson/read';
import { IosCredentials } from '../../credentialsJson/types';
import { ensureAllTargetsAreConfigured } from '../../credentialsJson/utils';
@@ -17,7 +17,7 @@ export class SetupBuildCredentialsFromCredentialsJson {
private distributionType: IosDistributionType
) {}
async runAsync(ctx: Context): Promise<void> {
async runAsync(ctx: CredentialsContext): Promise<void> {
const credentialsJson = await this.readCredentialsJsonAsync(ctx);
ensureAllTargetsAreConfigured(this.targets, credentialsJson);
@@ -45,7 +45,7 @@ export class SetupBuildCredentialsFromCredentialsJson {
}
}
private async readCredentialsJsonAsync(ctx: Context): Promise<IosCredentials> {
private async readCredentialsJsonAsync(ctx: CredentialsContext): Promise<IosCredentials> {
const applicationTarget = findApplicationTarget(this.targets);
try {
return await readIosCredentialsAsync(ctx.projectDir, applicationTarget);
@@ -8,7 +8,7 @@ import {
import Log from '../../../log';
import { confirmAsync, promptAsync } from '../../../prompts';
import sortBy from '../../../utils/expodash/sortBy';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { MissingCredentialsNonInteractiveError } from '../../errors';
import { AppLookupParams } from '../api/GraphqlClient';
import { AppleDistributionCertificateMutationResult } from '../api/graphql/mutations/AppleDistributionCertificateMutation';
@@ -23,7 +23,7 @@ export class SetupDistributionCertificate {
constructor(private app: AppLookupParams, private distributionType: IosDistributionType) {}
public async runAsync(ctx: Context): Promise<AppleDistributionCertificateFragment> {
public async runAsync(ctx: CredentialsContext): Promise<AppleDistributionCertificateFragment> {
const appleTeam = await resolveAppleTeamIfAuthenticatedAsync(ctx, this.app);
try {
@@ -47,7 +47,7 @@ export class SetupDistributionCertificate {
}
private async runNonInteractiveAsync(
ctx: Context,
ctx: CredentialsContext,
currentCertificate: AppleDistributionCertificateFragment | null
): Promise<AppleDistributionCertificateFragment> {
// TODO: implement validation
@@ -60,7 +60,7 @@ export class SetupDistributionCertificate {
}
private async runInteractiveAsync(
ctx: Context,
ctx: CredentialsContext,
currentCertificate: AppleDistributionCertificateFragment | null
): Promise<AppleDistributionCertificateFragment> {
if (await this.isCurrentCertificateValidAsync(ctx, currentCertificate)) {
@@ -75,7 +75,7 @@ export class SetupDistributionCertificate {
}
private async isCurrentCertificateValidAsync(
ctx: Context,
ctx: CredentialsContext,
currentCertificate: AppleDistributionCertificateFragment | null
): Promise<boolean> {
if (!currentCertificate) {
@@ -108,7 +108,7 @@ export class SetupDistributionCertificate {
}
private async createOrReuseDistCertAsync(
ctx: Context
ctx: CredentialsContext
): Promise<AppleDistributionCertificateFragment> {
const validDistCerts = await this.getValidDistCertsAsync(ctx);
const autoselectedDistCert = validDistCerts[0];
@@ -147,12 +147,12 @@ export class SetupDistributionCertificate {
}
private async createNewDistCertAsync(
ctx: Context
ctx: CredentialsContext
): Promise<AppleDistributionCertificateMutationResult> {
return new CreateDistributionCertificate(this.app.account).runAsync(ctx);
}
async reuseDistCertAsync(ctx: Context): Promise<AppleDistributionCertificate> {
async reuseDistCertAsync(ctx: CredentialsContext): Promise<AppleDistributionCertificate> {
const validDistCerts = await this.getValidDistCertsAsync(ctx);
const { distCert } = await promptAsync({
type: 'select',
@@ -167,7 +167,7 @@ export class SetupDistributionCertificate {
}
private async getValidDistCertsAsync(
ctx: Context
ctx: CredentialsContext
): Promise<AppleDistributionCertificateFragment[]> {
if (this.validDistCerts) {
return this.validDistCerts;
@@ -1,7 +1,7 @@
import { IosAppBuildCredentialsFragment, IosDistributionType } from '../../../graphql/generated';
import Log from '../../../log';
import { promptAsync } from '../../../prompts';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { AppLookupParams } from '../api/GraphqlClient';
import { getAllBuildCredentialsAsync } from './BuildCredentialsUtils';
import { SetupAdhocProvisioningProfile } from './SetupAdhocProvisioningProfile';
@@ -17,7 +17,7 @@ import { SetupProvisioningProfile } from './SetupProvisioningProfile';
export class SetupInternalProvisioningProfile {
constructor(private app: AppLookupParams) {}
async runAsync(ctx: Context): Promise<IosAppBuildCredentialsFragment> {
async runAsync(ctx: CredentialsContext): Promise<IosAppBuildCredentialsFragment> {
const buildCredentials = await getAllBuildCredentialsAsync(ctx, this.app);
const adhocBuildCredentialsExist =
@@ -80,13 +80,13 @@ export class SetupInternalProvisioningProfile {
}
private async setupAdhocProvisioningProfileAsync(
ctx: Context
ctx: CredentialsContext
): Promise<IosAppBuildCredentialsFragment> {
return await new SetupAdhocProvisioningProfile(this.app).runAsync(ctx);
}
private async setupUniversalProvisioningProfileAsync(
ctx: Context
ctx: CredentialsContext
): Promise<IosAppBuildCredentialsFragment> {
return await new SetupProvisioningProfile(this.app, IosDistributionType.Enterprise).runAsync(
ctx
@@ -94,7 +94,7 @@ export class SetupInternalProvisioningProfile {
}
private async askForDistributionTypeAndSetupAsync(
ctx: Context,
ctx: CredentialsContext,
message: string
): Promise<IosAppBuildCredentialsFragment> {
const { distributionType } = await promptAsync({
@@ -7,7 +7,7 @@ import {
IosDistributionType,
} from '../../../graphql/generated';
import { confirmAsync } from '../../../prompts';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { MissingCredentialsNonInteractiveError } from '../../errors';
import { AppLookupParams } from '../api/GraphqlClient';
import { ProvisioningProfileStoreInfo } from '../appstore/Credentials.types';
@@ -28,13 +28,13 @@ import { SetupDistributionCertificate } from './SetupDistributionCertificate';
export class SetupProvisioningProfile {
constructor(private app: AppLookupParams, private distributionType: IosDistributionType) {}
async areBuildCredentialsSetupAsync(ctx: Context): Promise<boolean> {
async areBuildCredentialsSetupAsync(ctx: CredentialsContext): Promise<boolean> {
const buildCredentials = await getBuildCredentialsAsync(ctx, this.app, this.distributionType);
return await validateProvisioningProfileAsync(ctx, this.app, buildCredentials);
}
async assignNewAndDeleteOldProfileAsync(
ctx: Context,
ctx: CredentialsContext,
distCert: AppleDistributionCertificateFragment,
currentProfile: AppleProvisioningProfileFragment
): Promise<IosAppBuildCredentialsFragment> {
@@ -45,7 +45,7 @@ export class SetupProvisioningProfile {
}
async createAndAssignProfileAsync(
ctx: Context,
ctx: CredentialsContext,
distCert: AppleDistributionCertificateFragment
): Promise<IosAppBuildCredentialsFragment> {
const provisioningProfile = await new CreateProvisioningProfile(this.app, distCert).runAsync(
@@ -61,7 +61,7 @@ export class SetupProvisioningProfile {
}
async configureAndAssignProfileAsync(
ctx: Context,
ctx: CredentialsContext,
distCert: AppleDistributionCertificateFragment,
originalProvisioningProfile: AppleProvisioningProfileFragment
): Promise<IosAppBuildCredentialsFragment | null> {
@@ -83,7 +83,7 @@ export class SetupProvisioningProfile {
);
}
async runAsync(ctx: Context): Promise<IosAppBuildCredentialsFragment> {
async runAsync(ctx: CredentialsContext): Promise<IosAppBuildCredentialsFragment> {
const distCert = await new SetupDistributionCertificate(
this.app,
this.distributionType
@@ -4,7 +4,7 @@ import nullthrows from 'nullthrows';
import { ApplePushKeyFragment, CommonIosAppCredentialsFragment } from '../../../graphql/generated';
import Log from '../../../log';
import { confirmAsync, promptAsync } from '../../../prompts';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { AppLookupParams } from '../api/GraphqlClient';
import { AssignPushKey } from './AssignPushKey';
import { CreatePushKey } from './CreatePushKey';
@@ -17,12 +17,12 @@ import {
export class SetupPushKey {
constructor(private app: AppLookupParams) {}
async isPushKeySetupAsync(ctx: Context): Promise<boolean> {
async isPushKeySetupAsync(ctx: CredentialsContext): Promise<boolean> {
const pushKey = await ctx.ios.getPushKeyForAppAsync(this.app);
return !!pushKey;
}
public async runAsync(ctx: Context): Promise<CommonIosAppCredentialsFragment | null> {
public async runAsync(ctx: CredentialsContext): Promise<CommonIosAppCredentialsFragment | null> {
if (ctx.nonInteractive) {
throw new Error(`Push keys cannot be setup in non-interactive mode.`);
}
@@ -42,7 +42,7 @@ export class SetupPushKey {
return await new AssignPushKey(this.app).runAsync(ctx, pushKey);
}
private async createOrReusePushKeyAsync(ctx: Context): Promise<ApplePushKeyFragment> {
private async createOrReusePushKeyAsync(ctx: CredentialsContext): Promise<ApplePushKeyFragment> {
const pushKeysForAccount = await ctx.ios.getPushKeysForAccountAsync(this.app.account);
assert(
pushKeysForAccount.length > 0,
@@ -5,7 +5,7 @@ import {
IosAppBuildCredentialsFragment,
} from '../../../graphql/generated';
import Log from '../../../log';
import { Action, Context } from '../../context';
import { CredentialsContext } from '../../context';
import { AppLookupParams as GraphQLAppLookupParams } from '../api/GraphqlClient';
import { IosCapabilitiesOptions } from '../appstore/ensureAppExists';
import { SetupAdhocProvisioningProfile } from './SetupAdhocProvisioningProfile';
@@ -18,10 +18,10 @@ interface Options {
enterpriseProvisioning?: IosEnterpriseProvisioning;
iosCapabilitiesOptions?: IosCapabilitiesOptions;
}
export class SetupTargetBuildCredentials implements Action<IosAppBuildCredentialsFragment> {
export class SetupTargetBuildCredentials {
constructor(private options: Options) {}
async runAsync(ctx: Context): Promise<IosAppBuildCredentialsFragment> {
async runAsync(ctx: CredentialsContext): Promise<IosAppBuildCredentialsFragment> {
const { app, iosCapabilitiesOptions } = this.options;
await ctx.bestEffortAppStoreAuthenticateAsync();
@@ -44,7 +44,9 @@ export class SetupTargetBuildCredentials implements Action<IosAppBuildCredential
}
}
async setupBuildCredentialsAsync(ctx: Context): Promise<IosAppBuildCredentialsFragment> {
async setupBuildCredentialsAsync(
ctx: CredentialsContext
): Promise<IosAppBuildCredentialsFragment> {
const { app, distribution, enterpriseProvisioning } = this.options;
if (distribution === 'internal') {
if (enterpriseProvisioning === 'adhoc') {
@@ -10,7 +10,7 @@ import {
} from '../../../graphql/generated';
import Log from '../../../log';
import { confirmAsync } from '../../../prompts';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { IosTargetCredentials } from '../../credentialsJson/types';
import { AppLookupParams } from '../api/GraphqlClient';
import { displayProjectCredentials } from '../utils/printCredentials';
@@ -29,7 +29,7 @@ export class SetupTargetBuildCredentialsFromCredentialsJson {
private targetCredentials: IosTargetCredentials
) {}
async runAsync(ctx: Context): Promise<IosAppBuildCredentialsFragment> {
async runAsync(ctx: CredentialsContext): Promise<IosAppBuildCredentialsFragment> {
// currently configured credentials
const buildCredentials = await getBuildCredentialsAsync(ctx, this.app, this.distributionType);
const currentDistributionCertificate = await getDistributionCertificateAsync(
@@ -102,7 +102,7 @@ export class SetupTargetBuildCredentialsFromCredentialsJson {
}
async getDistributionCertificateToAssignAsync(
ctx: Context,
ctx: CredentialsContext,
appleTeam: AppleTeamFragment,
currentDistributionCertificate: AppleDistributionCertificateFragment | null
): Promise<AppleDistributionCertificateFragment> {
@@ -132,7 +132,7 @@ export class SetupTargetBuildCredentialsFromCredentialsJson {
}
async getProvisioningProfileToAssignAsync(
ctx: Context,
ctx: CredentialsContext,
appleTeam: AppleTeamFragment,
currentProvisioningProfile: AppleProvisioningProfileFragment | null
): Promise<AppleProvisioningProfileFragment> {
@@ -152,7 +152,7 @@ export class SetupTargetBuildCredentialsFromCredentialsJson {
}
async createNewProvisioningProfileAsync(
ctx: Context,
ctx: CredentialsContext,
appleTeam: AppleTeamFragment
): Promise<AppleProvisioningProfileFragment> {
const { provisioningProfile } = this.targetCredentials;
@@ -1,6 +1,6 @@
import { IosDistributionType } from '../../../graphql/generated';
import Log from '../../../log';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { updateIosCredentialsAsync } from '../../credentialsJson/update';
import { App, Target } from '../types';
@@ -11,7 +11,7 @@ export class UpdateCredentialsJson {
private distributionType: IosDistributionType
) {}
async runAsync(ctx: Context): Promise<void> {
async runAsync(ctx: CredentialsContext): Promise<void> {
Log.log('Updating iOS credentials in credentials.json');
await updateIosCredentialsAsync(ctx, this.app, this.targets, this.distributionType);
Log.succeed(
@@ -3,7 +3,7 @@ import {
AppleProvisioningProfileFragment,
} from '../../../../graphql/generated';
import { testProvisioningProfileFragment } from '../../../__tests__/fixtures-ios';
import { Context } from '../../../context';
import { CredentialsContext } from '../../../context';
import { AppLookupParams } from '../../api/GraphqlClient';
import { AppleProvisioningProfileMutationResult } from '../../api/graphql/mutations/AppleProvisioningProfileMutation';
@@ -14,7 +14,9 @@ export class ConfigureProvisioningProfile {
private originalProvisioningProfile: AppleProvisioningProfileFragment
) {}
public async runAsync(ctx: Context): Promise<AppleProvisioningProfileMutationResult | null> {
public async runAsync(
ctx: CredentialsContext
): Promise<AppleProvisioningProfileMutationResult | null> {
return testProvisioningProfileFragment;
}
}
@@ -1,6 +1,6 @@
import { AppleDistributionCertificateFragment } from '../../../../graphql/generated';
import { testProvisioningProfileFragment } from '../../../__tests__/fixtures-ios';
import { Context } from '../../../context';
import { CredentialsContext } from '../../../context';
import { AppLookupParams } from '../../api/GraphqlClient';
import { AppleProvisioningProfileMutationResult } from '../../api/graphql/mutations/AppleProvisioningProfileMutation';
@@ -10,7 +10,7 @@ export class CreateProvisioningProfile {
private distributionCertificate: AppleDistributionCertificateFragment
) {}
async runAsync(ctx: Context): Promise<AppleProvisioningProfileMutationResult> {
async runAsync(ctx: CredentialsContext): Promise<AppleProvisioningProfileMutationResult> {
return testProvisioningProfileFragment;
}
}
@@ -3,12 +3,12 @@ import {
IosDistributionType,
} from '../../../../graphql/generated';
import { testDistCertFragmentOneDependency } from '../../../__tests__/fixtures-ios';
import { Context } from '../../../context';
import { CredentialsContext } from '../../../context';
import { AppLookupParams } from '../../api/GraphqlClient';
export class SetupDistributionCertificate {
constructor(private app: AppLookupParams, private distributionType: IosDistributionType) {}
public async runAsync(_ctx: Context): Promise<AppleDistributionCertificateFragment> {
public async runAsync(_ctx: CredentialsContext): Promise<AppleDistributionCertificateFragment> {
return testDistCertFragmentOneDependency;
}
}
@@ -6,9 +6,8 @@ import {
PushKey,
PushKeyStoreInfo,
} from './Credentials.types';
import { AuthCtx, authenticateAsync } from './authenticate';
import { AuthCtx, Options as AuthenticateOptions, authenticateAsync } from './authenticate';
import {
AppleTooManyCertsError,
createDistributionCertificateAsync,
listDistributionCertificatesAsync,
revokeDistributionCertificateAsync,
@@ -28,28 +27,14 @@ import {
import { createOrReuseAdhocProvisioningProfileAsync } from './provisioningProfileAdhoc';
import { createPushKeyAsync, listPushKeysAsync, revokePushKeyAsync } from './pushKey';
interface Options {
appleIdPassword?: string;
appleId?: string;
teamId?: string;
}
export default class AppStoreApi {
public authCtx?: AuthCtx;
export { AppleTooManyCertsError };
class AppStoreApi {
private _authCtx?: AuthCtx;
constructor(public readonly options?: Options) {}
public get authCtx(): AuthCtx | undefined {
return this._authCtx;
}
public async ensureAuthenticatedAsync(): Promise<AuthCtx> {
if (!this._authCtx) {
this._authCtx = await authenticateAsync(this.options);
public async ensureAuthenticatedAsync(options?: AuthenticateOptions): Promise<AuthCtx> {
if (!this.authCtx) {
this.authCtx = await authenticateAsync(options);
}
return this._authCtx;
return this.authCtx;
}
public async ensureBundleIdExistsAsync(
@@ -152,4 +137,3 @@ class AppStoreApi {
);
}
}
export default AppStoreApi;
@@ -165,7 +165,6 @@ export async function ensureAppExistsAsync(
const spinner = ora(`Linking to App Store ${chalk.dim(bundleIdentifier)}`).start();
let app = await App.findAsync(context, { bundleId: bundleIdentifier });
if (!app) {
spinner.text = `Creating App Store app ${chalk.bold(name)} ${chalk.dim(bundleIdentifier)}`;
try {
@@ -3,17 +3,7 @@ import { Workflow } from '@expo/eas-build-job';
import { JSONObject } from '@expo/json-file';
import plist from '@expo/plist';
import { getPrebuildConfig } from '@expo/prebuild-config';
import fs from 'fs';
function getEntitlementsJson(projectDir: string): JSONObject | null {
try {
const entitlementsPath = IOSConfig.Paths.getEntitlementsPath(projectDir);
if (entitlementsPath) {
return plist.parse(fs.readFileSync(entitlementsPath, 'utf8'));
}
} catch {}
return null;
}
import fs from 'fs-extra';
export async function getManagedEntitlementsJsonAsync(projectDir: string): Promise<JSONObject> {
let { exp } = getPrebuildConfig(projectDir, { platforms: ['ios'] });
@@ -31,10 +21,21 @@ export async function resolveEntitlementsJsonAsync(
workflow: Workflow
): Promise<JSONObject> {
if (workflow === Workflow.GENERIC) {
return getEntitlementsJson(projectDir) || {};
return (await getEntitlementsJsonAsync(projectDir)) || {};
} else if (workflow === Workflow.MANAGED) {
return getManagedEntitlementsJsonAsync(projectDir);
return await getManagedEntitlementsJsonAsync(projectDir);
} else {
throw new Error(`Unknown workflow: ${workflow}`);
}
}
async function getEntitlementsJsonAsync(projectDir: string): Promise<JSONObject | null> {
try {
const entitlementsPath = IOSConfig.Paths.getEntitlementsPath(projectDir);
if (entitlementsPath) {
const entitlementsContents = await fs.readFile(entitlementsPath, 'utf8');
return plist.parse(entitlementsContents);
}
} catch {}
return null;
}
@@ -1,9 +1,9 @@
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { DistributionCertificate } from '../appstore/Credentials.types';
import { filterRevokedDistributionCerts } from '../appstore/CredentialsUtils';
export async function validateDistributionCertificateAsync(
ctx: Context,
ctx: CredentialsContext,
distributionCertificate: DistributionCertificate
): Promise<boolean> {
const certInfoFromApple = await ctx.appStore.listDistributionCertificatesAsync();
@@ -6,14 +6,14 @@ import nullthrows from 'nullthrows';
import { IosAppBuildCredentialsFragment, IosDistributionType } from '../../../graphql/generated';
import Log from '../../../log';
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { AppLookupParams } from '../api/GraphqlClient';
import { ProfileClass } from '../appstore/provisioningProfile';
import { getP12CertFingerprint } from '../utils/p12Certificate';
import { parse as parseProvisioningProfile } from '../utils/provisioningProfile';
export async function validateProvisioningProfileAsync(
ctx: Context,
ctx: CredentialsContext,
app: AppLookupParams,
buildCredentials: Partial<IosAppBuildCredentialsFragment> | null
): Promise<boolean> {
@@ -83,7 +83,7 @@ function validateProvisioningProfileWithoutApple(
}
async function validateProvisioningProfileWithAppleAsync(
ctx: Context,
ctx: CredentialsContext,
app: AppLookupParams,
buildCredentials: Partial<IosAppBuildCredentialsFragment>
): Promise<boolean> {
@@ -1,9 +1,9 @@
import { Context } from '../../context';
import { CredentialsContext } from '../../context';
import { PushKey } from '../appstore/Credentials.types';
import { filterRevokedAndUntrackedPushKeysAsync } from '../appstore/CredentialsUtils';
export async function isPushKeyValidAndTrackedAsync(
ctx: Context,
ctx: CredentialsContext,
pushKey: PushKey
): Promise<boolean> {
const pushInfoFromApple = await ctx.appStore.listPushKeysAsync();
@@ -1,5 +1,10 @@
import Log from '../../log';
import { pressAnyKeyToContinueAsync } from '../../prompts';
import { CredentialsContext } from '../context';
export interface Action<T = void> {
runAsync(ctx: CredentialsContext): Promise<T>;
}
export class PressAnyKeyToContinue {
public async runAsync(): Promise<void> {
@@ -12,24 +12,27 @@ import { promptAsync } from '../../prompts';
import { findAccountByName } from '../../user/Account';
import { ensureActorHasUsername } from '../../user/actions';
import { AssignFcm } from '../android/actions/AssignFcm';
import { AssignGoogleServiceAccountKey } from '../android/actions/AssignGoogleServiceAccountKey';
import {
canCopyLegacyCredentialsAsync,
getAppLookupParamsFromContextAsync,
promptUserAndCopyLegacyCredentialsAsync,
} from '../android/actions/BuildCredentialsUtils';
import { CreateFcm } from '../android/actions/CreateFcm';
import { CreateGoogleServiceAccountKey } from '../android/actions/CreateGoogleServiceAccountKey';
import { CreateKeystore } from '../android/actions/CreateKeystore';
import { DownloadKeystore } from '../android/actions/DownloadKeystore';
import { RemoveFcm } from '../android/actions/RemoveFcm';
import { RemoveKeystore } from '../android/actions/RemoveKeystore';
import { SetupBuildCredentialsFromCredentialsJson } from '../android/actions/SetupBuildCredentialsFromCredentialsJson';
import { UpdateCredentialsJson } from '../android/actions/UpdateCredentialsJson';
import { UseExistingGoogleServiceAccountKey } from '../android/actions/UseExistingGoogleServiceAccountKey';
import {
displayAndroidAppCredentials,
displayEmptyAndroidCredentials,
} from '../android/utils/printCredentials';
import { Action, Context } from '../context';
import { PressAnyKeyToContinue } from './HelperActions';
import { CredentialsContext } from '../context';
import { Action, PressAnyKeyToContinue } from './HelperActions';
import {
SelectAndroidBuildCredentials,
SelectAndroidBuildCredentialsResultType,
@@ -40,6 +43,7 @@ import { SelectBuildProfileFromEasJson } from './SelectBuildProfileFromEasJson';
enum ActionType {
ManageBuildCredentials,
ManageFcm,
ManageGoogleServiceAccountKey,
ManageCredentialsJson,
GoBackToCaller,
GoBackToHighLevelActions,
@@ -48,6 +52,8 @@ enum ActionType {
RemoveKeystore,
CreateFcm,
RemoveFcm,
CreateGsaKey,
UseExistingGsaKey,
UpdateCredentialsJson,
SetupBuildCredentialsFromCredentialsJson,
}
@@ -70,6 +76,11 @@ const highLevelActions: ActionInfo[] = [
title: 'Push Notifications: Manage your FCM Api Key',
scope: Scope.Manager,
},
{
value: ActionType.ManageGoogleServiceAccountKey,
title: 'Google Service Account: Manage your Service Account Key',
scope: Scope.Manager,
},
{
value: ActionType.ManageCredentialsJson,
title: 'Credentials.json: Upload/Download credentials between EAS servers and your local json ',
@@ -141,10 +152,31 @@ const fcmActions: ActionInfo[] = [
},
];
const gsaKeyActions: ActionInfo[] = [
{
value: ActionType.CreateGsaKey,
title: 'Upload a Google Service Account Key',
scope: Scope.Project,
},
{
value: ActionType.UseExistingGsaKey,
title: 'Use an existing Google Service Account Key',
scope: Scope.Project,
},
{
value: ActionType.GoBackToHighLevelActions,
title: 'Go back',
scope: Scope.Manager,
},
];
export class ManageAndroid {
constructor(private callingAction: Action) {}
async runAsync(ctx: Context, currentActions: ActionInfo[] = highLevelActions): Promise<void> {
async runAsync(
ctx: CredentialsContext,
currentActions: ActionInfo[] = highLevelActions
): Promise<void> {
const accountName = ctx.hasProjectContext
? getProjectAccountName(ctx.exp, ctx.user)
: ensureActorHasUsername(ctx.user);
@@ -202,6 +234,9 @@ export class ManageAndroid {
} else if (chosenAction === ActionType.ManageFcm) {
currentActions = fcmActions;
continue;
} else if (chosenAction === ActionType.ManageGoogleServiceAccountKey) {
currentActions = gsaKeyActions;
continue;
} else if (chosenAction === ActionType.ManageCredentialsJson) {
currentActions = credentialsJsonActions;
continue;
@@ -225,7 +260,7 @@ export class ManageAndroid {
}
}
private async createProjectContextAsync(ctx: Context): Promise<{
private async createProjectContextAsync(ctx: CredentialsContext): Promise<{
gradleContext?: GradleBuildContext;
buildProfile?: AndroidBuildProfile;
}> {
@@ -252,7 +287,7 @@ export class ManageAndroid {
}
private async runProjectSpecificActionAsync(
ctx: Context,
ctx: CredentialsContext,
action: ActionType,
gradleContext?: GradleBuildContext
): Promise<void> {
@@ -301,6 +336,16 @@ export class ManageAndroid {
await new AssignFcm(appLookupParams).runAsync(ctx, fcm);
} else if (action === ActionType.RemoveFcm) {
await new RemoveFcm(appLookupParams).runAsync(ctx);
} else if (action === ActionType.CreateGsaKey) {
const gsaKey = await new CreateGoogleServiceAccountKey(appLookupParams.account).runAsync(ctx);
await new AssignGoogleServiceAccountKey(appLookupParams).runAsync(ctx, gsaKey);
} else if (action === ActionType.UseExistingGsaKey) {
const gsaKey = await new UseExistingGoogleServiceAccountKey(appLookupParams.account).runAsync(
ctx
);
if (gsaKey) {
await new AssignGoogleServiceAccountKey(appLookupParams).runAsync(ctx, gsaKey);
}
} else if (action === ActionType.UpdateCredentialsJson) {
const buildCredentials = await new SelectExistingAndroidBuildCredentials(
appLookupParams
@@ -18,7 +18,7 @@ import {
import { confirmAsync, promptAsync, selectAsync } from '../../prompts';
import { Account, findAccountByName } from '../../user/Account';
import { ensureActorHasUsername } from '../../user/actions';
import { Action, Context } from '../context';
import { CredentialsContext } from '../context';
import { AssignPushKey } from '../ios/actions/AssignPushKey';
import { getAppLookupParamsFromContext } from '../ios/actions/BuildCredentialsUtils';
import { CreateDistributionCertificate } from '../ios/actions/CreateDistributionCertificate';
@@ -38,7 +38,7 @@ import { AppLookupParams } from '../ios/api/GraphqlClient';
import { getManagedEntitlementsJsonAsync } from '../ios/appstore/entitlements';
import { App, IosAppCredentialsMap, Target } from '../ios/types';
import { displayIosCredentials } from '../ios/utils/printCredentials';
import { PressAnyKeyToContinue } from './HelperActions';
import { Action, PressAnyKeyToContinue } from './HelperActions';
import { SelectBuildProfileFromEasJson } from './SelectBuildProfileFromEasJson';
import { SelectIosDistributionTypeGraphqlFromBuildProfile } from './SelectIosDistributionTypeGraphqlFromBuildProfile';
@@ -110,7 +110,7 @@ const credentialsJsonActions: ActionInfo[] = [
},
];
function getPushKeyActions(ctx: Context): ActionInfo[] {
function getPushKeyActions(ctx: CredentialsContext): ActionInfo[] {
return [
{
value: ActionType.SetupPushKey,
@@ -140,7 +140,7 @@ function getPushKeyActions(ctx: Context): ActionInfo[] {
];
}
function getBuildCredentialsActions(ctx: Context): ActionInfo[] {
function getBuildCredentialsActions(ctx: CredentialsContext): ActionInfo[] {
return [
{
// This command will be triggered during build to ensure all credentials are ready
@@ -179,7 +179,11 @@ function getBuildCredentialsActions(ctx: Context): ActionInfo[] {
export class ManageIos {
constructor(private callingAction: Action) {}
async runAsync(ctx: Context, currentActions: ActionInfo[] = highLevelActions): Promise<void> {
async runAsync(
ctx: CredentialsContext,
currentActions: ActionInfo[] = highLevelActions
): Promise<void> {
const buildCredentialsActions = getBuildCredentialsActions(ctx);
const pushKeyActions = getPushKeyActions(ctx);
@@ -266,7 +270,7 @@ export class ManageIos {
}
private async createProjectContextAsync(
ctx: Context,
ctx: CredentialsContext,
account: Account
): Promise<{ app: App | null; targets: Target[] | null; buildProfile: IosBuildProfile | null }> {
if (!ctx.hasProjectContext) {
@@ -309,7 +313,7 @@ export class ManageIos {
}
private async runAccountSpecificActionAsync(
ctx: Context,
ctx: CredentialsContext,
account: Account,
action: ActionType
): Promise<void> {
@@ -325,7 +329,7 @@ export class ManageIos {
}
private async runProjectSpecificActionAsync(
ctx: Context,
ctx: CredentialsContext,
app: App,
targets: Target[],
buildProfile: IosBuildProfile,
@@ -449,7 +453,7 @@ export class ManageIos {
}
private async setupProvisioningProfileWithSpecificDistCertAsync(
ctx: Context,
ctx: CredentialsContext,
appLookupParams: AppLookupParams,
distCert: AppleDistributionCertificateFragment,
distributionType: IosDistributionTypeGraphql
@@ -4,7 +4,7 @@ import { promptAsync } from '../../prompts';
import { promptForNameAsync, sortBuildCredentials } from '../android/actions/BuildCredentialsUtils';
import { AppLookupParams } from '../android/api/GraphqlClient';
import { AndroidAppBuildCredentialsMetadataInput } from '../android/api/graphql/mutations/AndroidAppBuildCredentialsMutation';
import { Context } from '../context';
import { CredentialsContext } from '../context';
export enum SelectAndroidBuildCredentialsResultType {
CREATE_REQUEST,
@@ -16,7 +16,7 @@ export enum SelectAndroidBuildCredentialsResultType {
export class SelectAndroidBuildCredentials {
constructor(private app: AppLookupParams) {}
async runAsync(ctx: Context): Promise<
async runAsync(ctx: CredentialsContext): Promise<
| {
resultType: SelectAndroidBuildCredentialsResultType.CREATE_REQUEST;
result: AndroidAppBuildCredentialsMetadataInput;
@@ -86,7 +86,7 @@ export class SelectAndroidBuildCredentials {
export class SelectExistingAndroidBuildCredentials {
constructor(private app: AppLookupParams) {}
async runAsync(ctx: Context): Promise<AndroidAppBuildCredentialsFragment | null> {
async runAsync(ctx: CredentialsContext): Promise<AndroidAppBuildCredentialsFragment | null> {
const buildCredentialsList = await ctx.android.getAndroidAppBuildCredentialsListAsync(this.app);
if (buildCredentialsList.length === 0) {
Log.log(`You don't have any Android Build Credentials`);
@@ -3,23 +3,23 @@ import { BuildProfile, EasJsonReader } from '@expo/eas-json';
import Log from '../../log';
import { promptAsync } from '../../prompts';
import { Context } from '../context';
import { CredentialsContext } from '../context';
export class SelectBuildProfileFromEasJson<T extends Platform> {
private easJsonReader: EasJsonReader;
constructor(private projectDir: string, private platform: T) {
constructor(projectDir: string, private platform: T) {
this.easJsonReader = new EasJsonReader(projectDir);
}
async runAsync(ctx: Context): Promise<BuildProfile<T>> {
async runAsync(ctx: CredentialsContext): Promise<BuildProfile<T>> {
const profileName = await this.getProfileNameFromEasConfigAsync(ctx);
const easConfig = await this.easJsonReader.readBuildProfileAsync<T>(this.platform, profileName);
Log.succeed(`Using build profile: ${profileName}`);
return easConfig;
}
async getProfileNameFromEasConfigAsync(ctx: Context): Promise<string> {
async getProfileNameFromEasConfigAsync(ctx: CredentialsContext): Promise<string> {
const buildProfileNames = await this.easJsonReader.getBuildProfileNamesAsync();
if (buildProfileNames.length === 0) {
throw new Error(
@@ -2,12 +2,12 @@ import { IosBuildProfile } from '@expo/eas-json';
import { IosDistributionType as IosDistributionTypeGraphql } from '../../graphql/generated';
import { promptAsync } from '../../prompts';
import { Context } from '../context';
import { CredentialsContext } from '../context';
export class SelectIosDistributionTypeGraphqlFromBuildProfile {
constructor(private buildProfile: IosBuildProfile) {}
async runAsync(ctx: Context): Promise<IosDistributionTypeGraphql> {
async runAsync(ctx: CredentialsContext): Promise<IosDistributionTypeGraphql> {
const { distribution, simulator } = this.buildProfile;
if (simulator) {
throw new Error('A simulator distribution does not require credentials to be configured.');
@@ -18,7 +18,9 @@ export class SelectIosDistributionTypeGraphqlFromBuildProfile {
}
}
async resolveInternalDistributionAsync(ctx: Context): Promise<IosDistributionTypeGraphql> {
async resolveInternalDistributionAsync(
ctx: CredentialsContext
): Promise<IosDistributionTypeGraphql> {
// check if the type is specified in eas config
const maybeEnterpriseProvisioning = this.buildProfile.enterpriseProvisioning;
if (maybeEnterpriseProvisioning) {
@@ -1,10 +1,10 @@
import { promptAsync } from '../../prompts';
import { Action, Context } from '../context';
import { CredentialsContext } from '../context';
import { ManageAndroid } from './ManageAndroid';
import { ManageIos } from './ManageIos';
export class SelectPlatform implements Action {
async runAsync(ctx: Context): Promise<void> {
export class SelectPlatform {
async runAsync(ctx: CredentialsContext): Promise<void> {
const { platform } = await promptAsync({
type: 'select',
name: 'platform',
+56 -1
View File
@@ -2169,8 +2169,10 @@ export type DeleteAndroidKeystoreResult = {
export type GoogleServiceAccountKeyMutation = {
__typename?: 'GoogleServiceAccountKeyMutation';
/** Create an Google Service Account Key */
/** Create a Google Service Account Key */
createGoogleServiceAccountKey: GoogleServiceAccountKey;
/** Delete a Google Service Account Key */
deleteGoogleServiceAccountKey: DeleteGoogleServiceAccountKeyResult;
};
@@ -2179,10 +2181,20 @@ export type GoogleServiceAccountKeyMutationCreateGoogleServiceAccountKeyArgs = {
accountId: Scalars['ID'];
};
export type GoogleServiceAccountKeyMutationDeleteGoogleServiceAccountKeyArgs = {
id: Scalars['ID'];
};
export type GoogleServiceAccountKeyInput = {
jsonKey: Scalars['JSONObject'];
};
export type DeleteGoogleServiceAccountKeyResult = {
__typename?: 'DeleteGoogleServiceAccountKeyResult';
id: Scalars['ID'];
};
export type AppleAppIdentifierMutation = {
__typename?: 'AppleAppIdentifierMutation';
/** Create an Identifier for an iOS App */
@@ -3918,6 +3930,24 @@ export type SetFcmMutation = (
) }
);
export type SetGoogleServiceAccountKeyForSubmissionsMutationVariables = Exact<{
androidAppCredentialsId: Scalars['ID'];
googleServiceAccountKeyId: Scalars['ID'];
}>;
export type SetGoogleServiceAccountKeyForSubmissionsMutation = (
{ __typename?: 'RootMutation' }
& { androidAppCredentials: (
{ __typename?: 'AndroidAppCredentialsMutation' }
& { setGoogleServiceAccountKeyForSubmissions?: Maybe<(
{ __typename?: 'AndroidAppCredentials' }
& Pick<AndroidAppCredentials, 'id'>
& CommonAndroidAppCredentialsFragment
)> }
) }
);
export type CreateAndroidFcmMutationVariables = Exact<{
androidFcmInput: AndroidFcmInput;
accountId: Scalars['ID'];
@@ -4607,6 +4637,27 @@ export type AppleTeamByIdentifierQuery = (
) }
);
export type GoogleServiceAccountKeyByAccountQueryVariables = Exact<{
accountName: Scalars['String'];
}>;
export type GoogleServiceAccountKeyByAccountQuery = (
{ __typename?: 'RootQuery' }
& { account: (
{ __typename?: 'AccountQuery' }
& { byName: (
{ __typename?: 'Account' }
& Pick<Account, 'id'>
& { googleServiceAccountKeys: Array<(
{ __typename?: 'GoogleServiceAccountKey' }
& Pick<GoogleServiceAccountKey, 'id'>
& GoogleServiceAccountKeyFragment
)> }
) }
) }
);
export type IosAppBuildCredentialsByAppleAppIdentiferAndDistributionQueryVariables = Exact<{
projectFullName: Scalars['String'];
appleAppIdentifierId: Scalars['String'];
@@ -5267,6 +5318,10 @@ export type CommonAndroidAppCredentialsFragment = (
{ __typename?: 'AndroidFcm' }
& Pick<AndroidFcm, 'id'>
& AndroidFcmFragment
)>, googleServiceAccountKeyForSubmissions?: Maybe<(
{ __typename?: 'GoogleServiceAccountKey' }
& Pick<GoogleServiceAccountKey, 'id'>
& GoogleServiceAccountKeyFragment
)>, androidAppBuildCredentialsList: Array<(
{ __typename?: 'AndroidAppBuildCredentials' }
& Pick<AndroidAppBuildCredentials, 'id'>
@@ -3,6 +3,7 @@ import gql from 'graphql-tag';
import { AppFragmentNode } from '../App';
import { AndroidAppBuildCredentialsFragmentNode } from './AndroidAppBuildCredentials';
import { AndroidFcmFragmentNode } from './AndroidFcm';
import { GoogleServiceAccountKeyFragmentNode } from './GoogleServiceAccountKey';
export const CommonAndroidAppCredentialsFragmentNode = gql`
fragment CommonAndroidAppCredentialsFragment on AndroidAppCredentials {
@@ -17,6 +18,10 @@ export const CommonAndroidAppCredentialsFragmentNode = gql`
id
...AndroidFcmFragment
}
googleServiceAccountKeyForSubmissions {
id
...GoogleServiceAccountKeyFragment
}
androidAppBuildCredentialsList {
id
...AndroidAppBuildCredentialsFragment
@@ -24,5 +29,6 @@ export const CommonAndroidAppCredentialsFragmentNode = gql`
}
${AppFragmentNode}
${AndroidFcmFragmentNode}
${GoogleServiceAccountKeyFragmentNode}
${AndroidAppBuildCredentialsFragmentNode}
`;
@@ -1,4 +1,4 @@
import fs from 'fs';
import fs from 'fs-extra';
import mockdate from 'mockdate';
import path from 'path';
import { v4 as uuidv4 } from 'uuid';
@@ -11,14 +11,14 @@ import {
MetadataJoi,
TIMEOUT_LIMIT,
buildUnsortedUpdateInfoGroupAsync,
collectAssets,
collectAssetsAsync,
convertAssetToUpdateInfoGroupFormatAsync,
filterOutAssetsThatAlreadyExistAsync,
getBase64URLEncoding,
getStorageKey,
getStorageKeyForAssetAsync,
guessContentTypeFromExtension,
resolveInputDirectory,
resolveInputDirectoryAsync,
uploadAssetsAsync,
} from '../publish';
@@ -26,8 +26,15 @@ jest.mock('../../uploads');
jest.mock('fs');
const dummyFileBuffer = Buffer.from('dummy-file');
fs.mkdirSync(path.resolve(), { recursive: true });
fs.writeFileSync(path.resolve('md5-hash-of-file'), dummyFileBuffer);
beforeAll(async () => {
await fs.mkdir(path.resolve(), { recursive: true });
await fs.writeFile(path.resolve('md5-hash-of-file'), dummyFileBuffer);
});
afterAll(async () => {
await fs.remove(path.resolve('md5-hash-of-file'));
});
describe('MetadataJoi', () => {
it('passes correctly structured metadata', () => {
@@ -114,7 +121,12 @@ describe(getStorageKey, () => {
describe(getStorageKeyForAssetAsync, () => {
const pathLocation = uuidv4();
fs.writeFileSync(pathLocation, Buffer.from('I am pretending to be a jpeg'));
beforeAll(async () => {
await fs.writeFile(pathLocation, Buffer.from('I am pretending to be a jpeg'));
});
afterAll(async () => {
await fs.remove(pathLocation);
});
it('returns the correct key', async () => {
const asset = {
type: 'jpg',
@@ -128,14 +140,19 @@ describe(getStorageKeyForAssetAsync, () => {
});
describe(convertAssetToUpdateInfoGroupFormatAsync, () => {
const pathLocation = uuidv4();
beforeAll(async () => {
await fs.writeFile(pathLocation, Buffer.from('I am pretending to be a jpeg'));
});
afterAll(async () => {
await fs.remove(pathLocation);
});
it('resolves to the correct value', async () => {
const path = uuidv4();
fs.writeFileSync(path, 'I am pretending to be a jpeg');
const fileExtension = '.jpg';
const asset = {
fileExtension,
contentType: 'image/jpeg',
path,
path: pathLocation,
};
await expect(convertAssetToUpdateInfoGroupFormatAsync(asset)).resolves.toEqual({
bundleKey: 'c939e759656f577c058f445bfb19182e',
@@ -150,8 +167,15 @@ describe(convertAssetToUpdateInfoGroupFormatAsync, () => {
describe(buildUnsortedUpdateInfoGroupAsync, () => {
const androidBundlePath = uuidv4();
const assetPath = uuidv4();
fs.writeFileSync(androidBundlePath, 'I am a js bundle');
fs.writeFileSync(assetPath, 'I am pretending to be a jpeg');
beforeAll(async () => {
await fs.writeFile(androidBundlePath, 'I am a js bundle');
await fs.writeFile(assetPath, 'I am pretending to be a jpeg');
});
afterAll(async () => {
await fs.remove(androidBundlePath);
await fs.remove(assetPath);
});
it('returns the correct value', async () => {
await expect(
@@ -206,17 +230,16 @@ describe(buildUnsortedUpdateInfoGroupAsync, () => {
});
});
describe(resolveInputDirectory, () => {
it('returns the correct distRoot path', () => {
describe(resolveInputDirectoryAsync, () => {
it('returns the correct distRoot path', async () => {
const customDirectoryName = path.resolve(uuidv4());
fs.mkdirSync(customDirectoryName, { recursive: true });
expect(resolveInputDirectory(customDirectoryName)).toBe(customDirectoryName);
await fs.mkdir(customDirectoryName, { recursive: true });
expect(await resolveInputDirectoryAsync(customDirectoryName)).toBe(customDirectoryName);
});
it('throws an error if the path does not exist', () => {
it('throws an error if the path does not exist', async () => {
const nonExistentPath = path.resolve(uuidv4());
expect(() => {
resolveInputDirectory(nonExistentPath);
}).toThrow(`The input directory "${nonExistentPath}" does not exist.
await expect(resolveInputDirectoryAsync(nonExistentPath)).rejects
.toThrow(`The input directory "${nonExistentPath}" does not exist.
You can allow us to build it for you by not setting the --skip-bundler flag.
If you chose to build it yourself you'll need to run a command to build the JS
bundle first.
@@ -224,8 +247,8 @@ describe(resolveInputDirectory, () => {
});
});
describe(collectAssets, () => {
it('builds an update info group', () => {
describe(collectAssetsAsync, () => {
it('builds an update info group', async () => {
const fakeHash = 'md5-hash-of-jpg';
const bundles = { android: 'android-bundle-code', ios: 'ios-bundle-code' };
const inputDir = uuidv4();
@@ -240,13 +263,13 @@ describe(collectAssets, () => {
const bundleDir = path.resolve(`${inputDir}/bundles`);
const assetDir = path.resolve(`${inputDir}/assets`);
fs.mkdirSync(bundleDir, { recursive: true });
fs.mkdirSync(assetDir, { recursive: true });
defaultPublishPlatforms.forEach(platform => {
fs.writeFileSync(path.resolve(inputDir, `bundles/${platform}.js`), bundles[platform]);
});
fs.writeFileSync(path.resolve(`${inputDir}/assets/${fakeHash}`), dummyFileBuffer);
fs.writeFileSync(
await fs.mkdir(bundleDir, { recursive: true });
await fs.mkdir(assetDir, { recursive: true });
for (const platform of defaultPublishPlatforms) {
await fs.writeFile(path.resolve(inputDir, `bundles/${platform}.js`), bundles[platform]);
}
await fs.writeFile(path.resolve(`${inputDir}/assets/${fakeHash}`), dummyFileBuffer);
await fs.writeFile(
path.resolve(inputDir, 'metadata.json'),
JSON.stringify({
version: 0,
@@ -264,7 +287,7 @@ describe(collectAssets, () => {
})
);
expect(collectAssets({ inputDir, platforms: defaultPublishPlatforms })).toEqual({
expect(await collectAssetsAsync({ inputDir, platforms: defaultPublishPlatforms })).toEqual({
android: {
launchAsset: {
fileExtension: '.bundle',
@@ -283,7 +306,7 @@ describe(collectAssets, () => {
},
});
expect(collectAssets({ inputDir, platforms: ['ios'] })).toEqual({
expect(await collectAssetsAsync({ inputDir, platforms: ['ios'] })).toEqual({
ios: {
launchAsset: {
fileExtension: '.bundle',
@@ -309,9 +332,7 @@ describe(filterOutAssetsThatAlreadyExistAsync, () => {
});
expect(
await (
await filterOutAssetsThatAlreadyExistAsync([{ storageKey: 'blah' } as any])
).length
(await filterOutAssetsThatAlreadyExistAsync([{ storageKey: 'blah' } as any])).length
).toBe(1);
});
it('ignores an asset that exists', async () => {
@@ -325,9 +346,7 @@ describe(filterOutAssetsThatAlreadyExistAsync, () => {
];
});
expect(
await (
await filterOutAssetsThatAlreadyExistAsync([{ storageKey: 'blah' } as any])
).length
(await filterOutAssetsThatAlreadyExistAsync([{ storageKey: 'blah' } as any])).length
).toBe(0);
});
});
@@ -350,10 +369,20 @@ describe(uploadAssetsAsync, () => {
const iosBundlePath = uuidv4();
const dummyFilePath = uuidv4();
const userDefinedPath = uuidv4();
fs.writeFileSync(androidBundlePath, publishBundles.android.code);
fs.writeFileSync(iosBundlePath, publishBundles.ios.code);
fs.writeFileSync(dummyFilePath, dummyFileBuffer);
fs.writeFileSync(userDefinedPath, 'I am an octet stream');
beforeAll(async () => {
await fs.writeFile(androidBundlePath, publishBundles.android.code);
await fs.writeFile(iosBundlePath, publishBundles.ios.code);
await fs.writeFile(dummyFilePath, dummyFileBuffer);
await fs.writeFile(userDefinedPath, 'I am an octet stream');
});
afterAll(async () => {
await fs.remove(androidBundlePath);
await fs.remove(iosBundlePath);
await fs.remove(dummyFilePath);
await fs.remove(userDefinedPath);
});
const userDefinedAsset = {
type: 'bundle',
@@ -14,11 +14,12 @@ jest.mock('fs');
jest.mock('../../../prompts');
jest.mock('../../../user/actions', () => ({ ensureLoggedInAsync: jest.fn(() => mockJester) }));
beforeEach(() => {
beforeEach(async () => {
vol.reset();
// do not remove the following line
// this fixes a weird error with tempy in @expo/image-utils
fs.mkdirpSync(os.tmpdir());
await fs.mkdirp(os.tmpdir());
asMock(promptAsync).mockReset();
});
@@ -145,7 +146,8 @@ describe(ensureApplicationIdIsDefinedForManagedProjectAsync, () => {
await expect(
ensureApplicationIdIsDefinedForManagedProjectAsync('/app', {} as any)
).resolves.toBe('com.expo.notdominik');
expect(JSON.parse(fs.readFileSync('/app/app.json', 'utf-8'))).toMatchObject({
const appJson = JSON.parse(await fs.readFile('/app/app.json', 'utf-8'));
expect(appJson).toMatchObject({
expo: { android: { package: 'com.expo.notdominik' } },
});
});
@@ -11,11 +11,11 @@ jest.mock('fs');
jest.mock('../../../prompts');
jest.mock('../../../user/actions', () => ({ ensureLoggedInAsync: jest.fn(() => mockJester) }));
beforeEach(() => {
beforeEach(async () => {
vol.reset();
// do not remove the following line
// this fixes a weird error with tempy in @expo/image-utils
fs.mkdirpSync(os.tmpdir());
await fs.mkdirp(os.tmpdir());
asMock(promptAsync).mockReset();
});
@@ -10,14 +10,14 @@ const fsReal = jest.requireActual('fs') as typeof fs;
jest.mock('fs');
describe(getAppBuildGradleAsync, () => {
afterEach(async () => {
afterEach(() => {
vol.reset();
});
test('parsing build.gradle from managed template', async () => {
vol.fromJSON(
{
'android/app/build.gradle': fsReal.readFileSync(
'android/app/build.gradle': await fsReal.promises.readFile(
path.join(__dirname, 'fixtures/build.gradle'),
'utf-8'
),
@@ -41,7 +41,7 @@ describe(getAppBuildGradleAsync, () => {
test('parsing multiflavor build.gradle', async () => {
vol.fromJSON(
{
'android/app/build.gradle': fsReal.readFileSync(
'android/app/build.gradle': await fsReal.promises.readFile(
path.join(__dirname, 'fixtures/multiflavor-build.gradle'),
'utf-8'
),
@@ -75,7 +75,7 @@ describe(getAppBuildGradleAsync, () => {
test('parsing build.gradle with flavor dimensions', async () => {
vol.fromJSON(
{
'android/app/build.gradle': fsReal.readFileSync(
'android/app/build.gradle': await fsReal.promises.readFile(
path.join(__dirname, 'fixtures/multiflavor-with-dimensions-build.gradle'),
'utf-8'
),
@@ -57,10 +57,10 @@ export async function getApplicationIdAsync(
try {
buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
} catch {}
if (!buildGradlePath || !fs.pathExistsSync(buildGradlePath)) {
if (!buildGradlePath || !(await fs.pathExists(buildGradlePath))) {
throw new Error(errorMessage);
}
const buildGradle = fs.readFileSync(buildGradlePath, 'utf8');
const buildGradle = await fs.readFile(buildGradlePath, 'utf8');
const matchResult = buildGradle.match(/applicationId ['"](.*)['"]/);
const applicationId = nullthrows(matchResult?.[1], errorMessage);
@@ -16,23 +16,24 @@ jest.mock('fs');
jest.mock('../../../prompts');
jest.mock('../../../user/actions', () => ({ ensureLoggedInAsync: jest.fn(() => mockJester) }));
beforeEach(() => {
beforeEach(async () => {
vol.reset();
// do not remove the following line
// this fixes a weird error with tempy in @expo/image-utils
fs.mkdirpSync(os.tmpdir());
await fs.mkdirp(os.tmpdir());
asMock(promptAsync).mockReset();
});
const originalFs = jest.requireActual('fs');
const originalFs = jest.requireActual('fs') as typeof fs;
describe(getBundleIdentifierAsync, () => {
describe('generic projects', () => {
it('reads bundle identifier from project.', async () => {
vol.fromJSON(
{
'ios/myproject.xcodeproj/project.pbxproj': originalFs.readFileSync(
'ios/myproject.xcodeproj/project.pbxproj': await originalFs.promises.readFile(
path.join(__dirname, './fixtures/pbxproj/project.pbxproj'),
'utf-8'
),
@@ -47,7 +48,7 @@ describe(getBundleIdentifierAsync, () => {
it('throws an error if the pbxproj is not configured with bundle id', async () => {
vol.fromJSON(
{
'ios/myproject.xcodeproj/project.pbxproj': originalFs.readFileSync(
'ios/myproject.xcodeproj/project.pbxproj': await originalFs.promises.readFile(
path.join(__dirname, './fixtures/pbxproj/project-without-bundleid.pbxproj'),
'utf-8'
),
@@ -128,7 +129,8 @@ describe(ensureBundleIdentifierIsDefinedForManagedProjectAsync, () => {
await expect(
ensureBundleIdentifierIsDefinedForManagedProjectAsync('/app', {} as any)
).resolves.toBe('com.expo.notdominik');
expect(JSON.parse(fs.readFileSync('/app/app.json', 'utf-8'))).toMatchObject({
const appJson = JSON.parse(await fs.readFile('/app/app.json', 'utf-8'));
expect(appJson).toMatchObject({
expo: { ios: { bundleIdentifier: 'com.expo.notdominik' } },
});
});
@@ -9,11 +9,12 @@ import { selectSchemeAsync } from '../scheme';
jest.mock('fs');
jest.mock('../../../prompts');
beforeEach(() => {
beforeEach(async () => {
vol.reset();
// do not remove the following line
// this fixes a weird error with tempy in @expo/image-utils
fs.mkdirpSync(os.tmpdir());
await fs.mkdirp(os.tmpdir());
asMock(promptAsync).mockReset();
});
+6 -6
View File
@@ -1,7 +1,7 @@
import { ExpoConfig, Platform } from '@expo/config';
import JsonFile from '@expo/json-file';
import crypto from 'crypto';
import fs from 'fs';
import fs from 'fs-extra';
import Joi from 'joi';
import mime from 'mime';
import path from 'path';
@@ -161,9 +161,9 @@ export async function buildBundlesAsync({
await expoCommandAsync(projectDir, ['export', '--output-dir', inputDir, '--experimental-bundle']);
}
export function resolveInputDirectory(customInputDirectory: string): string {
export async function resolveInputDirectoryAsync(customInputDirectory: string): Promise<string> {
const distRoot = path.resolve(customInputDirectory);
if (!fs.existsSync(distRoot)) {
if (!(await fs.pathExists(distRoot))) {
throw new Error(`The input directory "${customInputDirectory}" does not exist.
You can allow us to build it for you by not setting the --skip-bundler flag.
If you chose to build it yourself you'll need to run a command to build the JS
@@ -190,14 +190,14 @@ export function loadMetadata(distRoot: string): Metadata {
return metadata;
}
export function collectAssets({
export async function collectAssetsAsync({
inputDir,
platforms,
}: {
inputDir: string;
platforms: PublishPlatform[];
}): CollectedAssets {
const distRoot = resolveInputDirectory(inputDir);
}): Promise<CollectedAssets> {
const distRoot = await resolveInputDirectoryAsync(inputDir);
const metadata = loadMetadata(distRoot);
const assetsFinal: CollectedAssets = {};
@@ -14,7 +14,7 @@ import {
import { SubmissionMutation } from '../../../graphql/mutations/SubmissionMutation';
import { createTestProject } from '../../../project/__tests__/project-utils';
import { getProjectIdAsync } from '../../../project/projectUtils';
import { createSubmissionContext } from '../../context';
import { createSubmissionContextAsync } from '../../context';
import { getLatestBuildForSubmissionAsync } from '../../utils/builds';
import AndroidSubmitCommand from '../AndroidSubmitCommand';
@@ -77,7 +77,7 @@ describe(AndroidSubmitCommand, () => {
it("throws error if didn't provide serviceAccountKeyPath in the submit profile", async () => {
const projectId = uuidv4();
const ctx = createSubmissionContext({
const ctx = await createSubmissionContextAsync({
platform: Platform.ANDROID,
projectDir: testProject.projectRoot,
projectId,
@@ -100,7 +100,7 @@ describe(AndroidSubmitCommand, () => {
it('sends a request to Submission Service', async () => {
const projectId = uuidv4();
const ctx = createSubmissionContext({
const ctx = await createSubmissionContextAsync({
platform: Platform.ANDROID,
projectDir: testProject.projectRoot,
projectId,
@@ -135,7 +135,7 @@ describe(AndroidSubmitCommand, () => {
const projectId = uuidv4();
asMock(getLatestBuildForSubmissionAsync).mockResolvedValueOnce(fakeBuildFragment);
const ctx = createSubmissionContext({
const ctx = await createSubmissionContextAsync({
platform: Platform.ANDROID,
projectDir: testProject.projectRoot,
projectId,
+18 -8
View File
@@ -2,16 +2,19 @@ import { ExpoConfig } from '@expo/config';
import { Platform } from '@expo/eas-build-job';
import { SubmitProfile } from '@expo/eas-json';
import { CredentialsContext } from '../credentials/context';
import { getExpoConfig } from '../project/expoConfig';
import { ensureLoggedInAsync } from '../user/actions';
export interface SubmissionContext<T extends Platform> {
archiveFlags: SubmitArchiveFlags;
credentialsCtx: CredentialsContext;
exp: ExpoConfig;
nonInteractive: boolean;
platform: T;
profile: SubmitProfile<T>;
projectDir: string;
projectId: string;
nonInteractive: boolean;
exp: ExpoConfig;
}
export interface SubmitArchiveFlags {
@@ -21,20 +24,27 @@ export interface SubmitArchiveFlags {
url?: string;
}
export function createSubmissionContext<T extends Platform>(params: {
platform: T;
export async function createSubmissionContextAsync<T extends Platform>(params: {
archiveFlags: SubmitArchiveFlags;
credentialsCtx?: CredentialsContext;
env?: Record<string, string>;
nonInteractive: boolean;
platform: T;
profile: SubmitProfile<T>;
projectDir: string;
projectId: string;
nonInteractive: boolean;
env?: Record<string, string>;
}): SubmissionContext<T> {
const { projectDir } = params;
}): Promise<SubmissionContext<T>> {
const { projectDir, nonInteractive } = params;
const exp = getExpoConfig(projectDir, { env: params.env });
const { env, ...rest } = params;
let credentialsCtx: CredentialsContext | undefined = params.credentialsCtx;
if (!credentialsCtx) {
const user = await ensureLoggedInAsync();
credentialsCtx = new CredentialsContext({ projectDir, user, exp, nonInteractive });
}
return {
...rest,
credentialsCtx,
exp,
};
}
Loaded 100 of 106 files, more files were not shown because too many files have changed in this diff. Show more