move system token override logic

anaconda_anon_usage/patch.py

@@ -8,7 +8,7 @@
 from conda.auxlib.decorators import memoizedproperty
 from conda.base.context import Context, ParameterLoader, PrimitiveParameter, context
 
-from .tokens import token_string
+from .tokens import system_token, token_string
 from .utils import _debug
 
 
@@ -18,7 +18,14 @@ def _new_user_agent(ctx):
         getattr(Context, "checked_prefix", None) or context.target_prefix or sys.prefix
     )
     try:
-        token = token_string(prefix, context.anaconda_anon_usage)
+        # If an organization token exists, it overrides the value of
+        # context.anaconda_anon_usage. This is effectively equivalent
+        # to putting an anaconda_anon_usage: true configuration higher
+        # in the config search path.
+        is_enabled = context.anaconda_anon_usage or system_token()
+        if is_enabled and not context.anaconda_anon_usage:
+            _debug("system token overriding the config setting")
+        token = token_string(prefix, is_enabled)
         if token:
             result += " " + token
     except Exception:  # pragma: nocover

anaconda_anon_usage/tokens.py

@@ -119,9 +119,7 @@ def token_string(prefix=None, enabled=True):
     appended to the conda user agent.
     """
     parts = ["aau/" + __version__]
-    if enabled or system_token():
-        if not enabled:
-            _debug("anaconda_anon_usage enabled by system token")
+    if enabled:
         values = all_tokens(prefix)
         if values.client:
             parts.append("c/" + values.client)

tests/unit/test_tokens.py

@@ -42,11 +42,6 @@ def test_token_string_with_system(system_token):
     assert "o/" + system_token in token_string
 
 
-def test_token_string_disabled_override_system(system_token):
-    token_string = tokens.token_string(enabled=False)
-    assert "o/" + system_token in token_string
-
-
 def test_token_string_no_client_token(monkeypatch, system_token):
     def _mock_saved_token(*args, **kwargs):
         return ""