shipthis 0.1.34 → 0.1.36

package/dist/{index-Bz1qt_8T.js → index-DCN43FhY.js}

@@ -12,18 +12,17 @@ import 'readline-sync';
 import 'luxon';
 import 'axios';
 import 'isomorphic-git';
-import { Q as getGoogleStatus, a5 as getShortAuthRequiredUrl, a6 as getGoogleAuthUrl, W as WEB_URL } from './index-CO_ssVFA.js';
+import { av as getShortAuthRequiredUrl, ax as getGoogleAuthUrl, R as GameContext, at as useSafeInput, W as WEB_URL, au as Markdown } from './index-BtPf4vzY.js';
 import '@oclif/core';
-import { useQuery } from '@tanstack/react-query';
+import '@tanstack/react-query';
 import 'crypto-js';
 import 'uuid';
 import 'fast-glob';
 import 'yazl';
 import 'socket.io-client';
-import { c as cacheKeys } from './useAndroidServiceAccountTestResult-DueKynFy.js';
-import { u as useWebSocket } from './useWebSocket-CIxkPaYi.js';
+import { u as useGoogleStatus } from './useGoogleStatus-D9jjGa--.js';
+import { u as useWebSocket } from './useWebSocket-CIeyHqxG.js';
 import 'fullscreen-ink';
-import { G as GameContext, e as useSafeInput, M as Markdown } from './index-CA6-uLMn.js';
 import 'string-length';
 import 'strip-ansi';
 import '@inkjs/ui';
@@ -31,11 +30,6 @@ import 'marked';
 import 'marked-terminal';
 import qrcode from 'qrcode';
 
