Skip to content

Commit 37bfcc2

Browse files
committed
Scope credential secret pickers
1 parent bdb0906 commit 37bfcc2

4 files changed

Lines changed: 3 additions & 17 deletions

File tree

packages/plugins/openapi/src/react/AddOpenApiSource.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,6 @@ export default function AddOpenApiSource(props: {
946946
targetScope={sourceScope}
947947
credentialScopeOptions={credentialScopeOptions}
948948
bindingScopeOptions={credentialScopeOptions}
949-
restrictSecretsToTargetScope
950949
labels={{
951950
headers: "Spec fetch headers",
952951
queryParams: "Spec fetch query parameters",
@@ -1085,7 +1084,6 @@ export default function AddOpenApiSource(props: {
10851084
targetScope={sourceScope}
10861085
credentialScopeOptions={credentialScopeOptions}
10871086
bindingScopeOptions={credentialScopeOptions}
1088-
restrictSecretsToTargetScope
10891087
emptyLabel="No credentials yet. Add the header value this method should use."
10901088
/>
10911089
</div>
@@ -1099,7 +1097,6 @@ export default function AddOpenApiSource(props: {
10991097
targetScope={sourceScope}
11001098
credentialScopeOptions={credentialScopeOptions}
11011099
bindingScopeOptions={credentialScopeOptions}
1102-
restrictSecretsToTargetScope
11031100
sections={{ headers: false, queryParams: true }}
11041101
labels={{ queryParams: "Runtime query parameters" }}
11051102
/>

packages/react/src/plugins/headers-list.tsx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,10 @@ export interface HeadersListProps {
4343
readonly sourceName?: string;
4444
/** Inline-created secrets are written to this explicit scope. */
4545
readonly targetScope: ScopeId;
46-
/** Scope choices shown only inside the inline "+ New secret" form. */
46+
/** Scope choices available for where this source credential is used. */
4747
readonly credentialScopeOptions?: readonly CredentialTargetScopeOption[];
4848
/** Scope choices for where this source credential is used. */
4949
readonly bindingScopeOptions?: readonly CredentialTargetScopeOption[];
50-
readonly restrictSecretsToTargetScope?: boolean;
5150
readonly defaultValueKind?: HeaderState["valueKind"];
5251
}
5352

@@ -65,7 +64,6 @@ export function HeadersList({
6564
sourceName,
6665
targetScope,
6766
bindingScopeOptions,
68-
restrictSecretsToTargetScope,
6967
defaultValueKind = "secret",
7068
}: HeadersListProps) {
7169
const [picking, setPicking] = useState(false);
@@ -153,7 +151,6 @@ export function HeadersList({
153151
existingSecrets={existingSecrets}
154152
sourceName={sourceName}
155153
bindingScopeOptions={bindingScopeOptions}
156-
restrictSecretsToTargetScope={restrictSecretsToTargetScope}
157154
copy={rowCopy}
158155
previewComponent={rowPreviewComponent}
159156
/>
@@ -188,7 +185,6 @@ function HeaderRow(props: {
188185
readonly existingSecrets: readonly SecretPickerSecret[];
189186
readonly sourceName?: string;
190187
readonly bindingScopeOptions?: readonly CredentialTargetScopeOption[];
191-
readonly restrictSecretsToTargetScope?: boolean;
192188
readonly copy?: Partial<SecretCredentialRowCopy>;
193189
readonly previewComponent?: SecretCredentialPreviewComponent;
194190
}) {
@@ -220,7 +216,6 @@ function HeaderRow(props: {
220216
sourceName={props.sourceName}
221217
targetScope={props.header.targetScope ?? props.targetScope}
222218
bindingScopeOptions={props.bindingScopeOptions}
223-
restrictSecretsToTargetScope={props.restrictSecretsToTargetScope}
224219
copy={props.copy}
225220
previewComponent={props.previewComponent}
226221
/>

packages/react/src/plugins/http-credentials.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,6 @@ export function HttpCredentialsEditor(props: {
287287
readonly targetScope: ScopeId;
288288
readonly credentialScopeOptions?: readonly CredentialTargetScopeOption[];
289289
readonly bindingScopeOptions?: readonly CredentialTargetScopeOption[];
290-
readonly restrictSecretsToTargetScope?: boolean;
291290
readonly sections?: {
292291
readonly headers?: boolean;
293292
readonly queryParams?: boolean;
@@ -314,7 +313,6 @@ export function HttpCredentialsEditor(props: {
314313
targetScope={props.targetScope}
315314
credentialScopeOptions={props.credentialScopeOptions}
316315
bindingScopeOptions={props.bindingScopeOptions}
317-
restrictSecretsToTargetScope={props.restrictSecretsToTargetScope}
318316
presets={props.headerPresets}
319317
/>
320318
</section>
@@ -331,7 +329,6 @@ export function HttpCredentialsEditor(props: {
331329
targetScope={props.targetScope}
332330
credentialScopeOptions={props.credentialScopeOptions}
333331
bindingScopeOptions={props.bindingScopeOptions}
334-
restrictSecretsToTargetScope={props.restrictSecretsToTargetScope}
335332
presets={queryParamPresets}
336333
emptyLabel="No query parameters"
337334
addLabel="Add query parameter"

packages/react/src/plugins/secret-header-auth.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,6 @@ export function SecretHeaderAuthRow(props: {
314314
sourceName?: string;
315315
targetScope: ScopeId;
316316
bindingScopeOptions?: readonly CredentialTargetScopeOption[];
317-
restrictSecretsToTargetScope?: boolean;
318317
}) {
319318
const [creating, setCreating] = useState(false);
320319
const nameInputId = useId();
@@ -335,15 +334,13 @@ export function SecretHeaderAuthRow(props: {
335334
sourceName,
336335
targetScope,
337336
bindingScopeOptions,
338-
restrictSecretsToTargetScope = false,
339337
} = props;
340338

341339
const isCustom = presetKey === "custom" || presetKey === undefined;
342340
const copy = { ...defaultSecretCredentialRowCopy, ...copyOverride };
343341
const headerLabel = name.trim() || "Custom Header";
344342
const suggestedName = [sourceName?.trim(), headerLabel].filter(Boolean).join(" ");
345343
const scopedSecrets = secretsForCredentialTarget(existingSecrets, targetScope);
346-
const selectableSecrets = restrictSecretsToTargetScope ? scopedSecrets : existingSecrets;
347344

348345
return (
349346
<div className="space-y-2.5 px-4 py-3">
@@ -426,7 +423,7 @@ export function SecretHeaderAuthRow(props: {
426423
value={secretId}
427424
valueScopeId={secretScope ? String(secretScope) : undefined}
428425
onSelect={(id, scopeId) => onSelectSecret(id, ScopeId.make(scopeId))}
429-
secrets={selectableSecrets}
426+
secrets={scopedSecrets}
430427
onCreateNew={() => setCreating(true)}
431428
/>
432429
</div>
@@ -528,7 +525,7 @@ export function CreatableSecretPicker(props: {
528525
value={value}
529526
valueScopeId={String(targetScope)}
530527
onSelect={(id, scopeId) => onSelect(id, ScopeId.make(scopeId))}
531-
secrets={secrets}
528+
secrets={scopedSecrets}
532529
placeholder={placeholder}
533530
onCreateNew={() => setCreating(true)}
534531
/>

0 commit comments

Comments
 (0)