B-60117 Refactored authn and authz metrics for accuracy