-const useGoogleStatus = () => useQuery({
-  queryFn: getGoogleStatus,
-  queryKey: cacheKeys.googleStatus()
-});
-
 function useGoogleStatusWatching({
   isWatching,
   onGoogleStatusUpdate,
@@ -134,7 +128,7 @@ const ConnectForGame = ({ gameId, helpPage, onComplete, onError, ...boxProps })
   };
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", gap: 1, ...boxProps, children: [
     !showQRCode && /* @__PURE__ */ jsxs(Box, { flexDirection: "column", gap: 1, children: [
-      /* @__PURE__ */ jsx(Markdown, { filename: "privacy-notification.md", templateVars }),
+      /* @__PURE__ */ jsx(Markdown, { filename: "privacy-notification.md.ejs", templateVars }),
       connectUrl && /* @__PURE__ */ jsx(Text, { bold: true, color: "#4CE64C", children: `Press B to open ${connectUrl} in your browser and connect your Google account to ShipThis` }),
       /* @__PURE__ */ jsx(Text, { bold: true, color: "#4CE64C", children: "Press Q to show a QR-code to connect using your mobile phone" })
     ] }),

package/dist/{index-BBLtvl1Y.js → index-DwATmUTQ.js}

@@ -8,30 +8,27 @@ import 'node:path';
 import 'node:readline';
 import 'node:url';
 import 'readline-sync';
-import 'luxon';
+import { a1 as cacheKeys, t as getAuthedHeaders, s as API_URL, aw as castObjectDates, Y as queryClient, a5 as revokePolicy, a4 as enforcePolicy, P as Platform, C as CredentialsType, a2 as getGoogleStatus, R as GameContext, at as useSafeInput, au as Markdown, c as getShortDate } from './index-BtPf4vzY.js';
 import axios from 'axios';
 import 'isomorphic-git';
-import { p as getAuthedHeaders, o as API_URL, a4 as castObjectDates, P as Platform, C as CredentialsType, Q as getGoogleStatus } from './index-CO_ssVFA.js';
 import '@oclif/core';
-import { useQuery, useQueryClient } from '@tanstack/react-query';
-import { c as cacheKeys } from './useAndroidServiceAccountTestResult-DueKynFy.js';
+import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
+import 'luxon';
 import 'fast-glob';
 import 'uuid';
 import 'yazl';
 import 'socket.io-client';
 import 'fullscreen-ink';
-import { u as useWebSocket } from './useWebSocket-CIxkPaYi.js';
-import { u as useProjectCredentials } from './useProjectCredentials-jQYGcDhT.js';
+import { u as useWebSocket } from './useWebSocket-CIeyHqxG.js';
+import { u as useProjectCredentials } from './useProjectCredentials-BjsS28hP.js';
+import { u as useGoogleStatus } from './useGoogleStatus-D9jjGa--.js';
 import 'crypto-js';
 import 'string-length';
 import 'strip-ansi';
 import 'open';
 import '@inkjs/ui';
-import 'marked';
-import 'marked-terminal';
 import { P as ProgressSpinner } from './ProgressSpinner-Um6ARKlk.js';
 import 'qrcode';
-import { G as GameContext } from './index-CA6-uLMn.js';
 
 async function fetchStatus({ projectId }) {
   try {
@@ -53,6 +50,20 @@ const useAndroidServiceAccountSetupStatus = (props) => useQuery({
   staleTime: 1e3 * 5
 });
 
+const useUpdateGoogleOrgPolicy = () => useMutation({
+  async mutationFn(props) {
+    if (props.action === "revoke") {
+      return await revokePolicy();
+    }
+    return await enforcePolicy();
+  },
+  async onSuccess(data) {
+    queryClient.invalidateQueries({
+      queryKey: cacheKeys.googleStatus()
+    });
+  }
+});
+
 const ERR_NOT_AUTHENTICATED = "You must be connected to Google to create a Service Account Key";
 const useHasServiceAccountKey = (projectId) => {
   const { data, isSuccess } = useProjectCredentials({ platform: Platform.ANDROID, projectId });
@@ -116,20 +127,50 @@ const CreateServiceAccountKey = (props) => {
 };
 const CreateForGame = ({ gameId, onComplete, onError, ...boxProps }) => {
   const [didStart, setDidStart] = useState(false);
+  const startedRef = useRef(false);
+  const { data: googleStatus } = useGoogleStatus();
+  const updatePolicyMutation = useUpdateGoogleOrgPolicy();
   const { handleStart, isCreating, setupStatus } = useAndroidServiceAccount({
     onComplete,
     onError,
     projectId: gameId
   });
   useEffect(() => {
-    handleStart().then(() => setDidStart(true));
-  }, [gameId]);
+    if (startedRef.current) return;
+    if (!googleStatus) return;
+    if (!googleStatus.needsPolicyChange) {
+      startedRef.current = true;
+      handleStart().then(() => setDidStart(true)).catch((error) => onError(error));
+    }
+  }, [googleStatus]);
+  useSafeInput((input) => {
+    if (input === "p" && googleStatus?.needsPolicyChange && !updatePolicyMutation.isPending) {
+      updatePolicyMutation.mutate({ action: "revoke" });
+    }
+  });
+  const needsPolicy = Boolean(googleStatus?.needsPolicyChange);
+  const policyChanging = updatePolicyMutation.isPending || updatePolicyMutation.isSuccess && needsPolicy;
+  const Header = () => /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, children: [
+    /* @__PURE__ */ jsx(Text, { children: "Creating a Service Account and API Key..." }),
+    isCreating && /* @__PURE__ */ jsx(Spinner, { type: "dots" })
+  ] });
   return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs(Box, { flexDirection: "column", gap: 1, ...boxProps, children: [
-    /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, children: [
-      /* @__PURE__ */ jsx(Text, { children: "Creating a Service Account and API Key..." }),
-      isCreating && /* @__PURE__ */ jsx(Spinner, { type: "dots" })
-    ] }),
-    didStart && /* @__PURE__ */ jsx(ProgressSpinner, { progress: (setupStatus?.progress || 0) * 100, spinnerType: "dots" })
+    needsPolicy ? policyChanging ? /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, children: [
+      /* @__PURE__ */ jsx(Text, { children: "Updating organization policy..." }),
+      /* @__PURE__ */ jsx(Spinner, { type: "dots" })
+    ] }) : googleStatus && /* @__PURE__ */ jsx(
+      Markdown,
+      {
+        filename: "service-account-policy-wizard.md.ejs",
+        templateVars: {
+          needsPolicyChange: Boolean(googleStatus.needsPolicyChange),
+          orgCreatedAt: googleStatus.orgCreatedAt ? getShortDate(googleStatus.orgCreatedAt) : "Unknown",
+          orgName: `${googleStatus.orgName}`,
+          orgResourceName: `${googleStatus.orgResourceName}`
+        }
+      }
+    ) : /* @__PURE__ */ jsx(Header, {}),
+    didStart && /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(ProgressSpinner, { progress: (setupStatus?.progress || 0) * 100, spinnerType: "dots" }) })
   ] }) });
 };
 

