bazaar-contrib-server-github 0.3.0rc1__tar.gz → 0.3.0rc2__tar.gz

{bazaar_contrib_server_github-0.3.0rc1 → bazaar_contrib_server_github-0.3.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bazaar-contrib-server-github
-Version: 0.3.0rc1
+Version: 0.3.0rc2
 Summary: Logging in to the Bazaar Compute server with a GitHub account
 License-Expression: Apache-2.0
 License-File: LICENSE
@@ -9,7 +9,7 @@ Requires-Dist: bazaar-core~=0.3.0rc1
 Requires-Dist: bazaar-contrib-http~=0.3.0rc1
 Requires-Dist: bazaar-contrib-schema~=0.3.0rc1
 Requires-Dist: bazaar-contrib-storage~=0.3.0rc1
-Requires-Dist: bazaar-contrib-server~=0.3.0rc3
+Requires-Dist: bazaar-contrib-server~=0.3.0rc12
 Requires-Dist: bazaar-contrib-server-access~=0.3.0rc2
 Requires-Dist: bazaar-contrib-server-database~=0.3.0rc1
 Requires-Dist: pydantic>=2.12.0

{bazaar_contrib_server_github-0.3.0rc1 → bazaar_contrib_server_github-0.3.0rc2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "bazaar-contrib-server-github"
-version = "0.3.0rc1"
+version = "0.3.0rc2"
 description = "Logging in to the Bazaar Compute server with a GitHub account"
 readme = "README.md"
 license = "Apache-2.0"
@@ -12,7 +12,7 @@ dependencies = [
     "bazaar-contrib-http~=0.3.0rc1",
     "bazaar-contrib-schema~=0.3.0rc1",
     "bazaar-contrib-storage~=0.3.0rc1",
-    "bazaar-contrib-server~=0.3.0rc3",
+    "bazaar-contrib-server~=0.3.0rc12",
     "bazaar-contrib-server-access~=0.3.0rc2",
     "bazaar-contrib-server-database~=0.3.0rc1",
     "pydantic>=2.12.0",
@@ -59,7 +59,7 @@ extend-select = ["ASYNC"]
 dev = [
     "bazaar-contrib-server-migrations~=0.3.0rc2",
     "bazaar-contrib-sqlite~=0.3.0rc1",
-    "bazaar-contrib-timer-wheel~=0.3.0rc1",
+    "bazaar-contrib-timer~=0.3.0rc26",
     "blockbuster>=1.5.29,<1.6",
     "httpx>=0.28.0,<1",
     "playwright>=1.55.0",

{bazaar_contrib_server_github-0.3.0rc1 → bazaar_contrib_server_github-0.3.0rc2}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "bazaar-contrib-server-github"
-version = "0.3.0rc1"
+version = "0.3.0rc2"
 description = "Logging in to the Bazaar Compute server with a GitHub account"
 readme = "README.md"
 license = "Apache-2.0"
@@ -12,7 +12,7 @@ dependencies = [
     "bazaar-contrib-http~=0.3.0rc1",
     "bazaar-contrib-schema~=0.3.0rc1",
     "bazaar-contrib-storage~=0.3.0rc1",
-    "bazaar-contrib-server~=0.3.0rc3",
+    "bazaar-contrib-server~=0.3.0rc12",
     "bazaar-contrib-server-access~=0.3.0rc2",
     "bazaar-contrib-server-database~=0.3.0rc1",
     "pydantic>=2.12.0",
@@ -55,7 +55,7 @@ extend-select = ["ASYNC"]
 dev = [
     "bazaar-contrib-server-migrations~=0.3.0rc2",
     "bazaar-contrib-sqlite~=0.3.0rc1",
-    "bazaar-contrib-timer-wheel~=0.3.0rc1",
+    "bazaar-contrib-timer~=0.3.0rc26",
     "blockbuster>=1.5.29,<1.6",
     "httpx>=0.28.0,<1",
     "playwright>=1.55.0",

{bazaar_contrib_server_github-0.3.0rc1 → bazaar_contrib_server_github-0.3.0rc2}/src/bazaar_contrib_server_github/resources/locales/en.toml

@@ -14,6 +14,7 @@
 "github.callback.hint" = "On GitHub, create an app under Settings › Developer settings › OAuth Apps with the address above as its Authorization callback URL, then fill in its Client ID and a Client Secret generated there."
 "github.copy" = "Copy"
 "github.copied" = "Copied"
+"github.copy.failed" = "Not copied, copy it by hand"
 "github.offer" = "Once saved, the login page offers logging in with GitHub."
 "github.offered" = "Offered on the login page"
 "github.invalid" = "Not saved: check the required fields and the callback URL."

{bazaar_contrib_server_github-0.3.0rc1 → bazaar_contrib_server_github-0.3.0rc2}/src/bazaar_contrib_server_github/resources/locales/zh-CN.toml

@@ -14,6 +14,7 @@
 "github.callback.hint" = "在 GitHub 的 Settings › Developer settings › OAuth Apps 里新建应用，Authorization callback URL 填上面的回调地址；创建后把 Client ID 和生成的 Client Secret 填到这里。"
 "github.copy" = "复制"
 "github.copied" = "已复制"
+"github.copy.failed" = "没复制上，请手动复制"
 "github.offer" = "保存后，登录页出现「用 GitHub 账号登录」。"
 "github.offered" = "已出现在登录页"
 "github.invalid" = "没有保存：请检查必填项和回调地址。"

{bazaar_contrib_server_github-0.3.0rc1 → bazaar_contrib_server_github-0.3.0rc2}/src/bazaar_contrib_server_github/resources/templates/github/settings.html

@@ -40,12 +40,12 @@
       </span>
     </div>
     {# where GitHub sends the browser back: under the address this page is seen at, not the one the server hears #}
-    <div class="field wide" x-data="{ copied: false }">
+    <div class="field wide" x-data="{ copied: null }">
       <label for="redirect_uri">{{ t.text("github.callback") }}</label>
       <span class="input ro">
         <input class="mono" id="redirect_uri" name="redirect_uri" x-ref="callback" readonly x-init="$el.value = location.origin + '{{ callback }}'">
-        <button class="suffix copy" type="button" @click="$refs.callback.select(); navigator.clipboard?.writeText($refs.callback.value); copied = true">
-          <span x-show="!copied">{{ t.text("github.copy") }}</span><span x-show="copied" x-cloak>{{ t.text("github.copied") }}</span>
+        <button class="suffix copy" type="button" @click="$refs.callback.select(); copied = await bazaarCopy($refs.callback.value)">
+          <span x-show="copied === null">{{ t.text("github.copy") }}</span><span x-show="copied === true" x-cloak>{{ t.text("github.copied") }}</span><span x-show="copied === false" x-cloak>{{ t.text("github.copy.failed") }}</span>
         </button>
       </span>
       <span class="hint">{{ t.text("github.callback.hint") }}</span>