@typespec/http-client-csharp 0.1.9-alpha.20240730.2 → 0.1.9-alpha.20240731.1

package/dist/emitter/lib/service-authentication.js

@@ -1,53 +1,84 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 import { Logger } from "./logger.js";
-export function processServiceAuthentication(authentication) {
-    const auth = {};
-    let scopes;
-    for (const option of authentication.options) {
-        for (const scheme of option.schemes) {
-            switch (scheme.type) {
-                case "apiKey":
-                    auth.ApiKey = { Name: scheme.name };
-                    break;
-                case "oauth2":
-                    for (const flow of scheme.flows) {
-                        if (flow.scopes) {
-                            scopes ??= new Set();
-                            for (const scope of flow.scopes) {
-                                scopes.add(scope.value);
-                            }
-                        }
-                    }
-                    break;
-                case "http":
-                    const schemeOrApiKeyPrefix = scheme.scheme;
-                    if (schemeOrApiKeyPrefix === "basic") {
-                        Logger.getInstance().warn(`{schemeOrApiKeyPrefix} auth method is currently not supported.`);
-                    }
-                    else if (schemeOrApiKeyPrefix === "bearer") {
-                        auth.ApiKey = {
-                            Name: "Authorization",
-                            Prefix: "Bearer",
+export function processServiceAuthentication(sdkPackage) {
+    let authClientParameter = undefined;
+    for (const client of sdkPackage.clients) {
+        for (const parameter of client.initialization.properties) {
+            if (parameter.kind === "credential") {
+                authClientParameter = parameter;
+                break;
+            }
+        }
+    }
+    if (!authClientParameter) {
+        return undefined;
+    }
+    if (authClientParameter.type.kind === "credential") {
+        return processAuthType(authClientParameter.type);
+    }
+    const inputAuth = {};
+    for (const authType of authClientParameter.type.values) {
+        // TODO: TCGC might change to []SdkCredentialType
+        const auth = processAuthType(authType);
+        if (auth?.ApiKey) {
+            inputAuth.ApiKey = auth.ApiKey;
+        }
+        if (auth?.OAuth2) {
+            inputAuth.OAuth2 = auth.OAuth2;
+        }
+    }
+    return inputAuth;
+}
+function processAuthType(credentialType) {
+    const scheme = credentialType.scheme;
+    switch (scheme.type) {
+        case "apiKey":
+            return { ApiKey: { Name: scheme.name } };
+        case "oauth2":
+            return processOAuth2(scheme);
+        case "http":
+            {
+                const schemeOrApiKeyPrefix = scheme.scheme;
+                switch (schemeOrApiKeyPrefix) {
+                    case "basic":
+                        Logger.getInstance().warn(`${schemeOrApiKeyPrefix} auth method is currently not supported.`);
+                        return undefined;
+                    case "bearer":
+                        return {
+                            ApiKey: {
+                                Name: "Authorization",
+                                Prefix: "Bearer",
+                            },
                         };
-                    }
-                    else {
-                        auth.ApiKey = {
-                            Name: "Authorization",
-                            Prefix: schemeOrApiKeyPrefix,
+                    default:
+                        return {
+                            ApiKey: {
+                                Name: "Authorization",
+                                Prefix: schemeOrApiKeyPrefix,
+                            },
                         };
-                    }
-                    break;
-                default:
-                    throw new Error("Not supported authentication.");
+                }
             }
-        }
+            break;
+        default:
+            throw new Error(`un-supported authentication scheme ${scheme.type}`);
     }
-    if (scopes) {
-        auth.OAuth2 = {
-            Scopes: Array.from(scopes.values()),
-        };
+}
+function processOAuth2(scheme) {
+    let scopes = undefined;
+    for (const flow of scheme.flows) {
+        if (flow.scopes) {
+            scopes ??= new Set();
+            for (const scope of flow.scopes) {
+                scopes.add(scope.value);
+            }
+        }
     }
-    return auth;
+    return scopes
+        ? {
+            OAuth2: { Scopes: Array.from(scopes.values()) },
+        }
+        : undefined;
 }
 //# sourceMappingURL=service-authentication.js.map

package/dist/emitter/lib/service-authentication.js.map

@@ -1 +1 @@
-{"version":3,"file":"service-authentication.js","sourceRoot":"","sources":["../../../emitter/src/lib/service-authentication.ts"],"names":[],"mappings":"AAAA,4DAA4D;AAC5D,+FAA+F;AAM/F,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,UAAU,4BAA4B,CAAC,cAA8B;IACzE,MAAM,IAAI,GAAG,EAAe,CAAC;IAC7B,IAAI,MAA+B,CAAC;IAEpC,KAAK,MAAM,MAAM,IAAI,cAAc,CAAC,OAAO,EAAE,CAAC;QAC5C,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACpC,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;gBACpB,KAAK,QAAQ;oBACX,IAAI,CAAC,MAAM,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAqB,CAAC;oBACvD,MAAM;gBACR,KAAK,QAAQ;oBACX,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;wBAChC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;4BAChB,MAAM,KAAK,IAAI,GAAG,EAAU,CAAC;4BAC7B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gCAChC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;4BAC1B,CAAC;wBACH,CAAC;oBACH,CAAC;oBACD,MAAM;gBACR,KAAK,MAAM;oBACT,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC;oBAC3C,IAAI,oBAAoB,KAAK,OAAO,EAAE,CAAC;wBACrC,MAAM,CAAC,WAAW,EAAE,CAAC,IAAI,CACvB,gEAAgE,CACjE,CAAC;oBACJ,CAAC;yBAAM,IAAI,oBAAoB,KAAK,QAAQ,EAAE,CAAC;wBAC7C,IAAI,CAAC,MAAM,GAAG;4BACZ,IAAI,EAAE,eAAe;4BACrB,MAAM,EAAE,QAAQ;yBACE,CAAC;oBACvB,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,MAAM,GAAG;4BACZ,IAAI,EAAE,eAAe;4BACrB,MAAM,EAAE,oBAAoB;yBACV,CAAC;oBACvB,CAAC;oBACD,MAAM;gBACR;oBACE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;YACrD,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACX,IAAI,CAAC,MAAM,GAAG;YACZ,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;SACjB,CAAC;IACvB,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"service-authentication.js","sourceRoot":"","sources":["../../../emitter/src/lib/service-authentication.ts"],"names":[],"mappings":"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"}

package/dist/emitter/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../emitter/src/lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,EACd,WAAW,GACZ,MAAM,6CAA6C,CAAC;AAGrD,OAAO,EAAE,2BAA2B,EAAE,MAAM,2CAA2C,CAAC;AAGxF,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,MAAM,UAAU,UAAU,CAAC,GAAW;IACpC,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAY;IAC7C,IAAI,KAAK,CAAC,IAAI,KAAK,EAAE,IAAI,KAAK,CAAC,cAAc,IAAI,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;QAC3E,OAAO,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAE,EAAY,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACzF,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,WAAW,CACzB,OAAmB,EACnB,IAAoE;IAEpE,MAAM,IAAI,GAAG,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3C,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO;QAAE,OAAO,IAAI,CAAC;IACvC,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;QACvB,MAAM,YAAY,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,YAAY,KAAK,EAAE,EAAE,CAAC;YACxB,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,EAAE,IAAa,CAAC,CAAC;YACrD,OAAO,QAAQ,CAAC,IAAI,CAAC;QACvB,CAAC;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,kCAAkC,CAChD,UAAoB,EACpB,IAAY,EACZ,aAAqB;IAErB,MAAM,aAAa,GAAY,aAAa,CAAC,WAAW,EAAE,KAAK,cAAc,CAAC;IAC9E,MAAM,SAAS,GAAc;QAC3B,IAAI,EAAE,QAAQ;KACf,CAAC;IACF,OAAO;QACL,IAAI,EAAE,IAAI;QACV,aAAa,EAAE,aAAa;QAC5B,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,eAAe,CAAC,MAAM;QAChC,YAAY,EAAE,KAAK;QACnB,mBAAmB,EAAE,KAAK;QAC1B,aAAa,EAAE,aAAa;QAC5B,UAAU,EAAE,IAAI;QAChB,UAAU,EAAE,KAAK;QACjB,eAAe,EAAE,KAAK;QACtB,OAAO,EAAE,KAAK;QACd,IAAI,EAAE,2BAA2B,CAAC,QAAQ;QAC1C,YAAY,EACV,UAAU,CAAC,MAAM,KAAK,CAAC;YACrB,CAAC,CAAE;gBACC,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;aACH;YACrB,CAAC,CAAC,SAAS;KACE,CAAC;AACtB,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../emitter/src/lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,EACd,WAAW,GACZ,MAAM,6CAA6C,CAAC;AAGrD,OAAO,EAAE,2BAA2B,EAAE,MAAM,2CAA2C,CAAC;AAGxF,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,MAAM,UAAU,UAAU,CAAC,GAAW;IACpC,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAY;IAC7C,IAAI,KAAK,CAAC,IAAI,KAAK,EAAE,IAAI,KAAK,CAAC,cAAc,IAAI,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;QAC3E,OAAO,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAE,EAAY,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACzF,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,WAAW,CACzB,OAAmB,EACnB,IAAoE;IAEpE,MAAM,IAAI,GAAG,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3C,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO;QAAE,OAAO,IAAI,CAAC;IACvC,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;QACvB,MAAM,YAAY,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,YAAY,KAAK,EAAE,EAAE,CAAC;YACxB,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,EAAE,IAAa,CAAC,CAAC;YACrD,OAAO,QAAQ,CAAC,IAAI,CAAC;QACvB,CAAC;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,kCAAkC,CAChD,UAAoB,EACpB,IAAY,EACZ,aAAqB;IAErB,MAAM,aAAa,GAAY,aAAa,CAAC,WAAW,EAAE,KAAK,cAAc,CAAC;IAC9E,MAAM,SAAS,GAAc;QAC3B,IAAI,EAAE,QAAQ;KACf,CAAC;IACF,OAAO;QACL,IAAI,EAAE,IAAI;QACV,aAAa,EAAE,aAAa;QAC5B,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,eAAe,CAAC,MAAM;QAChC,YAAY,EAAE,KAAK;QACnB,mBAAmB,EAAE,KAAK;QAC1B,aAAa,EAAE,aAAa;QAC5B,UAAU,EAAE,IAAI;QAChB,UAAU,EAAE,KAAK;QACjB,eAAe,EAAE,KAAK;QACtB,OAAO,EAAE,KAAK;QACd,IAAI,EAAE,2BAA2B,CAAC,QAAQ;QAC1C,YAAY,EACV,UAAU,CAAC,MAAM,KAAK,CAAC;YACrB,CAAC,CAAE;gBACC,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;aACH;YACrB,CAAC,CAAC,SAAS;KAChB,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-csharp",
-  "version": "0.1.9-alpha.20240730.2",
+  "version": "0.1.9-alpha.20240731.1",
   "author": "Microsoft Corporation",
   "description": "The typespec library that can be used to generate C# models from a TypeSpec REST protocol binding",
   "homepage": "https://github.com/Microsoft/typespec",