package/dist/{upload-BIsFZzBO.js → upload-Dm38PqhN.js}

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { o as API_URL, p as getAuthedHeaders } from './index-CO_ssVFA.js';
+import { s as API_URL, t as getAuthedHeaders } from './index-BtPf4vzY.js';
 
 async function getNewUploadTicket(projectId = null) {
   const url = projectId ? `${API_URL}/projects/${projectId}/credentials/url` : `${API_URL}/credentials/url`;

package/dist/{useAppleApp-BZR94exU.js → useAppleApp-BKPntZPm.js}

@@ -1,5 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
-import { f as App } from './index-CO_ssVFA.js';
+import { j as App } from './index-BtPf4vzY.js';
 
 const queryAppleApp = async ({ ctx, iosBundleId }) => {
   if (!iosBundleId) {

package/dist/{useAppleBundleId-Dg5DsItN.js → useAppleBundleId-DvQKEEy4.js}

@@ -1,5 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
-import { e as BundleId, q as getGodotProjectCapabilities, P as Platform, G as GODOT_CAPABILITIES, r as CapabilityType } from './index-CO_ssVFA.js';
+import { i as BundleId, u as getGodotProjectCapabilities, P as Platform, G as GODOT_CAPABILITIES, v as CapabilityType } from './index-BtPf4vzY.js';
 
 async function getBundleIdCapabilities(bundleId) {
   const current = await bundleId.getBundleIdCapabilitiesAsync();

package/dist/useGoogleStatus-D9jjGa--.js

@@ -0,0 +1,9 @@
+import { useQuery } from '@tanstack/react-query';
+import { a1 as cacheKeys, a2 as getGoogleStatus } from './index-BtPf4vzY.js';
+
+const useGoogleStatus = () => useQuery({
+  queryFn: getGoogleStatus,
+  queryKey: cacheKeys.googleStatus()
+});
+
+export { useGoogleStatus as u };

package/dist/{useProjectCredentials-jQYGcDhT.js → useProjectCredentials-BjsS28hP.js}

@@ -1,8 +1,6 @@
 import { useQuery } from '@tanstack/react-query';
 import axios from 'axios';
-import { b as getShortDate, p as getAuthedHeaders, o as API_URL, I as castArrayObjectDates } from './index-CO_ssVFA.js';
-import { c as cacheKeys } from './useAndroidServiceAccountTestResult-DueKynFy.js';
-import { g as getShortUUID } from './index-CYjZ26If.js';
+import { a1 as cacheKeys, b as getShortUUID, c as getShortDate, t as getAuthedHeaders, s as API_URL, X as castArrayObjectDates } from './index-BtPf4vzY.js';
 
 async function queryProjectCredentials({
   projectId,
@@ -22,13 +20,14 @@ async function queryProjectCredentials({
   }
 }
 function getProjectCredentialSummary(credential) {
-  return {
-    createdAt: getShortDate(credential.createdAt),
-    id: getShortUUID(credential.id),
-    isActive: credential.isActive,
-    serial: credential.serialNumber.slice(0, 30) + (credential.serialNumber.length > 30 ? "\u2026" : ""),
-    type: credential.type
-  };
+  const trimLength = 25;
+  const summary = {};
+  summary.id = getShortUUID(credential.id);
+  summary.type = credential.type;
+  summary.serial = credential.serialNumber.slice(0, trimLength) + (credential.serialNumber.length > trimLength ? "\u2026" : "");
+  summary.isActive = credential.isActive;
+  summary.createdAt = getShortDate(credential.createdAt);
+  return summary;
 }
 const useProjectCredentials = ({
   platform,
@@ -42,7 +41,9 @@ const useProjectCredentials = ({
       if (!(platform || type)) return data;
       return {
         ...data,
-        data: data.data.filter((credential) => (!platform || credential.platform === platform) && (!type || credential.type === type))
+        data: data.data.filter(
+          (credential) => (!platform || credential.platform === platform) && (!type || credential.type === type)
+        )
       };
     }
   });

package/dist/{useWebSocket-CIxkPaYi.js → useWebSocket-CIeyHqxG.js}

@@ -1,6 +1,6 @@
 import { useEffect } from 'react';
 import { io } from 'socket.io-client';
-import { N as WS_URL, O as getAuthToken } from './index-CO_ssVFA.js';
+import { $ as WS_URL, a0 as getAuthToken } from './index-BtPf4vzY.js';
 
 function useWebSocket(listeners = []) {
   const log = () => {

package/docs/README.md

@@ -1,6 +1,6 @@
 # ShipThis CLI Reference
 
-**ShipThis** is a **command-line tool** which manages releasing your [Godot](https://godotengine.org/) games to the **iOS App Store**.
+**ShipThis** is a **command-line tool** which manages releasing your [Godot](https://godotengine.org/) games to the **iOS App Store** and **Google Play**.
 
 :::tip New to ShipThis?
 Begin with our [Quickstart Guide](https://shipth.is/docs/guides/quick-start).
@@ -8,8 +8,9 @@ Begin with our [Quickstart Guide](https://shipth.is/docs/guides/quick-start).
 
 ## Topics
 
+- [apiKey](https://shipth.is/docs/reference/apiKey) - Commands that relate to ShipThis API keys
 - [apple](https://shipth.is/docs/reference/apple) - Commands that relate to linking your ShipThis account with your Apple Developer Account
-- [game](https://shipth.is/docs/reference/game) - Commands that relate to configuring the specific game in the current working directory.
+- [game](https://shipth.is/docs/reference/game) - Commands that relate to configuring the specific game in the current working directory
 
 ## Commands
 

package/docs/apiKey.md

@@ -1,10 +1,20 @@
 # Topic: `apiKey`
 
-Commands related to ShipThis API Keys
+## Description
 
+Commands in the **apiKey** topic are prefixed with `shipthis apiKey`. These commands let you create new keys, list existing ones, and revoke keys you no longer need.
 
-## Commands
+:::info
+ShipThis API keys are securely generated, random tokens used to authenticate requests to the ShipThis API. They are intended for automated environments, like CI pipelines, where manual login is not practical.  
+The raw key is only shown once when created, so make sure to copy and store it securely.
+:::
+
+
+## Example
 
+[![asciicast](https://asciinema.org/a/bfCPQIvDNt5zlgcEQhcs7o6Fr.svg)](https://asciinema.org/a/bfCPQIvDNt5zlgcEQhcs7o6Fr#shipthis-col80row24)
+
+## Commands
 
 ### `apiKey create`
 

package/docs/game/android/apiKey/policy.md

@@ -0,0 +1,28 @@
+# Command: `game android apiKey policy`
+
+## Description
+
+Gets and sets the iam.disableServiceAccountKeyCreation policy for your Google Organization
+
+## Help Output
+
+```help
+USAGE
+  $ shipthis game android apiKey policy [-g <value>] [-e | -r] [-w]
+
+FLAGS
+  -e, --enforce         Enforces the policy
+  -g, --gameId=<value>  The ID of the game
+  -r, --revoke          Revokes the policy
+  -w, --waitForAuth     Wait for Google Authentication (10 mins).
+
+DESCRIPTION
+  Gets and sets the iam.disableServiceAccountKeyCreation policy for your Google Organization
+
+EXAMPLES
+  $ shipthis game android apiKey policy
+
+  $ shipthis game android apiKey policy --enforce
+
+  $ shipthis game android apiKey policy --revoke
+```

package/docs/game/android/keyStore.md

@@ -1,10 +1,20 @@
 # Topic: `game android keyStore`
 
+## Description
+
 Commands related to the Android KeyStore for a specific game
 
+:::info
+An Android **keystore** is a secure file where you keep the private key that signs your app. When you build and publish an APK or AAB, this key proves to Google Play (and your users) that the app really comes from you.  
 
-## Commands
+If you have already published your game on Google Play, you will need to [import](#game-android-keystore-import) the same keystore you used before.
+:::
+
+## Example
 
+[![asciicast](https://asciinema.org/a/S3R73FuaGMCwu2C0dHSC0BrJB.svg)](https://asciinema.org/a/S3R73FuaGMCwu2C0dHSC0BrJB#shipthis-col80row24)
+
+## Commands
 
 ### `game android keyStore create`
 
@@ -61,14 +71,14 @@ EXAMPLES
 
 #### Description
 
-Imports an Android Keystore to your ShipThis account for the specified game.
+Imports an Android Keystore to your ShipThis account for the specified game. You can import as JKS and password parameters or as a ZIP file.
 
 #### Help Output
 
 ```help
 USAGE
-  $ shipthis game android keyStore import [FILE] [-g <value>] [--jksFile <value>] [--keystorePassword <value>] [--keyPassword
-    <value>] [-f]
+  $ shipthis game android keyStore import [FILE] [-g <value>] [-f] [--jksFile <value>] [--keyPassword <value>] [--keystorePassword <value>]
+
 
 ARGUMENTS
   FILE  Path to the ZIP file to import (must be in the same format as the export)

package/docs/game/android/status.md

@@ -4,6 +4,10 @@
 
 Shows the status of the setup for the Android platform for a specific game.
 
+## Example
+
+[![asciicast](https://asciinema.org/a/SiTSwpQgQtPIcd56v8hYA7zo8.svg)](https://asciinema.org/a/SiTSwpQgQtPIcd56v8hYA7zo8#shipthis-col80row24)
+
 ## Help Output
 
 ```help