Skip to content

Commit 797d8ba

Browse files
committed
builds and runs, need to fix implementation
1 parent 1616d8d commit 797d8ba

File tree

6 files changed

+47
-19
lines changed

6 files changed

+47
-19
lines changed

pnpm-lock.yaml

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/search/search-documents/review/search-documents-node.api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
```ts
66

77
import { AzureKeyCredential } from '@azure/core-auth';
8-
import { ClientOptions } from '@azure-rest/core-client';
8+
import type { ClientOptions } from '@azure-rest/core-client';
99
import type { KeyCredential } from '@azure/core-auth';
1010
import type { OperationOptions } from '@azure-rest/core-client';
11-
import type { Pipeline } from '@azure/core-rest-pipeline';
11+
import { Pipeline } from '@azure/core-rest-pipeline';
1212
import type { RestError } from '@azure/core-rest-pipeline';
1313
import type { TokenCredential } from '@azure/core-auth';
1414

sdk/search/search-documents/src/knowledgeRetrievalClient.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
import type { KeyCredential, TokenCredential } from "@azure/core-auth";
77
import { isTokenCredential } from "@azure/core-auth";
88
import type { Pipeline } from "@azure/core-rest-pipeline";
9-
import { bearerTokenAuthenticationPolicy } from "@azure/core-rest-pipeline";
9+
import {
10+
bearerTokenAuthenticationPolicy,
11+
bearerTokenAuthenticationPolicyName,
12+
} from "@azure/core-rest-pipeline";
1013
import type {
1114
KnowledgeBaseRetrievalRequest,
1215
KnowledgeBaseRetrievalResponse,
@@ -124,6 +127,9 @@ export class KnowledgeRetrievalClient {
124127

125128
this.pipeline = this.client.pipeline;
126129

130+
// TODO: consider leaving the policy in-place instead of removing and re-adding
131+
this.pipeline.removePolicy({ name: bearerTokenAuthenticationPolicyName });
132+
127133
if (isTokenCredential(credential)) {
128134
const scope: string = options.audience
129135
? `${options.audience}/.default`

sdk/search/search-documents/src/searchClient.ts

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55

66
import type { KeyCredential, TokenCredential } from "@azure/core-auth";
77
import { isTokenCredential } from "@azure/core-auth";
8-
import type { Pipeline } from "@azure/core-rest-pipeline";
9-
import { bearerTokenAuthenticationPolicy } from "@azure/core-rest-pipeline";
8+
import {
9+
bearerTokenAuthenticationPolicy,
10+
bearerTokenAuthenticationPolicyName,
11+
type Pipeline,
12+
} from "@azure/core-rest-pipeline";
1013
import { decode, encode } from "./base64.js";
1114
import type {
1215
AutocompleteResult,
@@ -17,10 +20,8 @@ import type {
1720
SearchRequest as GeneratedSearchRequest,
1821
VectorQueryUnion as GeneratedVectorQuery,
1922
} from "./models/azure/search/documents/index.js";
20-
import {
21-
SearchClient as GeneratedClient,
22-
SearchClientOptionalParams,
23-
} from "./search/searchClient.js";
23+
import type { SearchClientOptionalParams } from "./search/searchClient.js";
24+
import { SearchClient as GeneratedClient } from "./search/searchClient.js";
2425
import { IndexDocumentsBatch } from "./indexDocumentsBatch.js";
2526
import type {
2627
AutocompleteOptions,
@@ -58,8 +59,8 @@ import type { IndexDocumentsClient } from "./searchIndexingBufferedSender.js";
5859
import { deserialize, serialize } from "./serialization.js";
5960
import * as utils from "./serviceUtils.js";
6061
import { createSpan, tracingClient } from "./tracing.js";
61-
import { ClientOptions, OperationOptions } from "@azure-rest/core-client";
62-
import { GetDocumentOptionalParams, SuggestPostOptionalParams } from "./search/index.js";
62+
import type { ClientOptions, OperationOptions } from "@azure-rest/core-client";
63+
import type { GetDocumentOptionalParams, SuggestPostOptionalParams } from "./search/index.js";
6364

6465
/**
6566
* Client options used to configure AI Search API requests.
@@ -207,11 +208,13 @@ export class SearchClient<TModel extends object> implements IndexDocumentsClient
207208

208209
this.pipeline = this.client.pipeline;
209210

211+
// TODO: consider leaving the policy in-place instead of removing and re-adding
212+
this.pipeline.removePolicy({ name: bearerTokenAuthenticationPolicyName });
213+
210214
if (isTokenCredential(credential)) {
211215
const scope: string = options.audience
212216
? `${options.audience}/.default`
213217
: `${KnownSearchAudience.AzurePublicCloud}/.default`;
214-
215218
this.client.pipeline.addPolicy(
216219
bearerTokenAuthenticationPolicy({ credential, scopes: scope }),
217220
);

sdk/search/search-documents/src/searchIndexClient.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
import type { KeyCredential, TokenCredential } from "@azure/core-auth";
77
import { isTokenCredential } from "@azure/core-auth";
88
import type { Pipeline } from "@azure/core-rest-pipeline";
9-
import { bearerTokenAuthenticationPolicy } from "@azure/core-rest-pipeline";
9+
import {
10+
bearerTokenAuthenticationPolicy,
11+
bearerTokenAuthenticationPolicyName,
12+
} from "@azure/core-rest-pipeline";
1013
import type {
1114
AnalyzeResult,
1215
// KnowledgeSourceStatus,
@@ -182,6 +185,9 @@ export class SearchIndexClient {
182185
this.client = new GeneratedClient(this.endpoint, credential, internalClientPipelineOptions);
183186
this.pipeline = this.client.pipeline;
184187

188+
// TODO: consider leaving the policy in-place instead of removing and re-adding
189+
this.pipeline.removePolicy({ name: bearerTokenAuthenticationPolicyName });
190+
185191
if (isTokenCredential(credential)) {
186192
const scope: string = this.options.audience
187193
? `${this.options.audience}/.default`

sdk/search/search-documents/src/searchIndexerClient.ts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
import type { KeyCredential, TokenCredential } from "@azure/core-auth";
55
import { isTokenCredential } from "@azure/core-auth";
66
import type { Pipeline } from "@azure/core-rest-pipeline";
7-
import { bearerTokenAuthenticationPolicy } from "@azure/core-rest-pipeline";
8-
import type { SearchIndexerStatus } from "./models/azure/search/documents/indexes/index.js";
97
import {
10-
SearchIndexerClient as GeneratedClient,
11-
SearchIndexerClientOptionalParams,
12-
} from "./searchIndexer/searchIndexerClient.js";
8+
bearerTokenAuthenticationPolicy,
9+
bearerTokenAuthenticationPolicyName,
10+
} from "@azure/core-rest-pipeline";
11+
import type { SearchIndexerStatus } from "./models/azure/search/documents/indexes/index.js";
12+
import type { SearchIndexerClientOptionalParams } from "./searchIndexer/searchIndexerClient.js";
13+
import { SearchIndexerClient as GeneratedClient } from "./searchIndexer/searchIndexerClient.js";
1314
import { logger } from "./logger.js";
1415
import { createOdataMetadataPolicy } from "./odataMetadataPolicy.js";
1516
import { createSearchApiKeyCredentialPolicy } from "./searchApiKeyCredentialPolicy.js";
@@ -41,7 +42,7 @@ import type {
4142
} from "./serviceModels.js";
4243
import * as utils from "./serviceUtils.js";
4344
import { tracingClient } from "./tracing.js";
44-
import { ClientOptions } from "@azure-rest/core-client";
45+
import type { ClientOptions } from "@azure-rest/core-client";
4546

4647
/**
4748
* Client options used to configure AI Search API requests.
@@ -142,6 +143,9 @@ export class SearchIndexerClient {
142143
this.client = new GeneratedClient(this.endpoint, credential, internalClientPipelineOptions);
143144
this.pipeline = this.client.pipeline;
144145

146+
// TODO: consider leaving the policy in-place instead of removing and re-adding
147+
this.pipeline.removePolicy({ name: bearerTokenAuthenticationPolicyName });
148+
145149
if (isTokenCredential(credential)) {
146150
const scope: string = options.audience
147151
? `${options.audience}/.default`

0 commit comments

Comments
 (0)