@zalkera/cli 0.31.1 → 0.32.0

package/README.md

@@ -31,7 +31,7 @@ zalkera publish                # 올린 것을 새 버전으로 만든다(그래
 zalkera rollback <판번호>        # 라이브를 그 버전으로 되돌린다
 zalkera discard                # 사이트 쪽에서 편집 중인 것을 버린다(판은 안 옮긴다)
 zalkera baseline               # 기준 기록만 다시 세운다(파일은 안 건드린다)
-zalkera logout
+zalkera logout                 # 로그인 정보를 지우고 이 컴퓨터의 서버 쪽 로그인도 끊는다
 ```
 
 `--site` 는 **폴더가 소속을 모를 때만** 필요하다. 한 번 받으면 폴더가 그것을 기억한다.

package/dist/main.js

@@ -552,6 +552,7 @@ function escapeHtml(value) {
 // ../core/dist/auth/oauth.js
 init_errors();
 var REFRESH_SKEW_MS = 2e4;
+var REVOKE_TIMEOUT_MS = 5e3;
 async function login(config, store, options) {
   const pkce = createPkce();
   const state = createState();
@@ -633,7 +634,30 @@ async function refreshToken(config, store) {
 }
 async function logout(store) {
   logoutEpoch.set(store, epochOf(store) + 1);
+  const current = await store.read().catch(() => null);
   await store.clear();
+  const serverEnded = current?.clientId ? revokeRefreshToken(current, current.clientId) : Promise.resolve(false);
+  return { serverEnded };
+}
+async function revokeRefreshToken(tokens, clientId) {
+  const issuer = httpUrl(tokens.issuer);
+  if (!issuer)
+    return false;
+  try {
+    const response = await fetch(`${trimSlash(issuer.href)}/protocol/openid-connect/revoke`, {
+      method: "POST",
+      headers: { "content-type": "application/x-www-form-urlencoded" },
+      body: new URLSearchParams({
+        client_id: clientId,
+        token: tokens.refreshToken,
+        token_type_hint: "refresh_token"
+      }),
+      signal: AbortSignal.timeout(REVOKE_TIMEOUT_MS)
+    });
+    return response.ok;
+  } catch {
+    return false;
+  }
 }
 async function exchange(config, params) {
   const body = new URLSearchParams({ client_id: config.clientId, ...params });
@@ -654,7 +678,8 @@ async function exchange(config, params) {
     accessToken: token.access_token,
     refreshToken: token.refresh_token,
     expiresAt: Date.now() + token.expires_in * 1e3,
-    issuer: config.issuer
+    issuer: config.issuer,
+    clientId: config.clientId
   };
 }
 async function safeText(response) {
@@ -3715,7 +3740,9 @@ var FileTokenStore = class {
         accessToken: t.accessToken,
         refreshToken: t.refreshToken,
         expiresAt: t.expiresAt,
-        issuer: t.issuer
+        issuer: t.issuer,
+        // 없으면 로그아웃이 서버 세션을 못 끊는다 — 옛 파일은 칸이 없어 로컬만 지운다.
+        ...typeof t.clientId === "string" ? { clientId: t.clientId } : {}
       };
     } catch {
       return null;
@@ -3971,7 +3998,7 @@ function help() {
   return `\uC798\uCEE4\uB77C \u2014 \uC0AC\uC774\uD2B8 \uC18C\uC2A4\uB97C \uB85C\uCEEC\uC5D0\uC11C \uB2E4\uB8E8\uB294 \uB3C4\uAD6C (v${version()})
 
   zalkera login                 \uBE0C\uB77C\uC6B0\uC800\uB85C \uB85C\uADF8\uC778
-  zalkera logout                \uB85C\uADF8\uC778 \uC815\uBCF4\uB97C \uC9C0\uC6B4\uB2E4
+  zalkera logout                \uB85C\uADF8\uC778 \uC815\uBCF4\uB97C \uC9C0\uC6B0\uACE0 \uC774 \uCEF4\uD4E8\uD130\uC758 \uC11C\uBC84 \uCABD \uB85C\uADF8\uC778\uB3C4 \uB04A\uB294\uB2E4
   zalkera status                \uC774 \uD3F4\uB354\uC640 \uC0AC\uC774\uD2B8\uAC00 \uC5B4\uB5BB\uAC8C \uB2E4\uB978\uC9C0 \uBCF8\uB2E4
   zalkera pull                  \uC0AC\uC774\uD2B8\uC758 \uC9C0\uAE08 \uD310\uC744 \uC774 \uD3F4\uB354\uC5D0 \uBC1B\uB294\uB2E4
   zalkera push                  \uC774 \uD3F4\uB354\uC5D0\uC11C \uACE0\uCE5C \uAC83\uC744 \uC0AC\uC774\uD2B8 \uCABD\uC5D0 \uC62C\uB9B0\uB2E4(\uCF1C\uC9C0\uC9C0\uB294 \uC54A\uB294\uB2E4)
@@ -4026,8 +4053,12 @@ async function main(argv) {
       return 0;
     }
     case "logout": {
-      await logout(new FileTokenStore());
-      process.stdout.write("\uB85C\uADF8\uC778 \uC815\uBCF4\uB97C \uC9C0\uC6E0\uC2B5\uB2C8\uB2E4.\n");
+      const store = new FileTokenStore();
+      const hadLogin = await store.read() !== null;
+      const serverEnded = await (await logout(store)).serverEnded;
+      process.stdout.write(
+        !hadLogin ? "\uB85C\uADF8\uC778 \uC815\uBCF4\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.\n" : serverEnded ? "\uB85C\uADF8\uC778 \uC815\uBCF4\uB97C \uC9C0\uC6B0\uACE0 \uC774 \uAE30\uAE30\uC758 \uC11C\uBC84 \uCABD \uB85C\uADF8\uC778\uB3C4 \uB05D\uB0C8\uC2B5\uB2C8\uB2E4.\n" : "\uB85C\uADF8\uC778 \uC815\uBCF4\uB97C \uC9C0\uC6E0\uC2B5\uB2C8\uB2E4. \uC11C\uBC84 \uCABD \uB85C\uADF8\uC778\uC740 \uB04A\uC9C0 \uBABB\uD588\uC2B5\uB2C8\uB2E4(\uC5F0\uACB0 \uC5C6\uC74C\xB7\uC608\uC804 \uB85C\uADF8\uC778).\n"
+      );
       return 0;
     }
     case "status": {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zalkera/cli",
-    "version": "0.31.1",
+    "version": "0.32.0",
     "description": "잘커라 사이트 소스를 터미널에서 받고·올리고·발행합니다. 편집기 없이, 스크립트에서도.",
     "license": "MIT",
     "type": "module",