@autorest/typescript 6.0.11-alpha.20231031.1 → 6.0.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -25,7 +25,7 @@ export declare function isSchemaResponse(response: any): response is SchemaRespo
|
|
|
25
25
|
export declare function getSchemaTypeDocumentation(schema: Schema): "" | "\nThis value should be an ISO-8601 formatted string representing time. E.g. \"HH:MM:SS\" or \"HH:MM:SS.mm\"." | "\nThis value contains a credential. Consider obscuring before showing to users";
|
|
26
26
|
export declare function getSecurityInfoFromModel(security: Security): {
|
|
27
27
|
addCredentials: boolean;
|
|
28
|
-
credentialScopes: string[];
|
|
28
|
+
credentialScopes: string[] | undefined;
|
|
29
29
|
credentialKeyHeaderName: string;
|
|
30
30
|
};
|
|
31
31
|
//# sourceMappingURL=schemaHelpers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemaHelpers.d.ts","sourceRoot":"","sources":["../../../src/utils/schemaHelpers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAgB,MAAM,wBAAwB,CAAC;AAEnE,OAAO,EACL,MAAM,EAGN,YAAY,EAGZ,cAAc,EACd,aAAa,EAIb,QAAQ,EACT,MAAM,qBAAqB,CAAC;AAO7B;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,EAAE,OAAO,EAAE,EAAE,YAAY,EACzB,aAAa,UAAQ,mBAWtB;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,EAAE,OAAO,EAAE,EAAE,YAAY,EACzB,aAAa,UAAQ,GACpB,aAAa,GAAG,SAAS,CAU3B;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,UAAU,GAAE,OAAe,EAC3B,SAAS,GAAE,OAAe,GACzB,WAAW,CAoIb;AAMD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,GAAG,GAAG,QAAQ,IAAI,cAAc,CAG1E;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,0MASxD;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,QAAQ;;;;
|
|
1
|
+
{"version":3,"file":"schemaHelpers.d.ts","sourceRoot":"","sources":["../../../src/utils/schemaHelpers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAgB,MAAM,wBAAwB,CAAC;AAEnE,OAAO,EACL,MAAM,EAGN,YAAY,EAGZ,cAAc,EACd,aAAa,EAIb,QAAQ,EACT,MAAM,qBAAqB,CAAC;AAO7B;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,EAAE,OAAO,EAAE,EAAE,YAAY,EACzB,aAAa,UAAQ,mBAWtB;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,EAAE,OAAO,EAAE,EAAE,YAAY,EACzB,aAAa,UAAQ,GACpB,aAAa,GAAG,SAAS,CAU3B;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,UAAU,GAAE,OAAe,EAC3B,SAAS,GAAE,OAAe,GACzB,WAAW,CAoIb;AAMD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,GAAG,GAAG,QAAQ,IAAI,cAAc,CAG1E;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,0MASxD;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,QAAQ;;;;EAkD1D"}
|
|
@@ -185,8 +185,10 @@ function getSecurityInfoFromModel(security) {
|
|
|
185
185
|
const { addCredentials } = (0, autorestSession_1.getAutorestOptions)();
|
|
186
186
|
const credentialScopes = new Set();
|
|
187
187
|
let credentialKeyHeaderName = "";
|
|
188
|
+
let hasOAuth2Defined = false;
|
|
188
189
|
for (const securitySchema of security.schemes) {
|
|
189
190
|
if (securitySchema.type === "OAuth2") {
|
|
191
|
+
hasOAuth2Defined = true;
|
|
190
192
|
securitySchema.scopes.forEach(scope => {
|
|
191
193
|
const scopes = scope.split(",");
|
|
192
194
|
for (const scope of scopes) {
|
|
@@ -218,7 +220,7 @@ function getSecurityInfoFromModel(security) {
|
|
|
218
220
|
}
|
|
219
221
|
return {
|
|
220
222
|
addCredentials: refinedAddCredentials,
|
|
221
|
-
credentialScopes: scopes,
|
|
223
|
+
credentialScopes: !hasOAuth2Defined && scopes.length === 0 ? undefined : scopes,
|
|
222
224
|
credentialKeyHeaderName: credentialKeyHeaderName
|
|
223
225
|
};
|
|
224
226
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemaHelpers.js","sourceRoot":"","sources":["../../../src/utils/schemaHelpers.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,yDAAmE;AAEnE,mDAa6B;AAC7B,iDAAmD;AACnD,uDAAwD;AACxD,2CAAsD;AACtD,qCAAkC;AAClC,wDAAwD;AAExD;;;;GAIG;AACH,SAAgB,gBAAgB,CAC9B,EAAE,OAAO,EAAgB,EACzB,aAAa,GAAG,KAAK;IAErB,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,EAAE,CAAC;KACX;IAED,MAAM,UAAU,GAAoB,aAAa;QAC/C,CAAC,CAAC,OAAO,CAAC,SAAS;QACnB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC;IAEhB,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,sBAAU,CAAC,MAAM,CAAC,CAAC;AAC9D,CAAC;AAbD,4CAaC;AAED;;;;GAIG;AACH,SAAgB,uBAAuB,CACrC,EAAE,OAAO,EAAgB,EACzB,aAAa,GAAG,KAAK;IAErB,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,UAAU,GAAoB,aAAa;QAC/C,CAAC,CAAC,OAAO,CAAC,SAAS;QACnB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC;IAEhB,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,sBAAU,CAAC,UAAU,CAAC,CAAC;AAChE,CAAC;AAbD,0DAaC;AAED;;;GAGG;AACH,SAAgB,gBAAgB,CAC9B,MAAc,EACd,aAAsB,KAAK,EAC3B,YAAqB,KAAK;IAE1B,IAAI,QAAQ,GAAW,EAAE,CAAC;IAC1B,IAAI,UAAU,GAAa,EAAE,CAAC;IAC9B,IAAI,YAAY,GAAG,SAAS,CAAC;IAC7B,IAAI,IAAI,GAAiB,2BAAY,CAAC,SAAS,CAAC;IAChD,QAAQ,MAAM,CAAC,IAAI,EAAE;QACnB,KAAK,sBAAU,CAAC,GAAG;YACjB,QAAQ,GAAG,KAAK,CAAC;YACjB,MAAM;QACR,KAAK,sBAAU,CAAC,KAAK;YACnB,MAAM,WAAW,GAAG,MAAqB,CAAC;YAC1C,MAAM,SAAS,GAAG,gBAAgB,CAChC,WAAW,CAAC,WAAW,EACvB,WAAW,CAAC,aAAa,EACzB,SAAS,CACV,CAAC;YACF,MAAM,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC;YACrC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC;YACtB,yEAAyE;YACzE,mEAAmE;YACnE,sBAAsB;YACtB,MAAM,gBAAgB,GAAG,SAAS,CAAC,QAAQ;gBACzC,CAAC,CAAC,GAAG,GAAG,SAAS,GAAG,GAAG;gBACvB,CAAC,CAAC,SAAS,CAAC;YACd,QAAQ,GAAG,GAAG,gBAAgB,IAAI,CAAC;YACnC,IAAI,aAAa,CAAC,SAAS,CAAC,EAAE;gBAC5B,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aAC5B;YACD,MAAM;QACR,KAAK,sBAAU,CAAC,OAAO;YACrB,QAAQ,GAAG,SAAS,CAAC;YACrB,MAAM;QACR,KAAK,sBAAU,CAAC,MAAM;YACpB,QAAQ,GAAG,CAAC,SAAS;gBACnB,CAAC,CAAC,0BAA0B;gBAC5B,CAAC,CAAC,kCAAkC,CAAC;YACvC,MAAM;QACR,KAAK,sBAAU,CAAC,SAAS;YACvB,QAAQ,GAAG,YAAY,CAAC;YACxB,MAAM;QACR,KAAK,sBAAU,CAAC,MAAM,CAAC;QACvB,KAAK,sBAAU,CAAC,YAAY;YAC1B,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,qCAAmB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAClE,QAAQ,GAAG,UAAU,CAAC;YACtB,IAAI,GAAG,2BAAY,CAAC,IAAI,CAAC;YACzB,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC5B,MAAM;QACR,KAAK,sBAAU,CAAC,QAAQ;YACtB,MAAM,cAAc,GAAG,MAAwB,CAAC;YAChD,MAAM,YAAY,GAAG,gBAAgB,CAAC,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;YACvE,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC;YACzB,IAAI,aAAa,CAAC,YAAY,CAAC,EAAE;gBAC/B,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aAC3B;YACD,YAAY,GAAG,IAAA,gCAAiB,EAC9B,cAAc,CAAC,KAAK,CAAC,KAAK,EAC1B,cAAc,CAAC,SAAS,CAAC,IAAI,EAC7B,KAAK,CACN,CAAC;YACF,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC;YACjC,MAAM;QACR,KAAK,sBAAU,CAAC,QAAQ,CAAC;QACzB,KAAK,sBAAU,CAAC,IAAI,CAAC;QACrB,KAAK,sBAAU,CAAC,QAAQ;YACtB,QAAQ,GAAG,MAAM,CAAC;YAClB,MAAM;QACR,KAAK,sBAAU,CAAC,QAAQ;YACtB,QAAQ,GAAG,QAAQ,CAAC;YACpB,MAAM;QACR,KAAK,sBAAU,CAAC,UAAU;YACxB,MAAM,gBAAgB,GAAG,MAA0B,CAAC;YACpD,MAAM,WAAW,GAAG,gBAAgB,CAClC,gBAAgB,CAAC,WAAW,EAC5B,gBAAgB,CAAC,aAAa,CAC/B,CAAC;YACF,MAAM,eAAe,GAAG,WAAW,CAAC,QAAQ,CAAC;YAC7C,IAAI,GAAG,2BAAY,CAAC,UAAU,CAAC;YAC/B,QAAQ,GAAG,4BAA4B,eAAe,GAAG,CAAC;YAC1D,IAAI,aAAa,CAAC,WAAW,CAAC,EAAE;gBAC9B,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aAClC;YACD,MAAM;QACR,KAAK,sBAAU,CAAC,SAAS;YACvB,IAAI,GAAG,2BAAY,CAAC,UAAU,CAAC;YAC/B,QAAQ,GAAG,yBAAyB,CAAC;YACrC,MAAM;QACR,KAAK,sBAAU,CAAC,MAAM,CAAC;QACvB,KAAK,sBAAU,CAAC,OAAO;YACrB,QAAQ,GAAG,QAAQ,CAAC;YACpB,MAAM;QAER,KAAK,sBAAU,CAAC,MAAM;YACpB,MAAM,SAAS,GAAG,MAAsB,CAAC;YACzC,MAAM,IAAI,GAAG,IAAA,yBAAa,EACxB,IAAA,qCAAmB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,EACzC,oBAAQ,CAAC,SAAS,EAClB,IAAI,CAAC,kBAAkB,CACxB,CAAC;YAEF,kEAAkE;YAClE,uCAAuC;YACvC,MAAM,WAAW,GACf,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,IAAI,SAAS,CAAC,kBAAkB,CAAC;gBAC3D,CAAC,CAAC,SAAS,CAAC,QAAQ;gBACpB,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC;YAExC,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;YAC/C,IAAI,GAAG,2BAAY,CAAC,SAAS,CAAC;YAC9B,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC1B,MAAM;QACR,KAAK,sBAAU,CAAC,MAAM,CAAC;QACvB,KAAK,sBAAU,CAAC,IAAI,CAAC;QACrB,KAAK,sBAAU,CAAC,IAAI,CAAC;QACrB,KAAK,sBAAU,CAAC,IAAI,CAAC;QACrB,KAAK,sBAAU,CAAC,GAAG,CAAC;QACpB,KAAK,sBAAU,CAAC,UAAU,CAAC;QAC3B,KAAK,sBAAU,CAAC,KAAK;YACnB,QAAQ,GAAG,QAAQ,CAAC;YACpB,MAAM;QACR;YACE,MAAM,IAAI,KAAK,CAAC,eAAe,MAAM,CAAC,IAAI,8BAA8B,CAAC,CAAC;KAC7E;IAED,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;IACxD,OAAO;QACL,QAAQ;QACR,IAAI;QACJ,UAAU;QACV,UAAU,EAAE,MAAM,CAAC,IAAI,KAAK,sBAAU,CAAC,QAAQ;QAC/C,QAAQ,EAAE,UAAU;QACpB,YAAY;KACb,CAAC;AACJ,CAAC;AAxID,4CAwIC;AAED,SAAS,aAAa,CAAC,EAAE,IAAI,EAAe;IAC1C,OAAO,CAAC,2BAAY,CAAC,SAAS,EAAE,2BAAY,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACpE,CAAC;AAED,SAAgB,gBAAgB,CAAC,QAAa;IAC5C,0EAA0E;IAC1E,OAAO,OAAO,QAAQ,CAAC,MAAM,KAAK,WAAW,CAAC;AAChD,CAAC;AAHD,4CAGC;AAED;;;GAGG;AACH,SAAgB,0BAA0B,CAAC,MAAc;IACvD,QAAQ,MAAM,CAAC,IAAI,EAAE;QACnB,KAAK,sBAAU,CAAC,IAAI;YAClB,OAAO,0GAA0G,CAAC;QACpH,KAAK,sBAAU,CAAC,UAAU;YACxB,OAAO,gFAAgF,CAAC;QAC1F;YACE,OAAO,EAAE,CAAC;KACb;AACH,CAAC;AATD,gEASC;AAED,SAAgB,wBAAwB,CAAC,QAAkB;IACzD,MAAM,EAAE,cAAc,EAAE,GAAG,IAAA,oCAAkB,GAAE,CAAC;IAChD,MAAM,gBAAgB,GAAgB,IAAI,GAAG,EAAU,CAAC;IACxD,IAAI,uBAAuB,GAAW,EAAE,CAAC;IACzC,KAAK,MAAM,cAAc,IAAI,QAAQ,CAAC,OAAO,EAAE;QAC7C,IAAI,cAAc,CAAC,IAAI,KAAK,QAAQ,EAAE;
|
|
1
|
+
{"version":3,"file":"schemaHelpers.js","sourceRoot":"","sources":["../../../src/utils/schemaHelpers.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,yDAAmE;AAEnE,mDAa6B;AAC7B,iDAAmD;AACnD,uDAAwD;AACxD,2CAAsD;AACtD,qCAAkC;AAClC,wDAAwD;AAExD;;;;GAIG;AACH,SAAgB,gBAAgB,CAC9B,EAAE,OAAO,EAAgB,EACzB,aAAa,GAAG,KAAK;IAErB,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,EAAE,CAAC;KACX;IAED,MAAM,UAAU,GAAoB,aAAa;QAC/C,CAAC,CAAC,OAAO,CAAC,SAAS;QACnB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC;IAEhB,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,sBAAU,CAAC,MAAM,CAAC,CAAC;AAC9D,CAAC;AAbD,4CAaC;AAED;;;;GAIG;AACH,SAAgB,uBAAuB,CACrC,EAAE,OAAO,EAAgB,EACzB,aAAa,GAAG,KAAK;IAErB,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,UAAU,GAAoB,aAAa;QAC/C,CAAC,CAAC,OAAO,CAAC,SAAS;QACnB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC;IAEhB,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,sBAAU,CAAC,UAAU,CAAC,CAAC;AAChE,CAAC;AAbD,0DAaC;AAED;;;GAGG;AACH,SAAgB,gBAAgB,CAC9B,MAAc,EACd,aAAsB,KAAK,EAC3B,YAAqB,KAAK;IAE1B,IAAI,QAAQ,GAAW,EAAE,CAAC;IAC1B,IAAI,UAAU,GAAa,EAAE,CAAC;IAC9B,IAAI,YAAY,GAAG,SAAS,CAAC;IAC7B,IAAI,IAAI,GAAiB,2BAAY,CAAC,SAAS,CAAC;IAChD,QAAQ,MAAM,CAAC,IAAI,EAAE;QACnB,KAAK,sBAAU,CAAC,GAAG;YACjB,QAAQ,GAAG,KAAK,CAAC;YACjB,MAAM;QACR,KAAK,sBAAU,CAAC,KAAK;YACnB,MAAM,WAAW,GAAG,MAAqB,CAAC;YAC1C,MAAM,SAAS,GAAG,gBAAgB,CAChC,WAAW,CAAC,WAAW,EACvB,WAAW,CAAC,aAAa,EACzB,SAAS,CACV,CAAC;YACF,MAAM,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC;YACrC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC;YACtB,yEAAyE;YACzE,mEAAmE;YACnE,sBAAsB;YACtB,MAAM,gBAAgB,GAAG,SAAS,CAAC,QAAQ;gBACzC,CAAC,CAAC,GAAG,GAAG,SAAS,GAAG,GAAG;gBACvB,CAAC,CAAC,SAAS,CAAC;YACd,QAAQ,GAAG,GAAG,gBAAgB,IAAI,CAAC;YACnC,IAAI,aAAa,CAAC,SAAS,CAAC,EAAE;gBAC5B,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aAC5B;YACD,MAAM;QACR,KAAK,sBAAU,CAAC,OAAO;YACrB,QAAQ,GAAG,SAAS,CAAC;YACrB,MAAM;QACR,KAAK,sBAAU,CAAC,MAAM;YACpB,QAAQ,GAAG,CAAC,SAAS;gBACnB,CAAC,CAAC,0BAA0B;gBAC5B,CAAC,CAAC,kCAAkC,CAAC;YACvC,MAAM;QACR,KAAK,sBAAU,CAAC,SAAS;YACvB,QAAQ,GAAG,YAAY,CAAC;YACxB,MAAM;QACR,KAAK,sBAAU,CAAC,MAAM,CAAC;QACvB,KAAK,sBAAU,CAAC,YAAY;YAC1B,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,qCAAmB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAClE,QAAQ,GAAG,UAAU,CAAC;YACtB,IAAI,GAAG,2BAAY,CAAC,IAAI,CAAC;YACzB,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC5B,MAAM;QACR,KAAK,sBAAU,CAAC,QAAQ;YACtB,MAAM,cAAc,GAAG,MAAwB,CAAC;YAChD,MAAM,YAAY,GAAG,gBAAgB,CAAC,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;YACvE,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC;YACzB,IAAI,aAAa,CAAC,YAAY,CAAC,EAAE;gBAC/B,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aAC3B;YACD,YAAY,GAAG,IAAA,gCAAiB,EAC9B,cAAc,CAAC,KAAK,CAAC,KAAK,EAC1B,cAAc,CAAC,SAAS,CAAC,IAAI,EAC7B,KAAK,CACN,CAAC;YACF,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC;YACjC,MAAM;QACR,KAAK,sBAAU,CAAC,QAAQ,CAAC;QACzB,KAAK,sBAAU,CAAC,IAAI,CAAC;QACrB,KAAK,sBAAU,CAAC,QAAQ;YACtB,QAAQ,GAAG,MAAM,CAAC;YAClB,MAAM;QACR,KAAK,sBAAU,CAAC,QAAQ;YACtB,QAAQ,GAAG,QAAQ,CAAC;YACpB,MAAM;QACR,KAAK,sBAAU,CAAC,UAAU;YACxB,MAAM,gBAAgB,GAAG,MAA0B,CAAC;YACpD,MAAM,WAAW,GAAG,gBAAgB,CAClC,gBAAgB,CAAC,WAAW,EAC5B,gBAAgB,CAAC,aAAa,CAC/B,CAAC;YACF,MAAM,eAAe,GAAG,WAAW,CAAC,QAAQ,CAAC;YAC7C,IAAI,GAAG,2BAAY,CAAC,UAAU,CAAC;YAC/B,QAAQ,GAAG,4BAA4B,eAAe,GAAG,CAAC;YAC1D,IAAI,aAAa,CAAC,WAAW,CAAC,EAAE;gBAC9B,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aAClC;YACD,MAAM;QACR,KAAK,sBAAU,CAAC,SAAS;YACvB,IAAI,GAAG,2BAAY,CAAC,UAAU,CAAC;YAC/B,QAAQ,GAAG,yBAAyB,CAAC;YACrC,MAAM;QACR,KAAK,sBAAU,CAAC,MAAM,CAAC;QACvB,KAAK,sBAAU,CAAC,OAAO;YACrB,QAAQ,GAAG,QAAQ,CAAC;YACpB,MAAM;QAER,KAAK,sBAAU,CAAC,MAAM;YACpB,MAAM,SAAS,GAAG,MAAsB,CAAC;YACzC,MAAM,IAAI,GAAG,IAAA,yBAAa,EACxB,IAAA,qCAAmB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,EACzC,oBAAQ,CAAC,SAAS,EAClB,IAAI,CAAC,kBAAkB,CACxB,CAAC;YAEF,kEAAkE;YAClE,uCAAuC;YACvC,MAAM,WAAW,GACf,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,IAAI,SAAS,CAAC,kBAAkB,CAAC;gBAC3D,CAAC,CAAC,SAAS,CAAC,QAAQ;gBACpB,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC;YAExC,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;YAC/C,IAAI,GAAG,2BAAY,CAAC,SAAS,CAAC;YAC9B,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC1B,MAAM;QACR,KAAK,sBAAU,CAAC,MAAM,CAAC;QACvB,KAAK,sBAAU,CAAC,IAAI,CAAC;QACrB,KAAK,sBAAU,CAAC,IAAI,CAAC;QACrB,KAAK,sBAAU,CAAC,IAAI,CAAC;QACrB,KAAK,sBAAU,CAAC,GAAG,CAAC;QACpB,KAAK,sBAAU,CAAC,UAAU,CAAC;QAC3B,KAAK,sBAAU,CAAC,KAAK;YACnB,QAAQ,GAAG,QAAQ,CAAC;YACpB,MAAM;QACR;YACE,MAAM,IAAI,KAAK,CAAC,eAAe,MAAM,CAAC,IAAI,8BAA8B,CAAC,CAAC;KAC7E;IAED,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;IACxD,OAAO;QACL,QAAQ;QACR,IAAI;QACJ,UAAU;QACV,UAAU,EAAE,MAAM,CAAC,IAAI,KAAK,sBAAU,CAAC,QAAQ;QAC/C,QAAQ,EAAE,UAAU;QACpB,YAAY;KACb,CAAC;AACJ,CAAC;AAxID,4CAwIC;AAED,SAAS,aAAa,CAAC,EAAE,IAAI,EAAe;IAC1C,OAAO,CAAC,2BAAY,CAAC,SAAS,EAAE,2BAAY,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACpE,CAAC;AAED,SAAgB,gBAAgB,CAAC,QAAa;IAC5C,0EAA0E;IAC1E,OAAO,OAAO,QAAQ,CAAC,MAAM,KAAK,WAAW,CAAC;AAChD,CAAC;AAHD,4CAGC;AAED;;;GAGG;AACH,SAAgB,0BAA0B,CAAC,MAAc;IACvD,QAAQ,MAAM,CAAC,IAAI,EAAE;QACnB,KAAK,sBAAU,CAAC,IAAI;YAClB,OAAO,0GAA0G,CAAC;QACpH,KAAK,sBAAU,CAAC,UAAU;YACxB,OAAO,gFAAgF,CAAC;QAC1F;YACE,OAAO,EAAE,CAAC;KACb;AACH,CAAC;AATD,gEASC;AAED,SAAgB,wBAAwB,CAAC,QAAkB;IACzD,MAAM,EAAE,cAAc,EAAE,GAAG,IAAA,oCAAkB,GAAE,CAAC;IAChD,MAAM,gBAAgB,GAAgB,IAAI,GAAG,EAAU,CAAC;IACxD,IAAI,uBAAuB,GAAW,EAAE,CAAC;IACzC,IAAI,gBAAgB,GAAG,KAAK,CAAC;IAC7B,KAAK,MAAM,cAAc,IAAI,QAAQ,CAAC,OAAO,EAAE;QAC7C,IAAI,cAAc,CAAC,IAAI,KAAK,QAAQ,EAAE;YACpC,gBAAgB,GAAG,IAAI,CAAC;YACvB,cAAuC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBAC9D,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAChC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;oBAC1B,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;iBAC7B;YACH,CAAC,CAAC,CAAC;SACJ;aAAM,IACL,uBAAuB,KAAK,EAAE;YAC9B,cAAc,CAAC,IAAI,KAAK,KAAK;YAC5B,cAAoC,CAAC,EAAE,KAAK,6BAAiB,CAAC,MAAM,EACrE;YACA,uBAAuB,GAAI,cAAoC,CAAC,IAAI,CAAC;SACtE;aAAM,IACL,uBAAuB,KAAK,EAAE;YAC9B,uBAAuB,KAAM,cAAoC,CAAC,IAAI;YACtE,cAAc,CAAC,IAAI,KAAK,KAAK;YAC5B,cAAoC,CAAC,EAAE,KAAK,6BAAiB,CAAC,MAAM,EACrE;YACA,eAAM,CAAC,OAAO,CACZ,oEAAoE,CACrE,CAAC;SACH;KACF;IACD,MAAM,MAAM,GAAa,CAAC,GAAG,gBAAgB,CAAC,CAAC;IAC/C,IAAI,qBAAqB,GACvB,cAAc,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,sBAAsB,CAAC;IACrE,+DAA+D;IAC/D,IACE,cAAc,KAAK,IAAI;QACvB,CAAC,QAAQ,CAAC,sBAAsB;QAChC,MAAM,CAAC,MAAM,KAAK,CAAC;QACnB,uBAAuB,KAAK,EAAE,EAC9B;QACA,qBAAqB,GAAG,IAAI,CAAC;QAC7B,MAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;KACtD;IACD,OAAO;QACL,cAAc,EAAE,qBAAqB;QACrC,gBAAgB,EACd,CAAC,gBAAgB,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;QAC/D,uBAAuB,EAAE,uBAAuB;KACjD,CAAC;AACJ,CAAC;AAlDD,4DAkDC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@autorest/typescript",
|
|
3
|
-
"version": "6.0.
|
|
3
|
+
"version": "6.0.12",
|
|
4
4
|
"browser": {
|
|
5
5
|
"./test-browser/utils/stream-helpers.js": "./test-browser/utils/stream-helpers.browser.js",
|
|
6
6
|
"./test-browser/utils/fileSystem.js": "./test-browser/utils/fileSystem.browser.js",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"source-map-support": "^0.5.16",
|
|
36
36
|
"ts-morph": "^15.1.0",
|
|
37
37
|
"@azure/core-auth": "^1.3.2",
|
|
38
|
-
"@azure-tools/rlc-common": "^0.
|
|
38
|
+
"@azure-tools/rlc-common": "^0.18.0"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
41
|
"@azure-tools/test-recorder": "^3.0.0",
|
|
@@ -233,8 +233,10 @@ export function getSecurityInfoFromModel(security: Security) {
|
|
|
233
233
|
const { addCredentials } = getAutorestOptions();
|
|
234
234
|
const credentialScopes: Set<string> = new Set<string>();
|
|
235
235
|
let credentialKeyHeaderName: string = "";
|
|
236
|
+
let hasOAuth2Defined = false;
|
|
236
237
|
for (const securitySchema of security.schemes) {
|
|
237
238
|
if (securitySchema.type === "OAuth2") {
|
|
239
|
+
hasOAuth2Defined = true;
|
|
238
240
|
(securitySchema as OAuth2SecurityScheme).scopes.forEach(scope => {
|
|
239
241
|
const scopes = scope.split(",");
|
|
240
242
|
for (const scope of scopes) {
|
|
@@ -273,7 +275,8 @@ export function getSecurityInfoFromModel(security: Security) {
|
|
|
273
275
|
}
|
|
274
276
|
return {
|
|
275
277
|
addCredentials: refinedAddCredentials,
|
|
276
|
-
credentialScopes:
|
|
278
|
+
credentialScopes:
|
|
279
|
+
!hasOAuth2Defined && scopes.length === 0 ? undefined : scopes,
|
|
277
280
|
credentialKeyHeaderName: credentialKeyHeaderName
|
|
278
281
|
};
|
|
279
282
|
}
|