Fix if/else logic

Emyrk · Emyrk · commit f39cee016870 · 2023-02-13T22:45:29.000-06:00
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -44,18 +44,8 @@ func logNotAuthorizedError(ctx context.Context, logger slog.Logger, err error) e
 	// Only log the errors if it is an UnauthorizedError error.
 	internalError := new(rbac.UnauthorizedError)
 	if err != nil && xerrors.As(err, &internalError) {
-		// A common false flag is when the user cancels the request. This can be checked
-		// by checking if the error is a topdown.Error and if the error code is
-		// topdown.CancelErr. If the error is not a topdown.Error, or the code is not
-		// topdown.CancelErr, then we should log it.
 		e := new(topdown.Error)
-		if !xerrors.As(err, &e) || e.Code != topdown.CancelErr {
-			logger.Debug(ctx, "unauthorized",
-				slog.F("internal", internalError.Internal()),
-				slog.F("input", internalError.Input()),
-				slog.Error(err),
-			)
-		} else {
+		if xerrors.As(err, &e) || e.Code != topdown.CancelErr {
 			// For some reason rego changes a cancelled context to a topdown.CancelErr. We
 			// expect to check for cancelled context errors if the user cancels the request,
 			// so we should change the error to a context.Canceled error.
@@ -65,6 +55,11 @@ func logNotAuthorizedError(ctx context.Context, logger slog.Logger, err error) e
 			internalError.SetInternal(context.Canceled)
 			return internalError
 		}
+		logger.Debug(ctx, "unauthorized",
+			slog.F("internal", internalError.Internal()),
+			slog.F("input", internalError.Input()),
+			slog.Error(err),
+		)
 	}
 	return NotAuthorizedError{
 		Err: err,
