pinokiod 8.0.6 → 8.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "8.0.6",
+  "version": "8.0.7",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -1546,15 +1546,11 @@ class Server {
   github_login_params() {
     const doneMarker = "PINOKIO_GITHUB_LOGIN_DONE"
     const delimiter = this.kernel.platform === "win32" ? " && " : " ; "
-    const verifyCommand = this.kernel.platform === "win32"
-      ? "powershell.exe -NoProfile -Command \"$env:GIT_TERMINAL_PROMPT='0'; $env:GCM_INTERACTIVE='never'; @('protocol=https','host=github.com','') | git credential fill > $null; exit $LASTEXITCODE\""
-      : "printf 'protocol=https\\nhost=github.com\\n\\n' | GIT_TERMINAL_PROMPT=0 GCM_INTERACTIVE=never git credential fill >/dev/null"
     const doneCommand = this.kernel.platform === "win32"
       ? "echo P^INOKIO_GITHUB_LOGIN_DONE"
       : "(GCM_DONE=INOKIO_GITHUB_LOGIN_DONE; printf 'P%s\\n' \"$GCM_DONE\")"
     const loginCommand = [
       "git credential-manager github login --device --force",
-      verifyCommand,
       doneCommand
     ].join(" && ")
 

package/test/github-connection.test.js

@@ -73,24 +73,29 @@ test('GitHub connection coalesces only concurrent GCM checks', async () => {
   assert.equal(calls, 2)
 })
 
-test('GitHub login only emits completion marker after credential verification', () => {
-  const { doneMarker, message } = Server.prototype.github_login_params.call({
-    kernel: { platform: 'darwin' }
-  })
-
-  assert.equal(doneMarker, 'PINOKIO_GITHUB_LOGIN_DONE')
-  assert.match(message, /git credential-manager github login --device --force && printf 'protocol=https\\nhost=github\.com\\n\\n' \| GIT_TERMINAL_PROMPT=0 GCM_INTERACTIVE=never git credential fill >\/dev\/null && \(GCM_DONE=INOKIO_GITHUB_LOGIN_DONE; printf 'P%s\\n' "\$GCM_DONE"\)/)
-  assert.doesNotMatch(message, /git credential-manager github login --device --force\s*;/)
-  assert.doesNotMatch(message, /--web/)
-  assert.doesNotMatch(message, /PINOKIO_GITHUB_LOGIN_DONE/)
+test('GitHub login completes directly from GCM success on macOS and Linux', () => {
+  for (const platform of ['darwin', 'linux']) {
+    const { doneMarker, message } = Server.prototype.github_login_params.call({
+      kernel: { platform }
+    })
+
+    assert.equal(doneMarker, 'PINOKIO_GITHUB_LOGIN_DONE')
+    assert.match(message, /git credential-manager github login --device --force && \(GCM_DONE=INOKIO_GITHUB_LOGIN_DONE; printf 'P%s\\n' "\$GCM_DONE"\)/)
+    assert.doesNotMatch(message, /credential fill/)
+    assert.doesNotMatch(message, /git credential-manager github login --device --force\s*;/)
+    assert.doesNotMatch(message, /--web/)
+    assert.doesNotMatch(message, /PINOKIO_GITHUB_LOGIN_DONE/)
+  }
 })
 
-test('GitHub login uses success-only credential verification on Windows', () => {
+test('GitHub login completes directly from GCM success on Windows', () => {
   const { message } = Server.prototype.github_login_params.call({
     kernel: { platform: 'win32' }
   })
 
-  assert.match(message, /git credential-manager github login --device --force && powershell\.exe -NoProfile -Command "\$env:GIT_TERMINAL_PROMPT='0'; \$env:GCM_INTERACTIVE='never'; @\('protocol=https','host=github\.com',''\) \| git credential fill > \$null; exit \$LASTEXITCODE" && echo P\^INOKIO_GITHUB_LOGIN_DONE/)
+  assert.match(message, /git credential-manager github login --device --force && echo P\^INOKIO_GITHUB_LOGIN_DONE/)
+  assert.doesNotMatch(message, /credential fill/)
+  assert.doesNotMatch(message, /powershell\.exe/)
   assert.doesNotMatch(message, /--web/)
   assert.doesNotMatch(message, /PINOKIO_GITHUB_LOGIN_DONE/)
 })