create concept of hidden publish providers, mark confluence hidden

Author: jjallaire

src/command/publish/account.ts

@@ -155,7 +155,7 @@ interface ProviderAccountToken extends AccountToken {
 export async function manageAccounts() {
   // build a list of all authorized accounts
   const accounts: ProviderAccountToken[] = [];
-  for (const provider of await publishProviders()) {
+  for (const provider of publishProviders()) {
     for (const account of await provider.accountTokens()) {
       if (account.type === AccountTokenType.Authorized) {
         accounts.push({ provider: provider.name, ...account });

src/command/publish/cmd.ts

@@ -225,18 +225,20 @@ async function publishAction(
     );
   } else if (publishOptions.prompt) {
     // new deployment, determine provider if needed
-    const providers = await publishProviders();
+    const providers = publishProviders();
     if (!provider) {
       if (haveArrowKeys()) {
         // select provider
         const result = await prompt([{
           indent: "",
           name: "provider",
           message: "Provider:",
-          options: providers.map((provider) => ({
-            name: provider.description,
-            value: provider.name,
-          })),
+          options: providers
+            .filter((provider) => !provider.hidden)
+            .map((provider) => ({
+              name: provider.description,
+              value: provider.name,
+            })),
           type: Select,
         }]);
         if (result.provider) {

src/command/publish/deployment.ts

@@ -125,7 +125,7 @@ export async function publishDeployments(
   const deployments: PublishDeploymentWithAccount[] = [];
 
   // see if there are any static publish records for this directory
-  for (const provider of await publishProviders()) {
+  for (const provider of publishProviders()) {
     if (
       (!providerFilter || providerFilter === provider.name) &&
       provider.publishRecord
@@ -214,7 +214,8 @@ export async function chooseDeployment(
       try {
         const targetOrigin = new URL(deployment.target.url!).origin;
         if (
-          originCounts.get(targetOrigin) === 1 && (deployment.provider?.listOriginOnly ?? false)
+          originCounts.get(targetOrigin) === 1 &&
+          (deployment.provider?.listOriginOnly ?? false)
         ) {
           url = targetOrigin;
         }

src/publish/confluence/confluence.ts

@@ -672,6 +672,7 @@ async function publish(
 export const confluenceProvider: PublishProvider = {
   name: CONFLUENCE_ID,
   description: "Confluence",
+  hidden: true,
   requiresServer: true,
   requiresRender: true,
   accountTokens: getAccountTokens,

src/publish/provider.ts

@@ -49,20 +49,13 @@ const kPublishProviders = [
   confluenceProvider,
 ];
 
-export async function publishProviders() {
+export function publishProviders() {
   const providers: Array<PublishProvider> = [];
-  const dotenvConfig = await quartoConfig.dotenv();
-  const quartopubAppId = dotenvConfig["QUARTO_PUB_APP_CLIENT_ID"];
-  if (quartopubAppId && quartopubAppId !== "None") {
-    providers.push(quartoPubProvider);
-  }
+  providers.push(quartoPubProvider);
   providers.push(ghpagesProvider);
   providers.push(rsconnectProvider);
   providers.push(netlifyProvider);
-  if (dotenvConfig["CONFLUENCE_PUBLISH_ENABLED"] === "true") {
-    providers.push(confluenceProvider);
-  }
-
+  providers.push(confluenceProvider);
   return providers;
 }
 
@@ -96,20 +89,21 @@ export interface PublishProvider {
   name: string;
   description: string;
   requiresServer: boolean;
+  hidden?: boolean;
   listOriginOnly?: boolean;
   requiresRender?: boolean;
   publishRecord?: (
-    input: string | ProjectContext
+    input: string | ProjectContext,
   ) => Promise<PublishRecord | undefined>;
   accountTokens: () => Promise<AccountToken[]>;
   removeToken: (token: AccountToken) => void;
   authorizeToken: (
     options: PublishOptions,
-    target?: PublishRecord
+    target?: PublishRecord,
   ) => Promise<AccountToken | undefined>;
   resolveTarget: (
     account: AccountToken,
-    target: PublishRecord
+    target: PublishRecord,
   ) => Promise<PublishRecord | undefined>;
   publish: (
     account: AccountToken,
@@ -119,7 +113,7 @@ export interface PublishProvider {
     slug: string,
     render: (flags?: RenderFlags) => Promise<PublishFiles>,
     options: PublishOptions,
-    target?: PublishRecord
+    target?: PublishRecord,
   ) => Promise<[PublishRecord | undefined, URL | undefined]>;
   isUnauthorized: (error: Error) => boolean;
   isNotFound: (error: Error) => boolean;