set default audience on LexAuthUser, exclude unknown as a valid audie…

…nce, update schema.graphql
sillsdev · Oct 20, 2023 · f3b6cd0 · f3b6cd0
1 parent 810ad47
commit f3b6cd0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/backend/LexBoxApi/Auth/LexAuthService.cs b/backend/LexBoxApi/Auth/LexAuthService.cs
@@ -45,7 +45,7 @@ public static TokenValidationParameters TokenValidationParameters(JwtOptions jwt
             IssuerSigningKey = GetSigningKey(jwtOptions),
             //default audience, used for cookie tokens in JwtTicketDataFormat
             ValidAudience = LexboxAudience.LexboxApi.ToString(),
-            ValidAudiences = Enum.GetNames(typeof(LexboxAudience)),
+            ValidAudiences = Enum.GetNames<LexboxAudience>().Where(a => a != LexboxAudience.Unknown.ToString()),
             ValidIssuer = LexboxAudience.LexboxApi.ToString(),
             RequireSignedTokens = true,
             RequireExpirationTime = true,

diff --git a/backend/LexCore/Auth/LexAuthUser.cs b/backend/LexCore/Auth/LexAuthUser.cs
@@ -82,8 +82,9 @@ public LexAuthUser(User user)
 
     [JsonPropertyName(LexAuthConstants.IdClaimType)]
     public required Guid Id { get; set; }
+
     [JsonPropertyName(LexAuthConstants.AudienceClaimType)]
-    public LexboxAudience Audience { get; set; }
+    public LexboxAudience Audience { get; set; } = LexboxAudience.LexboxApi;
 
     [JsonPropertyName(LexAuthConstants.EmailClaimType)]
     public required string Email { get; set; }

diff --git a/frontend/schema.graphql b/frontend/schema.graphql
@@ -485,8 +485,10 @@ enum DbErrorCode {
 }
 
 enum LexboxAudience {
+  UNKNOWN
   LEXBOX_API
   FORGOT_PASSWORD
+  SEND_AND_RECEIVE
 }
 
 enum ProjectMigrationStatus {