update

Author: baoduy

Apim/ApiProduct/PolicyBuilder.ts

@@ -1,5 +1,6 @@
 import { isPrd } from '../../Common/AzureEnv';
 import { getIpsRange } from '../../VNet/Helper';
+import { organization } from '../../Common/StackEnv';
 
 const defaultRateLimit = isPrd ? 60 : 120;
 const enableApimEventHub = false;
@@ -85,16 +86,20 @@ const getInClientCertValidate = ({
   verifyCert,
 }: ClientCertProps) =>
   `   <choose>
-        <when condition="@(context.Request.Certificate == null${verifyCert
-    ? ' || !context.Request.Certificate.VerifyNoRevocation()'
-    : ''
-  }${issuer ? ` || context.Request.Certificate.Issuer != "${issuer}"` : ''
-  }${subject
-    ? ` || context.Request.Certificate.SubjectName.Name != "${subject}"`
-    : ''
-  }${thumbprint
-    ? ` || context.Request.Certificate.Thumbprint != "${thumbprint}"`
-    : ''
+        <when condition="@(context.Request.Certificate == null${
+          verifyCert
+            ? ' || !context.Request.Certificate.VerifyNoRevocation()'
+            : ''
+        }${
+    issuer ? ` || context.Request.Certificate.Issuer != "${issuer}"` : ''
+  }${
+    subject
+      ? ` || context.Request.Certificate.SubjectName.Name != "${subject}"`
+      : ''
+  }${
+    thumbprint
+      ? ` || context.Request.Certificate.Thumbprint != "${thumbprint}"`
+      : ''
   })" >
           <return-response>
             <set-status code="403" reason="Invalid client certificate" />
@@ -141,7 +146,8 @@ const getEventHubPolicy = ({
 
   const rs = `
   <set-variable name="message-id" value="@(Guid.NewGuid())" />
-  ${enableIpStack
+  ${
+    enableIpStack
       ? `
   <set-variable name="ipstackBaseUrl" value="@("${azFuncUrl}?ipAddress=" + context.Request.IpAddress)" />
   <send-request mode="new" response-variable-name="ipstackResponse" timeout="2" ignore-error="true">
@@ -152,7 +158,7 @@ const getEventHubPolicy = ({
     </set-header>
   </send-request>`
       : ''
-    }
+  }
 
   <log-to-eventhub logger-id="${eventHubName}" partition-id="0">@{
       string accountId = "";
@@ -180,20 +186,22 @@ const getEventHubPolicy = ({
       }
 
       string ipLocation = "";
-${enableIpStack
-      ? `
+${
+  enableIpStack
+    ? `
       try {
         var ipstackResponse = ((IResponse)context.Variables["ipstackResponse"]);
         if (ipstackResponse.StatusCode == 200) { 
             ipLocation = (((IResponse)context.Variables["ipstackResponse"]).Body?.As<JObject>()["country_name"]).ToString();
         }
       }catch {}`
-      : ''
-    }
+    : ''
+}
 
       string clientThumbprint = "";
-${captureClientCertThumbprint
-      ? `
+${
+  captureClientCertThumbprint
+    ? `
       string xCert = context.Request.Headers.GetValueOrDefault("X-ARR-ClientCert", "");
       if(context.Request.Certificate != null){
         clientThumbprint = context.Request.Certificate.Thumbprint;
@@ -203,8 +211,8 @@ ${captureClientCertThumbprint
       }
       else{ clientThumbprint = "Not found";}
 `
-      : ''
-    }
+    : ''
+}
 
       return new JObject(
         new JProperty("MessageId", context.Variables["message-id"]),
@@ -335,9 +343,11 @@ interface CheckHeaders {
 const checkHeaderPolicy = ({ checkHeaders }: CheckHeaders) => {
   return checkHeaders
     .map((c) => {
-      return `<check-header name="${c.name
-        }" failed-check-httpcode="401" failed-check-error-message="The header ${c.name
-        } is not found" ignore-case="true">
+      return `<check-header name="${
+        c.name
+      }" failed-check-httpcode="401" failed-check-error-message="The header ${
+        c.name
+      } is not found" ignore-case="true">
     ${c.value ? c.value.map((v) => `<value>${v}</value>`).join('\n') : ''}
 </check-header>`;
     })
@@ -398,7 +408,8 @@ export const getPolicies = ({
   const inbound = new Array<string>();
   const outbound = new Array<string>();
 
-  const getProps = <T>(p: T) => (typeof p === 'boolean' ? {} : p);
+  const getProps = <T>(p: T | boolean) =>
+    (typeof p === 'boolean' ? {} : p) as T;
 
   if (enableClientIpHeader) {
     inbound.push(setClientIpHeader());
@@ -505,27 +516,29 @@ export const getPolicies = ({
       <set-header name="X-AspNet-Version" exists-action="delete" />
       
       ${outbound.join('\n')}
-      ${enableApimEventHub && props.logEventHubName
-      ? getEventHubPolicy({
-        eventHubName: props.logEventHubName,
-        azFuncUrl: props.azFuncUrl,
-        azFuncKey: props.azFuncKey,
-        captureClientCertThumbprint: props.captureClientCertThumbprint,
-      })
-      : ''
-    }
+      ${
+        enableApimEventHub && props.logEventHubName
+          ? getEventHubPolicy({
+              eventHubName: props.logEventHubName,
+              azFuncUrl: props.azFuncUrl,
+              azFuncKey: props.azFuncKey,
+              captureClientCertThumbprint: props.captureClientCertThumbprint,
+            })
+          : ''
+      }
   </outbound>
   <on-error>
       <base />
-      ${enableApimEventHub && props.logEventHubName
-      ? getEventHubPolicy({
-        eventHubName: props.logEventHubName,
-        azFuncUrl: props.azFuncUrl,
-        azFuncKey: props.azFuncKey,
-        captureClientCertThumbprint: props.captureClientCertThumbprint,
-      })
-      : ''
-    }
+      ${
+        enableApimEventHub && props.logEventHubName
+          ? getEventHubPolicy({
+              eventHubName: props.logEventHubName,
+              azFuncUrl: props.azFuncUrl,
+              azFuncKey: props.azFuncKey,
+              captureClientCertThumbprint: props.captureClientCertThumbprint,
+            })
+          : ''
+      }
   </on-error>
 </policies>`;
 };