From f4df883cb1a47c1af7d3666148bf9b40beee2447 Mon Sep 17 00:00:00 2001
From: Safia Abdalla <safia@safia.rocks>
Date: Thu, 16 Jun 2022 17:36:52 -0700
Subject: [PATCH 1/2] Add support for --output option in user-jwts create

---
 .../src/Commands/CreateCommand.cs             | 28 +++++++--
 src/Tools/dotnet-user-jwts/src/Resources.resx | 59 ++++++++++---------
 .../dotnet-user-jwts/test/UserJwtsTests.cs    | 30 ++++++++++
 3 files changed, 84 insertions(+), 33 deletions(-)

diff --git a/src/Tools/dotnet-user-jwts/src/Commands/CreateCommand.cs b/src/Tools/dotnet-user-jwts/src/Commands/CreateCommand.cs
index 0b6dda38a89f..63a3342b95e0 100644
--- a/src/Tools/dotnet-user-jwts/src/Commands/CreateCommand.cs
+++ b/src/Tools/dotnet-user-jwts/src/Commands/CreateCommand.cs
@@ -4,6 +4,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Text;
+using System.Text.Json;
 using Microsoft.Extensions.CommandLineUtils;
 using Microsoft.Extensions.Tools.Internal;
 
@@ -77,6 +78,11 @@ public static void Register(ProjectCommandLineApplication app)
                 Resources.CreateCommand_ValidForOption_Description,
                 CommandOptionType.SingleValue);
 
+            var outputOption = cmd.Option(
+                "-o|--output",
+                Resources.CreateCommand_OutputOption_Description,
+                CommandOptionType.SingleValue);
+
             cmd.HelpOption("-h|--help");
 
             cmd.OnExecute(() =>
@@ -89,7 +95,7 @@ public static void Register(ProjectCommandLineApplication app)
                     return 1;
                 }
 
-                return Execute(cmd.Reporter, cmd.ProjectOption.Value(), options, optionsString);
+                return Execute(cmd.Reporter, cmd.ProjectOption.Value(), options, optionsString, outputOption.Value());
             });
         });
     }
