@slates/cli 1.0.0-rc.10 → 1.0.0-rc.13

package/package.json

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

package/src/commands/auth.ts

@@ -388,12 +388,12 @@ let runAuthSetup = async (opts: AuthSetupOptions): Promise<SlatesStoredAuth> =>
     return stored;
   }
 
-  output = (
-    await client.getAuthOutput({
-      authenticationMethodId: authMethod.id,
-      input: authInput
-    })
-  ).output;
+  let authOutput = await client.getAuthOutput({
+    authenticationMethodId: authMethod.id,
+    input: authInput
+  });
+  output = authOutput.output;
+  scopes = authOutput.scopes ?? scopes;
 
   let profileInfo = authMethod.capabilities.getProfile?.enabled
     ? await client.getAuthProfile({

package/src/lib/oauth.ts

@@ -4,6 +4,21 @@ import { createServer } from 'http';
 
 let DEFAULT_OAUTH_CALLBACK_PORT = 45873;
 
+let resolveAdvertisedRedirectUri = (localPort: number) => {
+  let override = process.env.OAUTH_CALLBACK_OVERRIDE;
+  if (!override) return `http://127.0.0.1:${localPort}/callback`;
+
+  let url: URL;
+  try {
+    url = new URL(override);
+  } catch {
+    throw new Error(`OAUTH_CALLBACK_OVERRIDE must be an absolute URL, received: ${override}`);
+  }
+
+  if (url.pathname === '' || url.pathname === '/') url.pathname = '/callback';
+  return url.toString();
+};
+
 export let chooseScopes = async (
   authMethod: any,
   initialScopes: string[]
@@ -153,7 +168,7 @@ export let createOAuthCallbackListener = async () => {
       }
 
       resolve({
-        redirectUri: `http://127.0.0.1:${address.port}/callback`,
+        redirectUri: resolveAdvertisedRedirectUri(address.port),
         state: expectedState,
         wait: () => waiter.promise
       });