@spfn/cli 0.0.3 → 0.0.5

package/lib/login.js

@@ -7,74 +7,63 @@ import { execSync } from "child_process";
 
 const PORT = 5678;
 
-function mergeNetrc(
+/**
+ * Git credential helper를 이용해 특정 레포에 대한 인증 정보를 저장합니다.
+ * @param username Git 사용자명
+ * @param token    Git 토큰
+ * @param repoPath 호스트 이후의 경로 예: "my-org/my-repo"
+ */
+function installGitCredentials(
     username,
-    token
+    token,
+    repoPath
 )
 {
-    const name = process.platform === "win32" ? "_netrc" : ".netrc";
-    const file = path.join(os.homedir(), name);
-    let lines = [];
-
-    if (fs.existsSync(file))
+    // credential helper 설정
+    if (process.platform === "win32")
     {
-        lines = fs.readFileSync(file, "utf-8").split(/\r?\n/);
-        const filtered = [];
-        let skip = false;
-        for (const l of lines)
-        {
-            if (l.trim().startsWith("machine git.superfunctions.ai"))
-            {
-                skip = true;
-            }
-            if (!skip)
-            {
-                filtered.push(l);
-            }
-            if (skip && l.trim() === "")
-            {
-                skip = false;
-            }
-        }
-        lines = filtered;
+        execSync("git config --global credential.helper manager-core");
+    }
+    else
+    {
+        execSync("git config --global credential.helper store");
     }
 
-    lines.push(
-        "",
-        "machine git.superfunctions.ai",
-        `  login ${username}`,
-        `  password ${token}`,
+    // git credential approve 입력 생성
+    const cred = [
+        "protocol=https",
+        "host=git.superfunctions.ai",
+        `path=${repoPath}`,
+        `username=${username}`,
+        `password=${token}`,
         ""
-    );
+    ].join("\n");
 
-    fs.writeFileSync(file, lines.join("\n"), "utf-8");
-    if (process.platform !== "win32")
-    {
-        fs.chmodSync(file, 0o600);
-    }
-    console.log(`✔️ Merged netrc: ${file}`);
+    execSync("git credential approve", {
+        input: cred,
+        stdio: ["pipe", "ignore", "inherit"]
+    });
+
+    console.log(`✔️ Stored credentials for git.superfunctions.ai/${repoPath}`);
 }
 
 function mergeGradleInit()
 {
-    const dir = path.join(os.homedir(), ".gradle");
-    const file = path.join(dir, "init.gradle");
-    const startMarker = "// sf-cli start";
-    const endMarker = "// sf-cli end";
+    const dir     = path.join(os.homedir(), ".gradle");
+    const file    = path.join(dir, "init.gradle");
+    const start   = "// sf-cli start";
+    const end     = "// sf-cli end";
+    let content   = "";
 
-    let content = "";
     if (fs.existsSync(file))
     {
         content = fs.readFileSync(file, "utf-8");
-        const regex = new RegExp(
-            `${startMarker}[\\s\\S]*?${endMarker}\n?`,
-            "m"
-        );
+        const regex = new RegExp(`${start}[\s\S]*?${end}\n?`, "m");
         content = content.replace(regex, "");
     }
 
     const block = [
-        startMarker,
+        start,
         "allprojects {",
         "    repositories {",
         "        maven {",
@@ -82,13 +71,13 @@ function mergeGradleInit()
         "            url  = uri('https://git.superfunctions.ai/api/packages/sf/maven')",
         "            credentials {",
         "                username = System.getenv('SF_USERNAME')",
-        "                password = System.getenv('SF_AUTH_TOKEN')'",
+        "                password = System.getenv('SF_AUTH_TOKEN')",
         "            }",
         "        }",
         "        mavenCentral()",
         "    }",
         "}",
-        endMarker,
+        end,
         ""
     ].join("\n");
 
@@ -130,6 +119,8 @@ export function login()
                         }
 
                         mergeGradleInit();
+
+                        // npm registry 설정 (생략)
                         try
                         {
                             execSync(
@@ -137,19 +128,19 @@ export function login()
                                 { stdio: "inherit", env: process.env }
                             );
                             execSync(
-                                `npm config set //git.superfunctions.ai/api/packages/sf/npm/:_authToken "${token}"`,
+                                `npm config set //git.superfunctions.ai/api/packages/sf/npm/:_authToken \"${token}\"`,
                                 { stdio: "inherit", env: process.env }
                             );
-                            console.log(
-                                "✔️ npm registry and authToken set via npm config"
-                            );
+                            console.log("✔️ npm registry and authToken set via npm config");
                         }
                         catch (e)
                         {
                             console.error("❌ npm config set failed:", e);
                         }
 
-                        mergeNetrc(username, token);
+                        // 2개 레포에 대해 각각 자격증명 저장
+                        installGitCredentials(username, token, `${projectSlug}/${projectSlug}-server`);
+                        installGitCredentials(username, token, `${projectSlug}/${projectSlug}-app`);
 
                         res.writeHead(200, { "Content-Type": "text/plain" });
                         res.end("✅ Login successful! You can now close this window.");
@@ -157,10 +148,10 @@ export function login()
                         console.log();
                         console.log("💡 Tips:");
                         console.log(
-                            `  git clone git.superfunctions.ai/${projectSlug}/${projectSlug}-server`
+                            `  git clone https://git.superfunctions.ai/${projectSlug}/${projectSlug}-server`
                         );
                         console.log(
-                            `  git clone git.superfunctions.ai/${projectSlug}/${projectSlug}-app`
+                            `  git clone https://git.superfunctions.ai/${projectSlug}/${projectSlug}-app`
                         );
                         console.log();
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@spfn/cli",
-    "version": "0.0.3",
+    "version": "0.0.5",
     "description": "Superfunction CLI",
     "keywords": [
         "cli",