Updated HttpContext gRPC conversion to fit updated identity protobuf.

Author: kashimiz

src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj

@@ -41,10 +41,6 @@
     </Reference>
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Messages\" />
-  </ItemGroup>
-  
   <Target Name="GenerateProtoFiles" BeforeTargets="BeforeBuild" Inputs="azure-functions-language-worker-protobuf/src/proto/FunctionRpc.proto" Outputs="Messages/DotNet/FunctionRpc.cs;Messages/DotNet/FunctionRpcGrpc.cs">
     <Exec Command="./generate_protos.$(Ext)" />
     <ItemGroup>

src/WebJobs.Script.Grpc/generate_protos.bat

@@ -47,7 +47,11 @@ mkdir %MSGDIR%
 set OUTDIR=%MSGDIR%\DotNet
 mkdir %OUTDIR%
 
-for /D %%D in (%PROTO_PATH%\*) do for %%F in (%%D\*.proto) do %GRPC_TOOLS_PATH%\protoc.exe %%F --csharp_out %OUTDIR% --grpc_out=%OUTDIR% --plugin=protoc-gen-grpc=%GRPC_TOOLS_PATH%\grpc_csharp_plugin.exe --proto_path=%%D --proto_path=%PROTOBUF_TOOLS%
+@rem generate shared types
+for %%F in (%PROTO_PATH%\shared\*) do %GRPC_TOOLS_PATH%\protoc.exe %%F --csharp_out %OUTDIR% --grpc_out=%OUTDIR% --plugin=protoc-gen-grpc=%GRPC_TOOLS_PATH%\grpc_csharp_plugin.exe --proto_path=%PROTO_PATH% --proto_path=%PROTOBUF_TOOLS%
+
+@rem generate other types
+for /D %%D in (%PROTO_PATH%\*) do for %%F in (%%D\*.proto) do %GRPC_TOOLS_PATH%\protoc.exe %%F --csharp_out %OUTDIR% --grpc_out=%OUTDIR% --plugin=protoc-gen-grpc=%GRPC_TOOLS_PATH%\grpc_csharp_plugin.exe --proto_path=%PROTO_PATH% --proto_path=%%D --proto_path=%PROTOBUF_TOOLS%
 
 %GRPC_TOOLS_PATH%\protoc.exe %PROTO% --csharp_out %OUTDIR% --grpc_out=%OUTDIR% --plugin=protoc-gen-grpc=%GRPC_TOOLS_PATH%\grpc_csharp_plugin.exe --proto_path=%PROTO_PATH% --proto_path=%PROTOBUF_TOOLS% 
 

src/WebJobs.Script.Grpc/generate_protos.sh

@@ -66,8 +66,14 @@ mkdir $MSGDIR
 OUTDIR=$MSGDIR/DotNet
 mkdir $OUTDIR
 
-for d in $PROTO_PATH/*/*.proto; do
-	$GRPC_TOOLS_PATH/protoc $d --csharp_out $OUTDIR --grpc_out=$OUTDIR --plugin=protoc-gen-grpc=$GRPC_TOOLS_PATH/grpc_csharp_plugin --proto_path=$PROTO_PATH --proto_path=$PROTOBUF_TOOLS
+#generate shared types
+for f in $PROTO_PATH/shared/*.proto; do
+	$GRPC_TOOLS_PATH/protoc $f --csharp_out $OUTDIR --grpc_out=$OUTDIR --plugin=protoc-gen-grpc=$GRPC_TOOLS_PATH/grpc_csharp_plugin --proto_path=$PROTO_PATH --proto_path=$PROTOBUF_TOOLS
+done
+
+#generate other types
+for f in $PROTO_PATH/*/*.proto; do
+	$GRPC_TOOLS_PATH/protoc $f --csharp_out $OUTDIR --grpc_out=$OUTDIR --plugin=protoc-gen-grpc=$GRPC_TOOLS_PATH/grpc_csharp_plugin --proto_path=$PROTO_PATH --proto_path=$PROTOBUF_TOOLS
 done
 
 $GRPC_TOOLS_PATH/protoc $PROTO --csharp_out $OUTDIR --grpc_out=$OUTDIR --plugin=protoc-gen-grpc=$GRPC_TOOLS_PATH/grpc_csharp_plugin --proto_path=$PROTO_PATH --proto_path=$PROTOBUF_TOOLS

src/WebJobs.Script/Rpc/MessageExtensions/RpcMessageConversionExtensions.cs

@@ -112,17 +112,17 @@ public static TypedData ToRpc(this object value, ILogger logger)
                         var rpcClaimsIdentity = new RpcClaimsIdentity();
                         if (id.AuthenticationType != null)
                         {
-                            rpcClaimsIdentity.AuthenticationType = id.AuthenticationType;
+                            rpcClaimsIdentity.AuthenticationType = new NullableString { Value = id.AuthenticationType };
                         }
 
                         if (id.NameClaimType != null)
                         {
-                            rpcClaimsIdentity.NameClaimType = id.NameClaimType;
+                            rpcClaimsIdentity.NameClaimType = new NullableString { Value = id.NameClaimType };
                         }
 
                         if (id.RoleClaimType != null)
                         {
-                            rpcClaimsIdentity.RoleClaimType = id.RoleClaimType;
+                            rpcClaimsIdentity.RoleClaimType = new NullableString { Value = id.RoleClaimType };
                         }
 
                         foreach (var claim in id.Claims)

test/WebJobs.Script.Tests/Rpc/RpcMessageConversionExtensionsTests.cs

@@ -104,7 +104,8 @@ public void HttpObjects_ClaimsPrincipal()
             {
                 new Claim("http://schemas.microsoft.com/2017/07/functions/claims/authlevel", "Function")
             }, "WebJobsAuthLevel");
-            var claimsIdentities = new List<ClaimsIdentity> { claimsIdentity1, claimsIdentity2 };
+            var claimsIdentity3 = new ClaimsIdentity();
+            var claimsIdentities = new List<ClaimsIdentity> { claimsIdentity1, claimsIdentity2, claimsIdentity3 };
 
             request.HttpContext.User = new ClaimsPrincipal(claimsIdentities);
 
@@ -113,7 +114,7 @@ public void HttpObjects_ClaimsPrincipal()
             var identities = request.HttpContext.User.Identities.ToList();
             var rpcIdentities = rpcRequestObject.Http.Identities.ToList();
 
-            Assert.Equal(2, rpcIdentities.Count);
+            Assert.Equal(claimsIdentities.Count, rpcIdentities.Count);
 
             for (int i = 0; i < identities.Count; i++)
             {
@@ -123,9 +124,9 @@ public void HttpObjects_ClaimsPrincipal()
                 Assert.NotNull(identity);
                 Assert.NotNull(rpcIdentity);
 
-                Assert.Equal(rpcIdentity.AuthenticationType, identity.AuthenticationType);
-                Assert.Equal(rpcIdentity.NameClaimType, identity.NameClaimType);
-                Assert.Equal(rpcIdentity.RoleClaimType, identity.RoleClaimType);
+                Assert.Equal(rpcIdentity.AuthenticationType?.Value, identity.AuthenticationType);
+                Assert.Equal(rpcIdentity.NameClaimType?.Value, identity.NameClaimType);
+                Assert.Equal(rpcIdentity.RoleClaimType?.Value, identity.RoleClaimType);
 
                 var claims = identity.Claims.ToList();
                 for (int j = 0; j < claims.Count; j++)