@canva/cli 0.0.1-beta.3 → 0.0.1-beta.31

package/templates/gen_ai/scripts/start/tests/start.tests.ts

@@ -0,0 +1,61 @@
+/* eslint-disable no-console */
+
+import type { ChildProcess } from "child_process";
+import { spawn } from "child_process";
+import * as treeKill from "tree-kill";
+
+describe("start script", () => {
+  let serverProcess: ChildProcess;
+
+  afterEach(() => {
+    if (serverProcess?.pid && !serverProcess.exitCode) {
+      treeKill(serverProcess.pid);
+    }
+  });
+
+  it("should execute 'npm run start' and start a dev server", async () => {
+    const testServerPort = 8089;
+    serverProcess = await spawn(
+      `npm run start -- -p ${testServerPort} --no-preview`,
+      {
+        shell: true,
+      },
+    );
+
+    if (!serverProcess.pid) {
+      throw new Error("Unable to start server");
+    }
+
+    // wait for the server to start and collect output until it reports the running URL
+    let output = "";
+    await new Promise<void>((resolve, reject) => {
+      serverProcess.stdout?.on("data", (data) => {
+        output += data.toString();
+        if (output.includes("Development URL")) {
+          resolve();
+        }
+      });
+
+      serverProcess.stderr?.on("data", (data) => {
+        console.error("Server process error: ", data.toString());
+        reject();
+      });
+
+      // timeout and fail test if the server hasn't correctly started in 10 seconds
+      setTimeout(() => {
+        if (serverProcess?.pid && !serverProcess.exitCode) {
+          treeKill(serverProcess.pid);
+        }
+        reject(new Error("Test timed out"));
+      }, 10000);
+    });
+
+    // check that the server is running and accessible
+    const expectedServerURL = `http://localhost:${testServerPort}`;
+    expect(output).toContain(expectedServerURL);
+    expect(serverProcess.exitCode).toBeNull();
+
+    // clean up
+    treeKill(serverProcess.pid);
+  }, 15000); // 15 seconds timeout to allow for the server to start
+});

package/templates/gen_ai/src/api/api.ts

@@ -1,4 +1,3 @@
-import type { Oauth } from "@canva/user";
 import { POLLING_INTERVAL_IN_SECONDS } from "src/config";
 
 /**
@@ -41,22 +40,12 @@ interface RemainingCreditsResult {
   credits: number;
 }
 
-/**
- * Represents the result of retrieving the logged in status of the user.
- */
-export type LoggedInState =
-  | "authenticated"
-  | "not_authenticated"
-  | "checking"
-  | "error";
-
 const endpoints = {
   queueImageGeneration: "/api/queue-image-generation",
   getImageGenerationJobStatus: "/api/job-status",
   cancelImageGenerationJob: "/api/job-status/cancel",
   getRemainingCredits: "/api/credits",
   purchaseCredits: "/api/purchase-credits",
-  getLoggedInStatus: "/api/authentication/status",
 };
 
 /**
@@ -66,21 +55,18 @@ const endpoints = {
  * @param {number} options.numberOfImages - The number of images to generate.
  * @returns {Promise<QueueImageGenerationResponse>} A promise that resolves to the created job ID.
  */
