Skip to content

Updates cyd URLs to use rever-domain to match atproto oauth protocol #634

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
micahflee merged 1 commit into from
Mar 16, 2026
+17 −16
Merged

Updates cyd URLs to use rever-domain to match atproto oauth protocol #634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions forge.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,23 +137,23 @@ function removeCodeSignatures(dir: string) {
});
}

// For cyd:// and cyd-dev:// URLs
// For social.cyd.api and social.cyd.dev-api URLs
const protocols = [];
if (process.env.CYD_ENV == "prod") {
protocols.push({
name: "Cyd",
schemes: ["cyd"],
schemes: ["social.cyd.api"],
});
} else {
protocols.push({
name: "Cyd Dev",
schemes: ["cyd-dev"],
schemes: ["social.cyd.dev-api"],
});
}
const mimeTypeScheme =
process.env.CYD_ENV == "prod"
? "x-scheme-handler/cyd"
: "x-scheme-handler/cyd-dev";
? "x-scheme-handler/social.cyd.api"
: "x-scheme-handler/social.cyd.dev-api";

// macOS signing and notarization options
let osxSign: OsxSignOptions | undefined;
Expand Down
23 changes: 12 additions & 11 deletions src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ log.info("User data folder is at:", app.getPath("userData"));
// The main window
let win: BrowserWindow | null = null;

// Handle cyd:// URLs (or cyd-dev:// in dev mode)
// Handle a cyd URLs (such as social.cyd.dev-api:/atproto-oauth-callback or social.cyd.api:/atproto-oauth-callback)
const openCydURL = async (cydURL: string) => {
if (!isAppReady) {
log.debug("Adding cyd:// URL to queue:", cydURL);
log.debug("Adding cyd URL to queue:", cydURL);
cydURLQueue.push(cydURL);
return;
}
Expand All @@ -101,8 +101,8 @@ const openCydURL = async (cydURL: string) => {
await createWindow();
}

// If hostname is "open", this just means open Cyd
if (url.hostname == "open") {
// If pathname is "/open", this just means open Cyd
if (url.pathname === "/open" || url.pathname === "/open/") {
const cydOpenEventName = "cydOpen";
if (win) {
log.info(
Expand All @@ -114,8 +114,8 @@ const openCydURL = async (cydURL: string) => {
return;
}

// If hostname is "bluesky-oauth", this means finish the Bluesky OAuth flow
if (url.hostname == "bluesky-oauth") {
// If pathname is "/atproto-oauth-callback/", this means finish the Bluesky OAuth flow
if (url.pathname === "/atproto-oauth-callback/") {
// Get the account ID that's in the middle of the OAuth flow
const accountID = database.getConfig("blueskyOAuthAccountID");
const blueskyOAuthCallbackEventName = `blueskyOAuthCallback-${accountID}`;
Expand Down Expand Up @@ -144,21 +144,22 @@ const openCydURL = async (cydURL: string) => {
return;
};

// Register the cyd:// (or cyd-dev://) protocol
const protocolString = config.mode == "prod" ? "cyd" : "cyd-dev";
// Register the social.cyd.api: (or social.cyd.dev-api:/) protocol (reverse-domain of the API host)
const protocolString =
config.mode == "prod" ? "social.cyd.api" : "social.cyd.dev-api";
app.setAsDefaultProtocolClient(protocolString);

// In Linux and Windows, handle cyd:// URLs passed in via the CLI
// In Linux and Windows, handle cyd URLs passed in via the CLI
const lastArg =
process.argv.length >= 2 ? process.argv[process.argv.length - 1] : "";
if (
(process.platform == "linux" || process.platform == "win32") &&
lastArg.startsWith(protocolString + "://")
lastArg.startsWith(protocolString + ":")
) {
openCydURL(lastArg);
}

// In macOS, handle the cyd:// URLs
// In macOS, handle the cyd: URLs
app.on("open-url", (event, url) => {
openCydURL(url);
});
Expand Down
Loading