Add owner field support to expo start (#2329)

Fixes #2242.

packages/xdl/src/Project.ts

@@ -1991,34 +1991,14 @@ function getManifestHandler(projectRoot: string) {
       if (!currentSession || Config.offline) {
         manifest.id = `@${ANONYMOUS_USERNAME}/${manifest.slug}-${hostUUID}`;
       }
-      let manifestString = JSON.stringify(manifest);
+      let manifestString;
       if (req.headers['exponent-accept-signature']) {
-        if (_cachedSignedManifest.manifestString === manifestString) {
-          manifestString = _cachedSignedManifest.signedManifest;
-        } else {
-          if (!currentSession || Config.offline) {
-            const unsignedManifest = {
-              manifestString,
-              signature: 'UNSIGNED',
-            };
-            _cachedSignedManifest.manifestString = manifestString;
-            manifestString = JSON.stringify(unsignedManifest);
-            _cachedSignedManifest.signedManifest = manifestString;
-          } else {
-            let publishInfo = await Exp.getPublishInfoAsync(projectRoot);
-            const user = await UserManager.ensureLoggedInAsync();
-
-            const api = ApiV2.clientForUser(user);
-            const signedManifest = await api.postAsync('manifest/sign', {
-              args: publishInfo.args,
-              manifest,
-            });
-
-            _cachedSignedManifest.manifestString = manifestString;
-            _cachedSignedManifest.signedManifest = signedManifest.response;
-            manifestString = signedManifest.response;
-          }
-        }
+        manifestString =
+          !currentSession || Config.offline
+            ? getUnsignedManifestString(manifest)
+            : await getSignedManifestStringAsync(manifest, currentSession);
+      } else {
+        manifestString = JSON.stringify(manifest);
       }
       const hostInfo = {
         host: hostUUID,
@@ -2047,6 +2027,34 @@ function getManifestHandler(projectRoot: string) {
   };
 }
 
+export async function getSignedManifestStringAsync(
+  manifest: ExpoConfig,
+  currentSession: { sessionSecret: string }
+) {
+  const manifestString = JSON.stringify(manifest);
+  if (_cachedSignedManifest.manifestString === manifestString) {
+    return _cachedSignedManifest.signedManifest;
+  }
+  const { response } = await ApiV2.clientForUser(currentSession).postAsync('manifest/sign', {
+    args: {
+      remoteUsername: manifest.owner ?? (await UserManager.getCurrentUsernameAsync()),
+      remotePackageName: manifest.slug,
+    },
+    manifest,
+  });
+  _cachedSignedManifest.manifestString = manifestString;
+  _cachedSignedManifest.signedManifest = response;
+  return response;
+}
+
+export function getUnsignedManifestString(manifest: ExpoConfig) {
+  const unsignedManifest = {
+    manifestString: JSON.stringify(manifest),
+    signature: 'UNSIGNED',
+  };
+  return JSON.stringify(unsignedManifest);
+}
+
 export async function startExpoServerAsync(projectRoot: string): Promise<void> {
   _assertValidProjectRoot(projectRoot);
   await stopExpoServerAsync(projectRoot);

packages/xdl/src/__tests__/Project-test.ts

@@ -0,0 +1,68 @@
+import { ExpoConfig } from '@expo/config';
+import axios from 'axios';
+
+import { getSignedManifestStringAsync, getUnsignedManifestString } from '../Project';
+
+jest.mock('axios');
+
+const mockManifest: ExpoConfig = {
+  name: 'Hello',
+  slug: 'hello-world',
+  owner: 'ownername',
+  version: '1.0.0',
+  platforms: ['ios'],
+};
+
+const mockSignedManifestResponse = JSON.stringify({
+  manifestString: JSON.stringify(mockManifest),
+  signature: 'SIGNATURE_HERE',
+  version: '1.0.0',
+});
+
+describe('getSignedManifestStringAsync', () => {
+  it('calls the server API to sign a manifest', async () => {
+    const requestFunction = axios.request as jest.MockedFunction<typeof axios.request>;
+    requestFunction.mockReturnValueOnce(
+      Promise.resolve({
+        status: 200,
+        data: { data: { response: mockSignedManifestResponse } },
+      })
+    );
+    const manifestString = await getSignedManifestStringAsync(mockManifest, {
+      sessionSecret: 'SECRET',
+    });
+    expect(manifestString).toBe(mockSignedManifestResponse);
+    expect(requestFunction.mock.calls[0][0]).toMatchInlineSnapshot(`
+      Object {
+        "data": Object {
+          "args": Object {
+            "remotePackageName": "hello-world",
+            "remoteUsername": "ownername",
+          },
+          "manifest": Object {
+            "name": "Hello",
+            "owner": "ownername",
+            "platforms": Array [
+              "ios",
+            ],
+            "slug": "hello-world",
+            "version": "1.0.0",
+          },
+        },
+        "headers": Object {
+          "Expo-Session": "SECRET",
+          "Exponent-Client": "xdl",
+        },
+        "maxContentLength": 104857600,
+        "method": "post",
+        "url": "https://exp.host/--/api/v2/manifest/sign",
+      }
+    `);
+  });
+});
+
+describe('getUnsignedManifestString', () => {
+  it('returns a stringified manifest with the same shape a server-signed manifest', () => {
+    expect(getUnsignedManifestString(mockManifest)).toMatchSnapshot();
+  });
+});

packages/xdl/src/__tests__/__snapshots__/Project-test.ts.snap

@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`getUnsignedManifestString returns a stringified manifest with the same shape a server-signed manifest 1`] = `"{\\"manifestString\\":\\"{\\\\\\"name\\\\\\":\\\\\\"Hello\\\\\\",\\\\\\"slug\\\\\\":\\\\\\"hello-world\\\\\\",\\\\\\"owner\\\\\\":\\\\\\"ownername\\\\\\",\\\\\\"version\\\\\\":\\\\\\"1.0.0\\\\\\",\\\\\\"platforms\\\\\\":[\\\\\\"ios\\\\\\"]}\\",\\"signature\\":\\"UNSIGNED\\"}"`;