@slates/cli 1.0.0-rc.2 → 1.0.0-rc.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slates/cli",
-  "version": "1.0.0-rc.2",
+  "version": "1.0.0-rc.4",
   "publishConfig": {
     "access": "public"
   },
@@ -25,8 +25,9 @@
   },
   "dependencies": {
     "@inquirer/prompts": "^7.4.0",
-    "@slates/client": "1.0.0-rc.2",
-    "@slates/profiles": "1.0.0-rc.2",
+    "@slates/client": "1.0.0-rc.6",
+    "@slates/oauth-microsoft": "1.0.0-rc.1",
+    "@slates/profiles": "1.0.0-rc.4",
     "sade": "^1.8.1"
   },
   "devDependencies": {

package/src/commands/auth.ts

@@ -1,4 +1,5 @@
 import { confirm, select } from '@inquirer/prompts';
+import { normalizeMicrosoftRedirectUriForIntegration } from '@slates/oauth-microsoft';
 import { SlatesOAuthCredentialRecord, SlatesStoredAuth } from '@slates/profiles';
 import {
   chooseAuthMethod,
@@ -6,7 +7,7 @@ import {
   createIntegrationClientContext,
   openIntegrationStore
 } from '../lib/context';
-import { chooseScopes, createOAuthCallbackListener, openBrowser } from '../lib/oauth';
+import { chooseScopes, createOAuthCallbackListener, printBrowserUrl } from '../lib/oauth';
 import {
   parseJsonObject,
   parseList,
@@ -263,7 +264,11 @@ let runAuthSetup = async (opts: AuthSetupOptions): Promise<SlatesStoredAuth> =>
 
   if (authMethod.type === 'auth.oauth') {
     let callback = await createOAuthCallbackListener();
-    console.log(`OAuth redirect URL: ${callback.redirectUri}`);
+    let redirectUri = normalizeMicrosoftRedirectUriForIntegration(
+      opts.integration,
+      callback.redirectUri
+    );
+    console.log(`OAuth redirect URL: ${redirectUri}`);
 
     let resolvedOAuthCredentials = await chooseOAuthCredentialsForSetup({
       store,
@@ -282,7 +287,7 @@ let runAuthSetup = async (opts: AuthSetupOptions): Promise<SlatesStoredAuth> =>
 
     let authorizationUrl = await client.getAuthorizationUrl({
       authenticationMethodId: authMethod.id,
-      redirectUri: callback.redirectUri,
+      redirectUri,
       state: callback.state,
       input: authInput,
       clientId,
@@ -293,7 +298,7 @@ let runAuthSetup = async (opts: AuthSetupOptions): Promise<SlatesStoredAuth> =>
     callbackState = authorizationUrl.callbackState ?? null;
     finalInput = authorizationUrl.input ?? authInput;
 
-    await openBrowser(authorizationUrl.authorizationUrl);
+    printBrowserUrl(authorizationUrl.authorizationUrl);
     let callbackResult = await callback.wait();
     if (callbackResult.state !== callback.state) {
       throw new Error('OAuth state mismatch.');
@@ -303,7 +308,7 @@ let runAuthSetup = async (opts: AuthSetupOptions): Promise<SlatesStoredAuth> =>
       authenticationMethodId: authMethod.id,
       code: callbackResult.code,
       state: callbackResult.state,
-      redirectUri: callback.redirectUri,
+      redirectUri,
       input: finalInput,
       clientId,
       clientSecret,

package/src/commands/test.ts

@@ -47,6 +47,7 @@ export let runVitestWithProfile = async (opts: WithProfile & { vitestArgs: strin
       {
         integration: integration.relativeDir,
         profileId: profile.id,
+        rootDir: store.rootDir,
         storePath: store.storePath,
         cliDir: store.dirPath
       },
@@ -64,6 +65,7 @@ export let runVitestWithProfile = async (opts: WithProfile & { vitestArgs: strin
       SLATES_INTEGRATION: integration.relativeDir,
       SLATES_PROFILE_ID: profile.id,
       SLATES_CLI_DIR: store.dirPath,
+      SLATES_STORE_ROOT_DIR: store.rootDir,
       SLATES_STORE_PATH: store.storePath,
       SLATES_TEST_CONTEXT_PATH: contextPath
     }

package/src/lib/integration.ts

@@ -36,17 +36,24 @@ let isWithinRoot = (rootDir: string, targetPath: string) => {
 
 let resolveIntegrationDir = async (input: string, cwd: string) => {
   let rootDir = resolveSlatesCliRoot(cwd);
-  let namedPath = path.join(rootDir, 'integrations', input);
+  let integrationRoots = [
+    path.join(rootDir, 'integrations'),
+    path.join(rootDir, 'test-integrations')
+  ];
+
   if (!input.includes(path.sep) && !input.includes('/')) {
-    if (await pathExists(path.join(namedPath, 'package.json'))) {
-      return { rootDir, dirPath: namedPath };
+    for (let root of integrationRoots) {
+      let namedPath = path.join(root, input);
+      if (await pathExists(path.join(namedPath, 'package.json'))) {
+        return { rootDir, dirPath: namedPath };
+      }
     }
   }
 
   let candidate = path.resolve(cwd, input);
   if (!(await pathExists(path.join(candidate, 'package.json')))) {
     throw new Error(
-      `Could not resolve integration "${input}". Pass an integration name from \`integrations/\` or a relative path to an integration directory.`
+      `Could not resolve integration "${input}". Pass an integration name from \`integrations/\` or \`test-integrations/\`, or a relative path to an integration directory.`
     );
   }
 
@@ -103,32 +110,41 @@ export let resolveIntegration = async (
 export let listWorkspaceIntegrations = async (opts: { cwd?: string } = {}) => {
   let cwd = opts.cwd ?? process.cwd();
   let rootDir = resolveSlatesCliRoot(cwd);
-  let integrationsDir = path.join(rootDir, 'integrations');
+  let integrationRoots = [
+    path.join(rootDir, 'integrations'),
+    path.join(rootDir, 'test-integrations')
+  ];
+
+  let integrations: WorkspaceIntegrationSummary[] = [];
+
+  for (let integrationsDir of integrationRoots) {
+    if (!(await pathExists(integrationsDir))) {
+      continue;
+    }
 
-  if (!(await pathExists(integrationsDir))) {
-    return [];
+    let entries = await readdir(integrationsDir, { withFileTypes: true });
+    let chunk = await Promise.all(
+      entries
+        .filter(entry => entry.isDirectory())
+        .map(async entry => {
+          let dirPath = path.join(integrationsDir, entry.name);
+          if (!(await pathExists(path.join(dirPath, 'package.json')))) {
+            return null;
+          }
+
+          return {
+            rootDir,
+            dirPath,
+            relativeDir: toPosixPath(path.relative(rootDir, dirPath)),
+            name: entry.name
+          } satisfies WorkspaceIntegrationSummary;
+        })
+    );
+
+    integrations.push(
+      ...chunk.filter((integration): integration is WorkspaceIntegrationSummary => integration !== null)
+    );
   }
 
-  let entries = await readdir(integrationsDir, { withFileTypes: true });
-  let integrations = await Promise.all(
-    entries
-      .filter(entry => entry.isDirectory())
-      .map(async entry => {
-        let dirPath = path.join(integrationsDir, entry.name);
-        if (!(await pathExists(path.join(dirPath, 'package.json')))) {
-          return null;
-        }
-
-        return {
-          rootDir,
-          dirPath,
-          relativeDir: toPosixPath(path.relative(rootDir, dirPath)),
-          name: entry.name
-        } satisfies WorkspaceIntegrationSummary;
-      })
-  );
-
-  return integrations
-    .filter((integration): integration is WorkspaceIntegrationSummary => integration !== null)
-    .sort((a, b) => a.name.localeCompare(b.name));
+  return integrations.sort((a, b) => a.relativeDir.localeCompare(b.relativeDir));
 };

package/src/lib/oauth.ts

@@ -1,10 +1,7 @@
 import { checkbox } from '@inquirer/prompts';
-import { execFile } from 'child_process';
 import { randomUUID } from 'crypto';
 import { createServer } from 'http';
-import { promisify } from 'util';
 
-let execFileAsync = promisify(execFile);
 let DEFAULT_OAUTH_CALLBACK_PORT = 45873;
 
 export let chooseScopes = async (
@@ -21,27 +18,16 @@ export let chooseScopes = async (
     choices: authMethod.scopes.map((scope: any) => ({
       name: `${scope.title} (${scope.id})`,
       value: scope.id,
-      checked: initialScopes.length > 0 ? initialScopes.includes(scope.id) : true
+      checked:
+        initialScopes.length > 0
+          ? initialScopes.includes(scope.id)
+          : scope.defaultChecked ?? true
     }))
   })) as string[];
 };
 
-export let openBrowser = async (url: string) => {
-  try {
-    if (process.platform === 'darwin') {
-      await execFileAsync('open', [url]);
-      return;
-    }
-
-    if (process.platform === 'win32') {
-      await execFileAsync('cmd', ['/c', 'start', '', url]);
-      return;
-    }
-
-    await execFileAsync('xdg-open', [url]);
-  } catch {
-    console.log(`Open this URL in your browser:\n${url}`);
-  }
+export let printBrowserUrl = (url: string) => {
+  console.log(`Open this URL in your browser:\n${url}`);
 };
 
 export let createOAuthCallbackListener = async () => {