Skip to content
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

Jump to bottom

Update bearer to Bearer #2576

Merged
merged 6 commits into from
Jun 13, 2024
Merged

Update bearer to Bearer #2576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
91ad71c
Update the changes
MaryGao Jun 13, 2024
3930f22
Update the test cases
MaryGao Jun 13, 2024
1d0a7ab
Update the transformation
MaryGao Jun 13, 2024
198e70b
Fix the smoke testing issue
MaryGao Jun 13, 2024
720a573
Fix the smoke testing issue
MaryGao Jun 13, 2024
c2c46b2
Regen due to format issue
MaryGao Jun 13, 2024
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
2 changes: 1 addition & 1 deletion packages/rlc-common/src/buildClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ export function getClientFactoryBody(
client.pipeline.addPolicy({
name: "customKeyCredentialPolicy",
async sendRequest(request, next) {
request.headers.set("Authorization", "bearer " + credentials.key);
request.headers.set("Authorization", "Bearer " + credentials.key);
return next(request);
},
});
Expand Down
2 changes: 1 addition & 1 deletion packages/typespec-test/test/openai_generic/generated/typespec-ts/src/rest/openAIClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default function createClient(
client.pipeline.addPolicy({
name: "customKeyCredentialPolicy",
async sendRequest(request, next) {
request.headers.set("Authorization", "bearer " + credentials.key);
request.headers.set("Authorization", "Bearer " + credentials.key);
return next(request);
},
});
Expand Down
2 changes: 1 addition & 1 deletion ...ages/typespec-test/test/openai_non_branded/generated/typespec-ts/src/rest/openAIClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default function createClient(
client.pipeline.addPolicy({
name: "customKeyCredentialPolicy",
async sendRequest(request, next) {
request.headers.set("Authorization", "bearer " + credentials.key);
request.headers.set("Authorization", "Bearer " + credentials.key);
return next(request);
},
});
Expand Down
2 changes: 1 addition & 1 deletion packages/typespec-test/test/todo_non_branded/generated/typespec-ts/src/todoClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default function createClient(
client.pipeline.addPolicy({
name: "customKeyCredentialPolicy",
async sendRequest(request, next) {
request.headers.set("Authorization", "bearer " + credentials.key);
request.headers.set("Authorization", "Bearer " + credentials.key);
return next(request);
},
});
Expand Down
9 changes: 8 additions & 1 deletion packages/typespec-ts/src/transform/transfromRLCOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {
pascalCase,
NameType,
normalizeName,
PackageDetails,
Expand Down Expand Up @@ -106,7 +107,13 @@ function processAuth(program: Program) {
case "http":
securityInfo.addCredentials = true;
securityInfo.customHttpAuthHeaderName = "Authorization";
securityInfo.customHttpAuthSharedKeyPrefix = auth.scheme;
// If it is basic or bearer auth we should generate it as Basic or Bearer
securityInfo.customHttpAuthSharedKeyPrefix = [
"basic",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where do we set Basic now?

Copy link
Member Author

@MaryGao MaryGao Jun 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it should be the same as bearer in header.

https://swagger.io/docs/specification/authentication/basic-authentication/

Authorization: Basic ZGVtbzpwQDU1dzByZA==

Bearer

https://swagger.io/docs/specification/authentication/bearer-authentication/

Authorization: Bearer <token>

"bearer"
].includes(auth.scheme.toLowerCase())
? pascalCase(auth.scheme)
: auth.scheme;
break;
case "apiKey":
if (auth.in === "cookie") {
Expand Down
2 changes: 1 addition & 1 deletion packages/typespec-ts/test/unit/clientFactoryGenerator.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ describe("Client Factory generation", () => {
client.pipeline.addPolicy({
name: "customKeyCredentialPolicy",
async sendRequest(request, next) {
request.headers.set("Authorization", "bearer " + credentials.key);
request.headers.set("Authorization", "Bearer " + credentials.key);
return next(request);
},
});
Expand Down
Loading