@@ -208,7 +214,8 @@ private static int Execute(
         IReporter reporter,
         string projectPath,
         JwtCreatorOptions options,
-        string optionsString)
+        string optionsString,
+        string outputFormat)
     {
         if (!DevJwtCliHelpers.GetProjectAndSecretsId(projectPath, reporter, out var project, out var userSecretsId))
         {
@@ -232,9 +239,20 @@ private static int Execute(
         var settingsToWrite = new JwtAuthenticationSchemeSettings(options.Scheme, options.Audiences, options.Issuer);
         settingsToWrite.Save(appsettingsFilePath);
 
-        reporter.Output(Resources.FormatCreateCommand_Confirmed(jwtToken.Id));
-        reporter.Output(optionsString);
-        reporter.Output($"{Resources.JwtPrint_Token}: {jwt.Token}");
+        switch (outputFormat)
+        {
+            case "token":
+                reporter.Output(jwt.Token);
+                break;
+            case "json":
+                reporter.Output(JsonSerializer.Serialize(jwt, new JsonSerializerOptions { WriteIndented = true }));
+                break;
+            default:
+                reporter.Output(Resources.FormatCreateCommand_Confirmed(jwtToken.Id));
+                reporter.Output(optionsString);
+                reporter.Output($"{Resources.JwtPrint_Token}: {jwt.Token}");
+                break;
+        }
 
         return 0;
     }
diff --git a/src/Tools/dotnet-user-jwts/src/Resources.resx b/src/Tools/dotnet-user-jwts/src/Resources.resx
index 3bd782f5b052..0bfbfca75055 100644
--- a/src/Tools/dotnet-user-jwts/src/Resources.resx
+++ b/src/Tools/dotnet-user-jwts/src/Resources.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!--
-    Microsoft ResX Schema
-
+  <!-- 
+    Microsoft ResX Schema 
+    
     Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
     associated with the data types.
-
+    
     Example:
-
+    
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-
-    There are any number of "resheader" rows that contain simple
+                
+    There are any number of "resheader" rows that contain simple 
     name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
     mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
     extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
     read any of the formats listed below.
-
+    
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-
+    
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
+    value   : The object must be serialized into a byte array 
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -174,6 +174,9 @@
   <data name="CreateCommand_NotBeforeOption_Description" xml:space="preserve">
     <value>The UTC date &amp; time the JWT should not be valid before in the format 'yyyy-MM-dd [[HH:mm[[:ss]]]]'. Defaults to the date &amp; time the JWT is created.</value>
   </data>
+  <data name="CreateCommand_OutputOption_Description" xml:space="preserve">
+    <value>The forma to use for displaying output from the command. Can be one of 'default', 'token', or 'json'.</value>
+  </data>
   <data name="CreateCommand_RoleOption_Description" xml:space="preserve">
     <value>A role claim to add to the JWT. Specify once for each role.</value>
   </data>
@@ -300,4 +303,4 @@
   <data name="RemoveCommand_NoJwtFound" xml:space="preserve">
     <value>No JWT with ID '{0}' found.</value>
   </data>
-</root>
+</root>
\ No newline at end of file
diff --git a/src/Tools/dotnet-user-jwts/test/UserJwtsTests.cs b/src/Tools/dotnet-user-jwts/test/UserJwtsTests.cs
index 44a2a94798f7..bfacf663d61f 100644
--- a/src/Tools/dotnet-user-jwts/test/UserJwtsTests.cs
+++ b/src/Tools/dotnet-user-jwts/test/UserJwtsTests.cs
@@ -12,6 +12,8 @@
 using Xunit;
 using Xunit.Abstractions;
 using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.IdentityModel.Tokens.Jwt;
 
 namespace Microsoft.AspNetCore.Authentication.JwtBearer.Tools.Tests;
 
@@ -277,4 +279,32 @@ public void PrintComamnd_ShowsAllOptionsWithShowAll()
         Assert.Contains($"Roles: [none]", output);
         Assert.Contains($"Custom Claims: [foo=bar]", output);
     }
+
+    [Fact]
+    public void Create_WithJsonOutput_CanBeSerialized()
+    {
+        var project = Path.Combine(_fixture.CreateProject(), "TestProject.csproj");
+        var app = new Program(_console);
+
+        app.Run(new[] { "create", "--project", project, "--output", "json" });
+        var output = _console.GetOutput();
+        var deserialized = JsonSerializer.Deserialize<Jwt>(output);
+
+        Assert.NotNull(deserialized);
+        Assert.Equal("Bearer", deserialized.Scheme);
+        Assert.Equal(Environment.UserName, deserialized.Name);
+    }
+
+    [Fact]
+    public void Create_WithTokenOutput_ProducesSingleValue()
+    {
+        var project = Path.Combine(_fixture.CreateProject(), "TestProject.csproj");
+        var app = new Program(_console);
+
+        app.Run(new[] { "create", "--project", project, "-o", "token" });
+        var output = _console.GetOutput();
+
+        var handler = new JwtSecurityTokenHandler();
+        Assert.True(handler.CanReadToken(output.Trim()));
+    }
 }

From 2254ac42c8d1562f5c100e60684ca170f2c3b62e Mon Sep 17 00:00:00 2001
From: Safia Abdalla <safia@safia.rocks>
Date: Thu, 16 Jun 2022 18:09:41 -0700
Subject: [PATCH 2/2] Update src/Tools/dotnet-user-jwts/src/Resources.resx

Co-authored-by: Brennan <brecon@microsoft.com>
---
 src/Tools/dotnet-user-jwts/src/Resources.resx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tools/dotnet-user-jwts/src/Resources.resx b/src/Tools/dotnet-user-jwts/src/Resources.resx
index 0bfbfca75055..9a7dd45dbd52 100644
--- a/src/Tools/dotnet-user-jwts/src/Resources.resx
+++ b/src/Tools/dotnet-user-jwts/src/Resources.resx
@@ -175,7 +175,7 @@
     <value>The UTC date &amp; time the JWT should not be valid before in the format 'yyyy-MM-dd [[HH:mm[[:ss]]]]'. Defaults to the date &amp; time the JWT is created.</value>
   </data>
   <data name="CreateCommand_OutputOption_Description" xml:space="preserve">
-    <value>The forma to use for displaying output from the command. Can be one of 'default', 'token', or 'json'.</value>
+    <value>The format to use for displaying output from the command. Can be one of 'default', 'token', or 'json'.</value>
   </data>
   <data name="CreateCommand_RoleOption_Description" xml:space="preserve">
     <value>A role claim to add to the JWT. Specify once for each role.</value>