224
225
const normalizeAlias = (rawAlias: string) => rawAlias.trim();
226
227
+const resolveNormalizedAliasOption = (alias: Option.Option<string>) =>
228
+ Effect.gen(function* () {
229
+ if (Option.isNone(alias)) {
230
+ return Option.none<string>();
231
+ }
232
+
233
+ const normalizedAlias = normalizeAlias(alias.value);
234
+ if (normalizedAlias.length === 0) {
235
+ return yield* Effect.fail(new Error('`--alias` cannot be empty.'));
236
+ }
237
+
238
+ return Option.some(normalizedAlias);
239
+ });
240
+
241
const listActiveConnectedAccounts = (params: {
242
readonly client: RawComposioClient;
243
readonly userId: string;
303
return false as const;
304
});
305
292
-const patchConnectedAccountAlias = (params: {
293
- readonly ui: TerminalUI;
294
- readonly client: RawComposioClient;
295
- readonly connectedAccountId: string;
296
- readonly alias: Option.Option<string>;
297
-}) =>
298
- Effect.gen(function* () {
299
- if (Option.isNone(params.alias)) {
300
- return;
301
- }
302
-
303
- const normalizedAlias = normalizeAlias(params.alias.value);
304
- if (normalizedAlias.length === 0) {
305
- return yield* Effect.fail(new Error('`--alias` cannot be empty.'));
306
- }
307
-
308
- yield* params.ui.withSpinner(
309
- `Assigning alias "${normalizedAlias}"...`,
310
- Effect.tryPromise(() =>
311
- params.client.patch(`/api/v3/connected_accounts/${params.connectedAccountId}`, {
312
- body: { alias: normalizedAlias },
313
- })
314
- )
315
- );
316
- });
317
-
306
const resolveLinkUserId = (params: {
307
readonly resolvedProject: {
308
readonly projectType: 'CONSUMER' | 'DEVELOPER';
521
orgId: resolvedProject.orgId,
522
projectId: resolvedProject.projectId,
523
});
524
+ const normalizedAlias = yield* resolveNormalizedAliasOption(params.alias);
525
const existingAccounts = yield* listActiveConnectedAccounts({
526
client,
527
userId: resolvedUserId.value,
534
client.link.create({
535
auth_config_id: params.authConfigId,
536
user_id: resolvedUserId.value,
537
+ ...(Option.isSome(normalizedAlias) && { alias: normalizedAlias.value }),
538
})
539
)
540
)
562
const { connectedAccountId, redirectUrl } = validatedLink.value;
563
const canContinue = yield* ensureAliasForAdditionalAccount({
564
ui: params.ui,
575
- alias: params.alias,
565
+ alias: normalizedAlias,
566
connectedAccountId,
567
existingAccounts,
568
scopeDescription: `user "${resolvedUserId.value}" in auth config "${params.authConfigId}"`,
569
});
570
if (!canContinue) return;
571
582
- yield* patchConnectedAccountAlias({
583
- ui: params.ui,
584
- client,
585
- connectedAccountId,
586
- alias: params.alias,
587
- });
588
-
572
if (params.noWait) {
573
yield* showRedirectUrl(params.ui, redirectUrl);
574
yield* params.ui.output(
610
)
611
? params.alias
612
: Option.none<string>();
613
+ const normalizedAliasOption = yield* resolveNormalizedAliasOption(aliasOption);
614
615
const ui = yield* TerminalUI;
616
const clientSingleton = yield* ComposioClientSingleton;
713
const { sessionId } = yield* resolveToolRouterSession(client, resolvedUserId.value, {
714
manageConnections: true,
715
cacheScope: getConsumerCacheScope(resolvedProject),
716
+ excludeConnectedAccountsForToolkits: [toolkitSlug],
717
+ multiAccount: Option.isSome(normalizedAliasOption)
718
+ ? {
719
+ enable: true,
720
+ }
721
+ : undefined,
722
});
723
return yield* Effect.tryPromise(() =>
734
- client.toolRouter.session.link(sessionId, { toolkit: toolkitSlug })
724
+ client.toolRouter.session.link(sessionId, {
725
+ toolkit: toolkitSlug,
726
+ ...(Option.isSome(normalizedAliasOption) && { alias: normalizedAliasOption.value }),
727
+ })
728
);
729
})
730
)
760
const { connectedAccountId: connAccountId, redirectUrl } = validatedLink.value;
761
const canContinue = yield* ensureAliasForAdditionalAccount({
762
ui,
770
- alias: aliasOption,
763
+ alias: normalizedAliasOption,
764
connectedAccountId: connAccountId,
765
existingAccounts,
766
scopeDescription: `user "${resolvedUserId.value}" in toolkit "${toolkitSlug}"`,
767
});
768
if (!canContinue) return;
769
777
- yield* patchConnectedAccountAlias({
778
- ui,
779
- client,
780
- connectedAccountId: connAccountId,
781
- alias: aliasOption,
782
- });
783
-
770
if (params.noWait) {
771
yield* showRedirectUrl(ui, redirectUrl);
772
yield* ui.output(