-export const queueImageGeneration = async (
-  {
-    prompt,
-    numberOfImages,
-  }: {
-    prompt: string;
-    numberOfImages: number;
-  },
-  oauth: Oauth,
-): Promise<QueueImageGenerationResponse> => {
+export const queueImageGeneration = async ({
+  prompt,
+  numberOfImages,
+}: {
+  prompt: string;
+  numberOfImages: number;
+}): Promise<QueueImageGenerationResponse> => {
   const url = new URL(endpoints.queueImageGeneration, BACKEND_HOST);
   url.searchParams.append("count", numberOfImages.toString());
   url.searchParams.append("prompt", prompt);
 
-  const result: QueueImageGenerationResponse = await sendRequest(url, oauth);
+  const result: QueueImageGenerationResponse = await sendRequest(url);
 
   return result;
 };
@@ -90,14 +76,11 @@ export const queueImageGeneration = async (
  * @param {string} jobId - The ID of the job to retrieve status for.
  * @returns {Promise<ImageGenerationResult>} A promise that resolves to the image generation result.
  */
-export const getImageGenerationJobStatus = async (
-  {
-    jobId,
-  }: {
-    jobId: string;
-  },
-  oauth: Oauth,
-): Promise<ImageGenerationResult> => {
+export const getImageGenerationJobStatus = async ({
+  jobId,
+}: {
+  jobId: string;
+}): Promise<ImageGenerationResult> => {
   const url = new URL(endpoints.getImageGenerationJobStatus, BACKEND_HOST);
   url.searchParams.append("jobId", jobId);
 
@@ -109,7 +92,6 @@ export const getImageGenerationJobStatus = async (
     try {
       const response = (await sendRequest(
         url,
-        oauth,
       )) as ImageGenerationJobStatusResponse;
       if (response.status === "completed") {
         return { images: response.images, credits: response.credits };
@@ -138,13 +120,12 @@ export const getImageGenerationJobStatus = async (
  */
 export const cancelImageGenerationJob = async (
   jobId: string,
-  oauth: Oauth,
 ): Promise<void> => {
   const url = new URL(endpoints.cancelImageGenerationJob, BACKEND_HOST);
   url.searchParams.append("jobId", jobId);
 
   try {
-    await sendRequest(url, oauth, {
+    await sendRequest(url, {
       method: "POST",
     });
   } catch {
@@ -156,26 +137,23 @@ export const cancelImageGenerationJob = async (
  * Retrieves the remaining credits.
  * @returns {Promise<RemainingCreditsResult>} - A promise that resolves to the remaining credits.
  */
-export const getRemainingCredits = async (
-  oauth: Oauth,
-): Promise<RemainingCreditsResult> => {
-  const url = new URL(endpoints.getRemainingCredits, BACKEND_HOST);
+export const getRemainingCredits =
+  async (): Promise<RemainingCreditsResult> => {
+    const url = new URL(endpoints.getRemainingCredits, BACKEND_HOST);
 
-  const result: RemainingCreditsResult = await sendRequest(url, oauth);
+    const result: RemainingCreditsResult = await sendRequest(url);
 
-  return result;
-};
+    return result;
+  };
 
 /**
  * Purchases credits for the user.
  * @returns {Promise<RemainingCreditsResult>} - A promise that resolves to the remaining credits after purchasing.
  */
-export const purchaseCredits = async (
-  oauth: Oauth,
-): Promise<RemainingCreditsResult> => {
+export const purchaseCredits = async (): Promise<RemainingCreditsResult> => {
   const url = new URL(endpoints.purchaseCredits, BACKEND_HOST);
 
-  const result: RemainingCreditsResult = await sendRequest(url, oauth, {
+  const result: RemainingCreditsResult = await sendRequest(url, {
     method: "POST",
   });
 
@@ -183,48 +161,15 @@ export const purchaseCredits = async (
 };
 
 /**
- * Send a request to an endpoint that checks if the user is authenticated.
- * This is example code, intended to convey the basic idea. When implementing this in your app, you might want more advanced checks.
- *
- * Note: You must register the provided endpoint via the Developer Portal.
- */
-export const checkAuthenticationStatus = async (
-  oauth: Oauth,
-): Promise<LoggedInState> => {
-  try {
-    const url = new URL(endpoints.getLoggedInStatus, BACKEND_HOST);
-    const result: { isAuthenticated: string } = await sendRequest(url, oauth, {
-      method: "POST",
-    });
-
-    if (result?.isAuthenticated) {
-      return "authenticated";
-    } else {
-      return "not_authenticated";
-    }
-  } catch (error) {
-    // eslint-disable-next-line no-console
-    console.error(error);
-    return "error";
-  }
-};
-
-/**
- * Sends a request to the specified URL with authorization headers.
+ * Sends a request to the specified URL.
  * @param {URL} url - The URL to send the request to.
  * @param {RequestInit} [options] - Optional fetch options to be passed to the fetch function.
  * @returns {Promise<Object>} - A promise that resolves to the response body.
  */
-const sendRequest = async <T>(
-  url: URL,
-  oauth: Oauth,
-  options?: RequestInit,
-): Promise<T> => {
-  const token = (await oauth.getAccessToken())?.token;
+const sendRequest = async <T>(url: URL, options?: RequestInit): Promise<T> => {
   const res = await fetch(url, {
     headers: {
       ...options?.headers,
-      Authorization: `Bearer ${token}`,
     },
     ...options,
   });

package/templates/gen_ai/src/app.tsx

@@ -1,13 +1,19 @@
-import { Outlet } from "react-router-dom";
-import { Rows } from "@canva/app-ui-kit";
-import { Footer } from "./components";
-import * as styles from "styles/components.css";
+import { createHashRouter, RouterProvider } from "react-router-dom";
+import { ContextProvider } from "./context";
+import { routes } from "./routes";
+import { AppI18nProvider } from "@canva/app-i18n-kit";
+import { AppUiProvider } from "@canva/app-ui-kit";
+import { ErrorBoundary } from "react-error-boundary";
+import { ErrorPage } from "./pages";
 
 export const App = () => (
-  <div className={styles.scrollContainer}>
-    <Rows spacing="3u">
-      <Outlet />
-      <Footer />
-    </Rows>
-  </div>
+  <AppI18nProvider>
+    <AppUiProvider>
+      <ErrorBoundary fallback={<ErrorPage />}>
+        <ContextProvider>
+          <RouterProvider router={createHashRouter(routes)} />
+        </ContextProvider>
+      </ErrorBoundary>
+    </AppUiProvider>
+  </AppI18nProvider>
 );

package/templates/gen_ai/src/components/footer.messages.ts

@@ -11,11 +11,6 @@ export const FooterMessages = defineMessages({
     defaultMessage: "Generate image",
     description: "A button label to generate an image from a prompt",
   },
-  signUpOrLogin: {
-    defaultMessage: "Sign up or log in to generate",
-    description:
-      "A button label to sign up or log in, before the user is able to generate an image",
-  },
   purchaseMoreCredits: {
     defaultMessage: "Purchase more credits",
     description:

package/templates/gen_ai/src/components/footer.tsx

@@ -1,11 +1,10 @@
 import { useNavigate, useLocation } from "react-router-dom";
 import { Rows, Button } from "@canva/app-ui-kit";
 import { queueImageGeneration, purchaseCredits } from "src/api";
-import { LoggedInStatus, RemainingCredits } from "src/components";
+import { RemainingCredits } from "src/components";
 import { NUMBER_OF_IMAGES_TO_GENERATE } from "src/config";
 import { useAppContext } from "src/context";
 import { Paths } from "src/routes";
-import { useAuth } from "src/services";
 import { getObsceneWords } from "src/utils";
 import { useIntl } from "react-intl";
 import { FooterMessages as Messages } from "./footer.messages";
@@ -13,10 +12,8 @@ import { FooterMessages as Messages } from "./footer.messages";
 export const Footer = () => {
   const navigate = useNavigate();
   const { pathname } = useLocation();
-  const { requestAuthentication } = useAuth();
   const isRootRoute = pathname === Paths.HOME;
   const {
-    loggedInState,
     setAppError,
     promptInput,
     setPromptInput,
@@ -27,7 +24,6 @@ export const Footer = () => {
     setIsLoadingImages,
     remainingCredits,
     setRemainingCredits,
-    oauth,
   } = useAppContext();
   const intl = useIntl();
 
@@ -75,13 +71,10 @@ export const Footer = () => {
 
     setIsLoadingImages(true);
     try {
-      const { jobId } = await queueImageGeneration(
-        {
-          prompt: promptInput,
-          numberOfImages: NUMBER_OF_IMAGES_TO_GENERATE,
-        },
-        oauth,
-      );
+      const { jobId } = await queueImageGeneration({
+        prompt: promptInput,
+        numberOfImages: NUMBER_OF_IMAGES_TO_GENERATE,
+      });
 
       setJobId(jobId);
     } catch {
@@ -90,12 +83,8 @@ export const Footer = () => {
     navigate(Paths.RESULTS);
   };
 
-  const onSignUpOrLogInClick = async () => {
-    await requestAuthentication();
-  };
-
   const onPurchaseMoreCredits = async () => {
-    const { credits } = await purchaseCredits(oauth);
+    const { credits } = await purchaseCredits();
 
     setRemainingCredits(credits);
   };
@@ -114,17 +103,11 @@ export const Footer = () => {
         : intl.formatMessage(Messages.generateAgain),
       visible: hasRemainingCredits,
     },
-    {
-      variant: "primary" as const,
-      onClick: onSignUpOrLogInClick,
-      value: intl.formatMessage(Messages.signUpOrLogin),
-      visible: loggedInState === "not_authenticated" && !hasRemainingCredits,
-    },
     {
       variant: "primary" as const,
       onClick: onPurchaseMoreCredits,
       value: intl.formatMessage(Messages.purchaseMoreCredits),
-      visible: loggedInState === "authenticated" && !hasRemainingCredits,
+      visible: !hasRemainingCredits,
     },
     {
       variant: "secondary" as const,
@@ -155,7 +138,6 @@ export const Footer = () => {
           ),
       )}
       <RemainingCredits />
-      <LoggedInStatus />
     </Rows>
   );
 };

package/templates/gen_ai/src/components/index.ts

@@ -2,7 +2,6 @@ export * from "./app_error";
 export * from "./footer";
 export * from "./image_grid";
 export * from "./loading_results";
-export * from "./logged_in_status";
 export * from "./prompt_input";
 export * from "./report_box";
 export * from "./remaining_credits";

package/templates/gen_ai/src/components/loading_results.tsx

@@ -70,7 +70,6 @@ export const LoadingResults = ({
     promptInput,
     setGeneratedImages,
     setRemainingCredits,
-    oauth,
   } = useAppContext();
 
   useEffect(() => {
@@ -83,12 +82,9 @@ export const LoadingResults = ({
     const pollJobStatus = async () => {
       if (jobId) {
         try {
-          const { images, credits } = await getImageGenerationJobStatus(
-            {
-              jobId,
-            },
-            oauth,
-          );
+          const { images, credits } = await getImageGenerationJobStatus({
+            jobId,
+          });
           setGeneratedImages(images);
           setRemainingCredits(credits);
           // Clear the jobId after fetching images
@@ -121,7 +117,7 @@ export const LoadingResults = ({
   ]);
 
   const onCancelClick = async () => {
-    await cancelImageGenerationJob(jobId, oauth);
+    await cancelImageGenerationJob(jobId);
     setIsLoadingImages(false);
     navigate(Paths.HOME);
   };

package/templates/gen_ai/src/components/tests/remaining_credit.tests.tsx

@@ -0,0 +1,43 @@
+/* eslint-disable formatjs/no-literal-string-in-jsx */
+import { TestAppUiProvider } from "@canva/app-ui-kit";
+import { TestAppI18nProvider } from "@canva/app-i18n-kit";
+import type { RenderResult } from "@testing-library/react";
+import { fireEvent, render } from "@testing-library/react";
+import React from "react";
+import { RemainingCredits } from "../remaining_credits";
+import { requestOpenExternalUrl } from "@canva/platform";
+
+function renderInTestProvider(node: React.ReactNode): RenderResult {
+  return render(
+    // In a test environment, you should wrap your apps in `TestAppI18nProvider` and `TestAppUiProvider`, rather than `AppI18nProvider` and `AppUiProvider`
+    <TestAppI18nProvider>
+      <TestAppUiProvider>{node}</TestAppUiProvider>,
+    </TestAppI18nProvider>,
+  );
+}
+
+// This test demonstrates how to test code that uses functions from the Canva Apps SDK
+// For more information on testing with the Canva Apps SDK, see https://www.canva.dev/docs/apps/testing/
+describe("Remaining Credit Tests", () => {
+  const mockRequestOpenExternalUrl = jest.mocked(requestOpenExternalUrl);
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it("should call requestOpenExternalUrl when the link is clicked", () => {
+    // assert that the mock is in the expected clean state
+    expect(mockRequestOpenExternalUrl).not.toHaveBeenCalled();
+
+    const result = renderInTestProvider(<RemainingCredits />);
+
+    // get a reference to the link to purchase more credits
+    const purchaseMoreLink = result.getByRole("button");
+
+    // programmatically simulate clicking the button
+    fireEvent.click(purchaseMoreLink);
+
+    // we expect that requestOpenExternalUrl has been called
+    expect(mockRequestOpenExternalUrl).toHaveBeenCalled();
+  });
+});

package/templates/gen_ai/src/context/app_context.tsx

@@ -1,14 +1,10 @@
 import { createContext, useEffect, useState } from "react";
 import { useIntl } from "react-intl";
-import type { ImageType, LoggedInState } from "src/api";
-import { checkAuthenticationStatus, getRemainingCredits } from "src/api";
+import type { ImageType } from "src/api";
+import { getRemainingCredits } from "src/api";
 import { ContextMessages as Messages } from "./context.messages";
-import type { Oauth } from "@canva/user";
-import { auth } from "@canva/user";
 
 export interface AppContextType {
-  loggedInState: LoggedInState;
-  setLoggedInState: (value: LoggedInState) => void;
   appError: string;
   setAppError: (value: string) => void;
   creditsError: string;
@@ -27,12 +23,9 @@ export interface AppContextType {
   setPromptInputError: (value: string) => void;
   generatedImages: ImageType[];
   setGeneratedImages: (value: ImageType[]) => void;
-  oauth: Oauth;
 }
 
 export const AppContext = createContext<AppContextType>({
-  loggedInState: "not_authenticated",
-  setLoggedInState: () => {},
   appError: "",
   setAppError: () => {},
   creditsError: "",
@@ -51,7 +44,6 @@ export const AppContext = createContext<AppContextType>({
   setPromptInputError: () => {},
   generatedImages: [] as ImageType[],
   setGeneratedImages: () => {},
-  oauth: {} as Oauth,
 });
 
 /**
@@ -69,8 +61,6 @@ export const ContextProvider = ({
 }: {
   children: React.ReactNode;
 }): JSX.Element => {
-  const [loggedInState, setLoggedInState] =
-    useState<LoggedInState>("not_authenticated");
   const [appError, setAppError] = useState<string>("");
   const [loadingApp, setLoadingApp] = useState<boolean>(true); // set to true to prevent ui flash on load
   const [isLoadingImages, setIsLoadingImages] = useState<boolean>(false);
@@ -81,7 +71,6 @@ export const ContextProvider = ({
   const [generatedImages, setGeneratedImages] = useState<ImageType[]>([]);
   const [creditsError, setCreditsError] = useState<string>("");
   const intl = useIntl();
-  const oauth = auth.initOauth();
 
   // Fetches initial data on component mount
   useEffect(() => {
@@ -91,7 +80,7 @@ export const ContextProvider = ({
 
         // Fetch remaining credits
         try {
-          const { credits } = await getRemainingCredits(oauth);
+          const { credits } = await getRemainingCredits();
           setRemainingCredits(credits);
         } catch (error) {
           setAppError(
@@ -100,17 +89,6 @@ export const ContextProvider = ({
           // eslint-disable-next-line no-console
           console.error("Error fetching remaining credits:", error);
         }
-
-        // Fetch login status
-        try {
-          checkAuthenticationStatus(oauth);
-        } catch (error) {
-          setAppError(
-            intl.formatMessage(Messages.appErrorGetLoggedInStatusFailed),
-          );
-          // eslint-disable-next-line no-console
-          console.error("Error fetching login status:", error);
-        }
       } catch (error) {
         setAppError(intl.formatMessage(Messages.appErrorGeneral));
         // eslint-disable-next-line no-console
@@ -130,13 +108,10 @@ export const ContextProvider = ({
       return;
     }
 
-    const errorMessage =
-      loggedInState === "authenticated"
-        ? intl.formatMessage(Messages.alertNotEnoughCreditsLoggedIn)
-        : intl.formatMessage(Messages.alertNotEnoughCreditsLoggedOut);
+    const errorMessage = intl.formatMessage(Messages.alertNotEnoughCredits);
 
     setCreditsError(errorMessage);
-  }, [loadingApp, remainingCredits, loggedInState]);
+  }, [loadingApp, remainingCredits]);
 
   const setPromptInputHandler = (value: string) => {
     if (
@@ -153,8 +128,6 @@ export const ContextProvider = ({
   };
 
   const value: AppContextType = {
-    loggedInState,
-    setLoggedInState,
     appError,
     setAppError,
     creditsError,
@@ -173,7 +146,6 @@ export const ContextProvider = ({
     setPromptInputError,
     generatedImages,
     setGeneratedImages,
-    oauth,
   };
 
   return <AppContext.Provider value={value}>{children}</AppContext.Provider>;

package/templates/gen_ai/src/context/context.messages.ts

@@ -12,11 +12,6 @@ export const ContextMessages = defineMessages({
     description:
       "A message to indicate that there was a failure to get the number of credits the user has",
   },
-  appErrorGetLoggedInStatusFailed: {
-    defaultMessage: "Retrieving logged in status has failed.",
-    description:
-      "A message to indicate that due to an unexpected problem, the app was unable to determine if the user is logged in",
-  },
 
   /** Messages related to prompts and user input validation. */
   promptMissingErrorMessage: {
@@ -26,16 +21,10 @@ export const ContextMessages = defineMessages({
   },
 
   /** Messages related to credits, including their availability and purchasing options. */
-  alertNotEnoughCreditsLoggedIn: {
+  alertNotEnoughCredits: {
     defaultMessage:
       "You don’t have enough credits left to generate an image. Please purchase more.",
     description:
       "A message to indicate that the user doesn't have enough credits to generate an image, and will need to buy more to continue",
   },
-  alertNotEnoughCreditsLoggedOut: {
-    defaultMessage:
-      "You don’t have enough credits left to generate an image. Please sign up or log in to purchase more.",
-    description:
-      "A message to indicate that the user doesn't have enough credits to generate an image, and will need to sign up or log in to buy more",
-  },
 });

package/templates/gen_ai/src/home.tsx

@@ -0,0 +1,13 @@
+import { Outlet } from "react-router-dom";
+import { Rows } from "@canva/app-ui-kit";
+import { Footer } from "./components";
+import * as styles from "styles/components.css";
+
+export const Home = () => (
+  <div className={styles.scrollContainer}>
+    <Rows spacing="3u">
+      <Outlet />
+      <Footer />
+    </Rows>
+  </div>
+);

package/templates/gen_ai/src/index.tsx

@@ -1,27 +1,11 @@
 import { createRoot } from "react-dom/client";
-import { createHashRouter, RouterProvider } from "react-router-dom";
-import { ErrorBoundary } from "react-error-boundary";
-import { AppUiProvider } from "@canva/app-ui-kit";
-import { routes } from "./routes";
-import { ErrorPage } from "./pages";
-import { ContextProvider } from "./context";
 import "@canva/app-ui-kit/styles.css";
-import { AppI18nProvider } from "@canva/app-i18n-kit";
+import { App } from "./app";
 
 const root = createRoot(document.getElementById("root") as Element);
 
 function render() {
-  root.render(
-    <AppI18nProvider>
-      <AppUiProvider>
-        <ErrorBoundary fallback={<ErrorPage />}>
-          <ContextProvider>
-            <RouterProvider router={createHashRouter(routes)} />
-          </ContextProvider>
-        </ErrorBoundary>
-      </AppUiProvider>
-    </AppI18nProvider>,
-  );
+  root.render(<App />);
 }
 
 render();

package/templates/gen_ai/src/routes/routes.tsx

@@ -1,4 +1,4 @@
-import { App } from "src/app";
+import { Home } from "src/home";
 import { ErrorPage, GeneratePage, ResultsPage } from "src/pages";
 
 export enum Paths {
@@ -9,7 +9,7 @@ export enum Paths {
 export const routes = [
   {
     path: Paths.HOME,
-    element: <App />,
+    element: <Home />,
     errorElement: <ErrorPage />,
     children: [
       {