Flip global name and display name

Author: hhvrc

API/Controller/OAuth/SignupGetData.cs

@@ -59,7 +59,7 @@ public async Task<IActionResult> OAuthSignupGetData([FromRoute] string provider)
         {
             Provider = auth.Provider,
             Email = auth.Principal.FindFirst(ClaimTypes.Email)?.Value,
-            DisplayName = auth.Principal.FindFirst(ClaimTypes.Name)?.Value ?? auth.Principal.FindFirst(OAuthConstants.ClaimGlobalName)?.Value,
+            DisplayName = auth.ExternalAccountDisplayName ?? auth.ExternalAccountName,
             ExpiresAt = auth.Properties.ExpiresUtc!.Value.UtcDateTime
         });
     }

API/Controller/OAuth/_ApiController.cs

@@ -76,15 +76,15 @@ private async Task<OneOf<ValidatedFlowContext, OAuthValidationError>> ValidateOA
             return OAuthValidationError.FlowDataMissingOrInvalid;
         }
 
-        string? displayName = auth.Principal.FindFirst(ClaimTypes.Name)?.Value;
-        string? globalName = auth.Principal.FindFirst(OAuthConstants.ClaimGlobalName)?.Value;
+        var name = auth.Principal.FindFirst(ClaimTypes.Name)?.Value;
+        var displayName = auth.Principal.FindFirst(OAuthConstants.ClaimDisplayName)?.Value;
 
         return new ValidatedFlowContext(
             Provider: actualScheme,
             Flow: flow,
             ExternalAccountId: externalId,
-            ExternalAccountName: globalName ?? displayName,
-            ExternalAccountDisplayName: displayName ?? globalName,
+            ExternalAccountName: name ?? displayName,
+            ExternalAccountDisplayName: displayName ?? name,
             Principal: auth.Principal,
             Properties: auth.Properties
         );

API/OAuth/OAuthConstants.cs

@@ -11,5 +11,5 @@ public static class OAuthConstants
     public const string ItemKeyFlowType = ".FlowType";
 
     public const string ClaimEmailVerified = "openshock.oauth.email_verified";
-    public const string ClaimGlobalName = "openshock.oauth.global_name";
+    public const string ClaimDisplayName = "openshock.oauth.display_name";
 }

API/Program.cs

@@ -56,7 +56,7 @@
                 o.SaveTokens = false;
 
                 o.ClaimActions.MapJsonKey(OAuthConstants.ClaimEmailVerified, "verified");
-                o.ClaimActions.MapJsonKey(OAuthConstants.ClaimGlobalName, "global_name");
+                o.ClaimActions.MapJsonKey(OAuthConstants.ClaimDisplayName, "global_name");
 
                 o.Validate();
             });