Skip to content

broker: accept org IDs in deprecated workspace alias schema #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benvinegar merged 2 commits into from
Mar 6, 2026
Merged

broker: accept org IDs in deprecated workspace alias schema #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adf3c3a
broker: accept org IDs in deprecated workspace aliases
benvinegar Mar 6, 2026
8223059
tests: anchor env schema path to test file
benvinegar Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .env.schema
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,12 @@ GATEWAY_BROKER_ORG_ID=
# @sensitive=false @type=string
SLACK_BROKER_ORG_ID=

# Deprecated workspace/team ID aliases (still accepted for migration)
# @sensitive=false @type=string(startsWith=T)
# Deprecated workspace/team ID aliases (still accepted for migration).
# May contain either legacy Slack workspace IDs (T...) or broker org IDs (org_...).
# @sensitive=false @type=string
GATEWAY_BROKER_WORKSPACE_ID=

# @sensitive=false @type=string(startsWith=T)
# @sensitive=false @type=string
SLACK_BROKER_WORKSPACE_ID=

# Gateway server X25519 private key (base64, preferred)
Expand Down
15 changes: 14 additions & 1 deletion bin/broker-register.test.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import fs from "node:fs";
import os from "node:os";
import path from "node:path";
import { createServer } from "node:http";
import { pathToFileURL } from "node:url";
import { fileURLToPath, pathToFileURL } from "node:url";
import {
parseArgs,
normalizeBrokerUrl,
Expand Down Expand Up @@ -266,6 +266,19 @@ test("runRegistration integration path succeeds against live local HTTP server",
}
});

test("env schema accepts org IDs for deprecated workspace aliases", () => {
const schemaPath = fileURLToPath(new URL("../.env.schema", import.meta.url));
const lines = fs.readFileSync(schemaPath, "utf8").split(/\r?\n/);

const gatewayWorkspaceIndex = lines.findIndex((line) => line.startsWith("GATEWAY_BROKER_WORKSPACE_ID="));
assert.notEqual(gatewayWorkspaceIndex, -1, "GATEWAY_BROKER_WORKSPACE_ID missing from .env.schema");
assert.equal(lines[gatewayWorkspaceIndex - 1].trim(), "# @sensitive=false @type=string");

const slackWorkspaceIndex = lines.findIndex((line) => line.startsWith("SLACK_BROKER_WORKSPACE_ID="));
assert.notEqual(slackWorkspaceIndex, -1, "SLACK_BROKER_WORKSPACE_ID missing from .env.schema");
assert.equal(lines[slackWorkspaceIndex - 1].trim(), "# @sensitive=false @type=string");
});

test("runRegistration does not write SLACK_BOT_TOKEN even when broker returns encrypted_bot_token", async () => {
const fetchImpl = async (url) => {
if (String(url).endsWith("/api/broker-pubkey")) {
Expand Down