Fix auth middleware

SwissLife-OSS · Mar 4, 2021 · cd09a29 · cd09a29
1 parent 395dbaa
commit cd09a29
Showing 1 changed file with 24 additions and 19 deletions.
diff --git a/src/Extensions.HotChocolate/Validation/BewitAuthorizationMiddleware.cs b/src/Extensions.HotChocolate/Validation/BewitAuthorizationMiddleware.cs
@@ -28,38 +28,43 @@ public BewitAuthorizationMiddleware(
 
         public async Task InvokeAsync(IMiddlewareContext context)
         {
-            try
+            if (context.ContextData.TryGetValue(BewitTokenHeader.Value, out var objectToken) &&
+                objectToken is string bewitToken)
             {
-                if (context.ContextData.TryGetValue(
-                        BewitTokenHeader.Value, out var objectToken) &&
-                    objectToken is string bewitToken)
+                try
                 {
                     object payload = await _tokenValidator.ValidateBewitTokenAsync(
                         new BewitToken<T>(bewitToken),
                         context.RequestAborted);
 
                     _httpContextAccessor.SetBewitPayload(payload);
-
-                    await _next(context);
                 }
-                else
+                catch (Exception ex)
                 {
-                    context.Result = ErrorBuilder.New()
-                        .SetMessage("NotAuthorized")
-                        .SetPath(context.Path)
-                        .AddLocation(context.FieldSelection)
-                        .Build();
+                    CreateError(context, ex);
                 }
+
+                await _next(context);
             }
-            catch (Exception ex)
+            else
             {
-                context.Result = ErrorBuilder.New()
-                    .SetMessage("NotAuthorized")
-                    .SetPath(context.Path)
-                    .SetException(ex)
-                    .AddLocation(context.FieldSelection)
-                    .Build();
+                CreateError(context);
             }
         }
+
+        private void CreateError(IMiddlewareContext context, Exception ex = default)
+        {
+            IErrorBuilder errorBuilder = ErrorBuilder.New()
+                .SetMessage("NotAuthorized")
+                .SetPath(context.Path)
+                .AddLocation(context.FieldSelection);
+
+            if (ex != default)
+            {
+                errorBuilder.SetException(ex);
+            }
+
+            context.Result = errorBuilder.Build();
+        }
     }
 }