remoteRF-server 1.4.8__tar.gz → 1.4.9__tar.gz

{remoterf_server-1.4.8 → remoterf_server-1.4.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 1.4.8
+Version: 1.4.9
 Summary: RemoteRF server-side control package
 License: GPL-3.0-or-later
 Classifier: Programming Language :: Python :: 3

{remoterf_server-1.4.8 → remoterf_server-1.4.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "remoteRF-server"
-version = "1.4.8"
+version = "1.4.9"
 description = "RemoteRF server-side control package"
 license = { text = "GPL-3.0-or-later" }
 requires-python = ">=3.10"

{remoterf_server-1.4.8 → remoterf_server-1.4.9}/src/remoteRF_server/server/global_onboarding.py

@@ -179,14 +179,17 @@ def account_name(username: str) -> str:
 def invite(code_name: str, *, lan_only: bool = False) -> str:
     """What to hand a new user: the form `remoterf --register` accepts.
 
-    On a live Global deployment that is `<public hostname>/<code>`, which the
-    client resolves to this server from anywhere. A LAN-only group's code (or
+    On a live Global deployment that is `<deployment>/<code>` (e.g. `ucla/AB12C`),
+    which the client expands to `<deployment>.global.remoterf.net` from anywhere;
+    a lab on its own domain keeps the full `<hostname>/<code>`. A LAN-only group's code (or
     a deployment that is not on Global) is the bare code, entered after
     `remoterf -c -a <lan address>`.
     """
-    if state() == "active" and not lan_only and hostname():
-        return f"{hostname()}/{code_name}"
-    return code_name
+    host = hostname() if state() == "active" and not lan_only else None
+    if not host:
+        return code_name
+    slug, _, domain = host.partition(".")
+    return f"{slug if domain == 'global.remoterf.net' else host}/{code_name}"
 
 
 # -----------------------------

{remoterf_server-1.4.8 → remoterf_server-1.4.9}/src/remoteRF_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 1.4.8
+Version: 1.4.9
 Summary: RemoteRF server-side control package
 License: GPL-3.0-or-later
 Classifier: Programming Language :: Python :: 3

{remoterf_server-1.4.8 → remoterf_server-1.4.9}/tests/test_global_onboarding.py

@@ -708,7 +708,7 @@ class InviteTests(unittest.TestCase):
 
     def test_live_global_deployment_hands_out_the_full_form(self):
         g.update(GLOBAL_CONSENT="yes", GLOBAL_STATE="active", GLOBAL_FINAL_NAME="ucla-dev0")
-        self.assertEqual(g.invite("RERGSOQ5"), "ucla-dev0.global.remoterf.net/RERGSOQ5")
+        self.assertEqual(g.invite("RERGSOQ5"), "ucla-dev0/RERGSOQ5")
         # LAN-only groups never get a Global invite: it would not work there.
         self.assertEqual(g.invite("RERGSOQ5", lan_only=True), "RERGSOQ5")