@rowlabs/ev 0.1.0 → 0.2.2

package/dist/index.js

@@ -6343,9 +6343,21 @@ var init_context = __esm({
   }
 });
 
+// ../shared/dist/logo.js
+var LOGO_COLOR_SVG, LOGO_WHITE_SVG;
+var init_logo = __esm({
+  "../shared/dist/logo.js"() {
+    "use strict";
+    LOGO_COLOR_SVG = `<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2"><g><g transform="matrix(1.043103,0,0,1.043103,-1969.396552,-1257.862069)"><circle cx="1958" cy="1412" r="58" style="fill:rgb(6,130,180)"/></g><g transform="matrix(1,0,0,1,-1825.5,-1142.5)"><path d="M1949,1340L2048,1340L2011.057,1376.943L1949,1376.943L1949,1340Z" style="fill:rgb(6,130,180)"/></g><g transform="matrix(0.991379,0,0,0.991379,-1546.12069,-1299.827586)"><circle cx="1958" cy="1412" r="58" style="fill:rgb(81,86,103)"/></g><g transform="matrix(0.991379,0,0,0.991379,-1753.12069,-1007.827586)"><circle cx="1958" cy="1412" r="58" style="fill:rgb(81,86,103)"/></g><g transform="matrix(1,0,0,1,-1825.5,-1142.5)"><path d="M2015,1483L2020,1396L2168,1258L2188,1280L2050,1411L2044,1493L2015,1483Z" style="fill:rgb(81,86,103)"/></g><g transform="matrix(1,0,0,1,-1825.5,-1142.5)"><path d="M2217.5,1338.994C2224.201,1338.967 2296,1340.287 2296,1409.245L2296,1438L2267.001,1433C2267.001,1433 2278.218,1369.349 2217.5,1369.001C2156.783,1369.349 2168,1433 2168,1433L2139,1438L2139,1409.245C2139,1340.287 2210.799,1338.967 2217.5,1338.994Z" style="fill:rgb(81,86,103)"/></g><g transform="matrix(1,0,0,1,-1503.5,-1252.5)"><path d="M1896.384,1552.005L1896.384,1552L1896.88,1552.002L1897.384,1552L1897.384,1552.005C1907.262,1552.083 1987.32,1553.318 2003,1573L2003,1675C2003,1675 1986.471,1709.757 1897.384,1721.865L1897.384,1722L1896.88,1721.934L1896.384,1722L1896.384,1721.868C1805.805,1709.761 1789,1675 1789,1675L1789,1573C1804.949,1553.307 1886.416,1552.081 1896.384,1552.005ZM1881.205,1630.637L1881.202,1630.637L1871,1676L1918,1676L1907.945,1631.209C1914.592,1626.939 1919,1619.48 1919,1611C1919,1597.754 1908.246,1587 1895,1587C1881.754,1587 1871,1597.754 1871,1611C1871,1619.113 1875.035,1626.292 1881.205,1630.637Z" style="fill:rgb(6,130,180)"/></g></g></svg>`;
+    LOGO_WHITE_SVG = `<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2"><g><g transform="matrix(1.043103,0,0,1.043103,-1969.396552,-1257.862069)"><circle cx="1958" cy="1412" r="58" style="fill:white"/></g><g transform="matrix(1,0,0,1,-1825.5,-1142.5)"><path d="M1949,1340L2048,1340L2011.057,1376.943L1949,1376.943L1949,1340Z" style="fill:white"/></g><g transform="matrix(0.991379,0,0,0.991379,-1546.12069,-1299.827586)"><circle cx="1958" cy="1412" r="58" style="fill:white"/></g><g transform="matrix(0.991379,0,0,0.991379,-1753.12069,-1007.827586)"><circle cx="1958" cy="1412" r="58" style="fill:white"/></g><g transform="matrix(1,0,0,1,-1825.5,-1142.5)"><path d="M2015,1483L2020,1396L2168,1258L2188,1280L2050,1411L2044,1493L2015,1483Z" style="fill:white"/></g><g transform="matrix(1,0,0,1,-1825.5,-1142.5)"><path d="M2217.5,1338.994C2224.201,1338.967 2296,1340.287 2296,1409.245L2296,1438L2267.001,1433C2267.001,1433 2278.218,1369.349 2217.5,1369.001C2156.783,1369.349 2168,1433 2168,1433L2139,1438L2139,1409.245C2139,1340.287 2210.799,1338.967 2217.5,1338.994Z" style="fill:white"/></g><g transform="matrix(1,0,0,1,-1503.5,-1252.5)"><path d="M1896.384,1552.005L1896.384,1552L1896.88,1552.002L1897.384,1552L1897.384,1552.005C1907.262,1552.083 1987.32,1553.318 2003,1573L2003,1675C2003,1675 1986.471,1709.757 1897.384,1721.865L1897.384,1722L1896.88,1721.934L1896.384,1722L1896.384,1721.868C1805.805,1709.761 1789,1675 1789,1675L1789,1573C1804.949,1553.307 1886.416,1552.081 1896.384,1552.005ZM1881.205,1630.637L1881.202,1630.637L1871,1676L1918,1676L1907.945,1631.209C1914.592,1626.939 1919,1619.48 1919,1611C1919,1597.754 1908.246,1587 1895,1587C1881.754,1587 1871,1597.754 1871,1611C1871,1619.113 1875.035,1626.292 1881.205,1630.637Z" style="fill:white"/></g></g></svg>`;
+  }
+});
+
 // ../shared/dist/index.js
 var dist_exports = {};
 __export(dist_exports, {
+  LOGO_COLOR_SVG: () => LOGO_COLOR_SVG,
+  LOGO_WHITE_SVG: () => LOGO_WHITE_SVG,
   decryptSecret: () => decryptSecret,
   diffEnvs: () => diffEnvs,
   encryptSecret: () => encryptSecret,
@@ -6370,6 +6382,7 @@ var init_dist = __esm({
     init_env_parser();
     init_diff();
     init_context();
+    init_logo();
   }
 });
 
@@ -6405,7 +6418,7 @@ async function loadAuth() {
   return JSON.parse(content);
 }
 function getApiUrl() {
-  return process.env.EV_API_URL ?? "https://api.ev.dev";
+  return process.env.EV_API_URL ?? "https://api.git-env.com";
 }
 function findProjectRoot(startDir) {
   let dir = startDir;
@@ -6716,17 +6729,14 @@ import http from "http";
 import open from "open";
 import chalk from "chalk";
 import ora from "ora";
-var GITHUB_CLIENT_ID = process.env.EV_GITHUB_CLIENT_ID ?? "";
 var loginCommand = new Command("login").description("Authenticate with ev via GitHub OAuth").action(async () => {
-  const spinner = ora("Waiting for GitHub authentication...").start();
+  const spinner = ora("Waiting for authentication...").start();
   try {
-    const code = await startOAuthFlow();
-    spinner.text = "Exchanging code for token...";
-    const tempClient = await createApiClient();
-    const authResponse = await tempClient.githubAuth(code);
+    const result = await startAuthFlow();
+    spinner.text = "Saving credentials...";
     await saveAuth({
-      token: authResponse.token,
-      userId: authResponse.user.id,
+      token: result.token,
+      userId: result.userId,
       apiUrl: getApiUrl()
     });
     let keypair = await loadKeypair();
@@ -6735,45 +6745,61 @@ var loginCommand = new Command("login").description("Authenticate with ev via Gi
       keypair = generateKeypair();
       await saveKeypair(keypair);
     }
-    if (!authResponse.user.publicKey) {
-      const client = await createApiClient();
+    const client = await createApiClient();
+    try {
       await client.updatePublicKey(keypair.publicKey);
+    } catch {
     }
-    spinner.succeed(
-      chalk.green(`Logged in as ${authResponse.user.name} (${authResponse.user.email})`)
-    );
+    spinner.succeed(chalk.green(`Logged in as ${result.name} (${result.email})`));
   } catch (err) {
     spinner.fail(chalk.red(`Login failed: ${err.message}`));
     process.exit(1);
   }
 });
-function startOAuthFlow() {
+function startAuthFlow() {
+  const appUrl = process.env.EV_APP_URL ?? "https://app.git-env.com";
   return new Promise((resolve, reject) => {
     const server = http.createServer((req, res) => {
-      const url = new URL(req.url ?? "/", `http://localhost`);
-      const code = url.searchParams.get("code");
-      if (code) {
-        res.writeHead(200, { "Content-Type": "text/html" });
-        res.end("<html><body><h1>Success! You can close this tab.</h1></body></html>");
-        server.close();
-        resolve(code);
+      const url = new URL(req.url ?? "/", "http://localhost");
+      if (url.pathname === "/callback") {
+        const token = url.searchParams.get("token");
+        const userId = url.searchParams.get("userId");
+        const name = url.searchParams.get("name");
+        const email = url.searchParams.get("email");
+        if (token && userId && name && email) {
+          res.writeHead(200, { "Content-Type": "text/html" });
+          res.end(
+            '<html><body style="background:#07080a;color:#e5e7eb;font-family:system-ui;display:flex;align-items:center;justify-content:center;height:100vh;margin:0"><div style="text-align:center"><h1 style="font-size:1.5rem;font-weight:600">Logged in to ev</h1><p style="color:#9ca3af;margin-top:0.5rem">You can close this tab.</p></div></body></html>'
+          );
+          server.close();
+          resolve({ token, userId, name, email });
+        } else {
+          res.writeHead(400, { "Content-Type": "text/html" });
+          res.end(
+            '<html><body style="background:#07080a;color:#e5e7eb;font-family:system-ui;display:flex;align-items:center;justify-content:center;height:100vh;margin:0"><div style="text-align:center"><h1 style="font-size:1.5rem;color:#f87171">Authentication failed</h1><p style="color:#9ca3af;margin-top:0.5rem">Missing credentials. Try `ev login` again.</p></div></body></html>'
+          );
+          server.close();
+          reject(new Error("Authentication failed \u2014 missing credentials in callback"));
+        }
       } else {
-        res.writeHead(400);
-        res.end("Missing code parameter");
+        res.writeHead(404);
+        res.end("Not found");
       }
     });
-    server.listen(9876, () => {
-      const redirectUri = `http://localhost:9876`;
-      const authUrl = `https://github.com/login/oauth/authorize?client_id=${GITHUB_CLIENT_ID}&redirect_uri=${encodeURIComponent(redirectUri)}&scope=user:email`;
+    server.listen(0, () => {
+      const port = server.address().port;
+      const authUrl = `${appUrl}/cli/auth?port=${port}`;
       open(authUrl).catch(() => {
-        console.log(chalk.yellow(`Open this URL in your browser:
-${authUrl}`));
+        console.log(chalk.yellow(`
+Open this URL in your browser:
+${authUrl}
+`));
       });
     });
     server.on("error", reject);
     setTimeout(() => {
       server.close();
-      reject(new Error("Authentication timed out"));
+      reject(new Error("Authentication timed out after 2 minutes"));
     }, 12e4);
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rowlabs/ev",
-	"version": "0.1.0",
+	"version": "0.2.2",
 	"description": "Git for env vars — sync environment variables across teams securely",
 	"type": "module",
 	"bin": {
@@ -37,7 +37,6 @@
 		"node": ">=18"
 	},
 	"dependencies": {
-		"@ev/shared": "workspace:*",
 		"chalk": "^5.4.0",
 		"commander": "^13.1.0",
 		"open": "^10.1.0",
@@ -45,6 +44,7 @@
 		"yaml": "^2.7.0"
 	},
 	"devDependencies": {
+		"@ev/shared": "workspace:*",
 		"@types/node": "^22.0.0",
 		"tsup": "^8.5.1",
 		"tsx": "^4.19.0",