antri_cli 1.32.0 → 1.34.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cloud/browserAuth.d.ts.map +1 -1
- package/dist/cloud/browserAuth.js +67 -12
- package/dist/cloud/browserAuth.js.map +1 -1
- package/dist/core/config.js +1 -1
- package/dist/core/updater.d.ts +1 -1
- package/dist/core/updater.js +1 -1
- package/dist/desktop/public/index.html +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browserAuth.d.ts","sourceRoot":"","sources":["../../src/cloud/browserAuth.ts"],"names":[],"mappings":"AAGA,OAAO,EAAe,WAAW,EAAE,MAAM,WAAW,CAAC;AAErD,qBAAa,iBAAiB;IAC5B;;OAEG;WACiB,cAAc,IAAI,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"browserAuth.d.ts","sourceRoot":"","sources":["../../src/cloud/browserAuth.ts"],"names":[],"mappings":"AAGA,OAAO,EAAe,WAAW,EAAE,MAAM,WAAW,CAAC;AAErD,qBAAa,iBAAiB;IAC5B;;OAEG;WACiB,cAAc,IAAI,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IA2FjE,OAAO,CAAC,MAAM,CAAC,WAAW;IAe1B,OAAO,CAAC,MAAM,CAAC,eAAe;CA2S/B"}
|
|
@@ -14,8 +14,12 @@ export class BrowserAuthServer {
|
|
|
14
14
|
const url = new URL(req.url || '/', `http://localhost:${port}`);
|
|
15
15
|
// 1. Serve Minimalist Cream-White Web Login UI
|
|
16
16
|
if (url.pathname === '/' || url.pathname === '/login') {
|
|
17
|
+
const { FirestoreSyncManager } = await import('./firestore.js');
|
|
18
|
+
const syncCfg = FirestoreSyncManager.getSyncConfig();
|
|
19
|
+
const projectId = syncCfg.projectId || 'antri-agentic-hackathon';
|
|
20
|
+
const apiKey = syncCfg.apiKey || process.env.GEMINI_API_KEY || process.env.GOOGLE_API_KEY || '';
|
|
17
21
|
res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
|
|
18
|
-
res.end(this.renderLoginPage(port));
|
|
22
|
+
res.end(this.renderLoginPage(port, projectId, apiKey));
|
|
19
23
|
return;
|
|
20
24
|
}
|
|
21
25
|
// 2. Auth Callback Endpoint
|
|
@@ -102,7 +106,7 @@ export class BrowserAuthServer {
|
|
|
102
106
|
exec(`xdg-open "${targetUrl}"`);
|
|
103
107
|
}
|
|
104
108
|
}
|
|
105
|
-
static renderLoginPage(port) {
|
|
109
|
+
static renderLoginPage(port, projectId = 'antri-agentic-hackathon', apiKey = '') {
|
|
106
110
|
return `<!DOCTYPE html>
|
|
107
111
|
<html lang="en">
|
|
108
112
|
<head>
|
|
@@ -280,7 +284,7 @@ export class BrowserAuthServer {
|
|
|
280
284
|
<path fill="#FBBC05" d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.06H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.94l2.85-2.22.81-.63z"/>
|
|
281
285
|
<path fill="#EA4335" d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.06l3.66 2.84c.87-2.6 3.3-4.52 6.16-4.52z"/>
|
|
282
286
|
</svg>
|
|
283
|
-
Sign in with Google
|
|
287
|
+
<span id="google-btn-text">Sign in with Google</span>
|
|
284
288
|
</button>
|
|
285
289
|
|
|
286
290
|
<div class="divider"><span>OR EMAIL</span></div>
|
|
@@ -302,8 +306,28 @@ export class BrowserAuthServer {
|
|
|
302
306
|
</div>
|
|
303
307
|
</div>
|
|
304
308
|
|
|
305
|
-
|
|
306
|
-
|
|
309
|
+
<!-- Firebase Web SDK for Real Google Sign-In Popup -->
|
|
310
|
+
<script type="module">
|
|
311
|
+
import { initializeApp } from 'https://www.gstatic.com/firebasejs/10.8.0/firebase-app.js';
|
|
312
|
+
import { getAuth, signInWithPopup, GoogleAuthProvider } from 'https://www.gstatic.com/firebasejs/10.8.0/firebase-auth.js';
|
|
313
|
+
|
|
314
|
+
const firebaseConfig = {
|
|
315
|
+
projectId: "${projectId}",
|
|
316
|
+
authDomain: "${projectId}.firebaseapp.com"
|
|
317
|
+
};
|
|
318
|
+
|
|
319
|
+
let authInstance = null;
|
|
320
|
+
let googleProvider = null;
|
|
321
|
+
|
|
322
|
+
try {
|
|
323
|
+
const app = initializeApp(firebaseConfig);
|
|
324
|
+
authInstance = getAuth(app);
|
|
325
|
+
googleProvider = new GoogleAuthProvider();
|
|
326
|
+
} catch (err) {
|
|
327
|
+
console.warn('Firebase init:', err);
|
|
328
|
+
}
|
|
329
|
+
|
|
330
|
+
window.authenticate = async function(email, provider = 'email', token = '') {
|
|
307
331
|
const statusMsg = document.getElementById('status-msg');
|
|
308
332
|
const submitBtn = document.getElementById('submit-btn');
|
|
309
333
|
statusMsg.style.display = 'none';
|
|
@@ -314,7 +338,7 @@ export class BrowserAuthServer {
|
|
|
314
338
|
const res = await fetch('/api/callback', {
|
|
315
339
|
method: 'POST',
|
|
316
340
|
headers: { 'Content-Type': 'application/json' },
|
|
317
|
-
body: JSON.stringify({ email, provider })
|
|
341
|
+
body: JSON.stringify({ email, provider, googleToken: token })
|
|
318
342
|
});
|
|
319
343
|
const data = await res.json();
|
|
320
344
|
if (data.success) {
|
|
@@ -332,19 +356,50 @@ export class BrowserAuthServer {
|
|
|
332
356
|
submitBtn.disabled = false;
|
|
333
357
|
submitBtn.innerText = 'Continue to CLI';
|
|
334
358
|
}
|
|
335
|
-
}
|
|
359
|
+
};
|
|
336
360
|
|
|
337
361
|
document.getElementById('email-form').addEventListener('submit', (e) => {
|
|
338
362
|
e.preventDefault();
|
|
339
363
|
const email = document.getElementById('email').value.trim();
|
|
340
|
-
if (email) authenticate(email, 'email');
|
|
364
|
+
if (email) window.authenticate(email, 'email');
|
|
341
365
|
});
|
|
342
366
|
|
|
343
|
-
document.getElementById('google-btn').addEventListener('click', () => {
|
|
344
|
-
const
|
|
345
|
-
|
|
346
|
-
|
|
367
|
+
document.getElementById('google-btn').addEventListener('click', async () => {
|
|
368
|
+
const googleBtnText = document.getElementById('google-btn-text');
|
|
369
|
+
const statusMsg = document.getElementById('status-msg');
|
|
370
|
+
statusMsg.style.display = 'none';
|
|
371
|
+
|
|
372
|
+
if (authInstance && googleProvider) {
|
|
373
|
+
try {
|
|
374
|
+
googleBtnText.innerText = 'Connecting to Google...';
|
|
375
|
+
const result = await signInWithPopup(authInstance, googleProvider);
|
|
376
|
+
const user = result.user;
|
|
377
|
+
if (user && user.email) {
|
|
378
|
+
const token = await user.getIdToken();
|
|
379
|
+
await window.authenticate(user.email, 'google', token);
|
|
380
|
+
return;
|
|
381
|
+
}
|
|
382
|
+
} catch (err) {
|
|
383
|
+
console.warn('Firebase popup error:', err);
|
|
384
|
+
googleBtnText.innerText = 'Sign in with Google';
|
|
385
|
+
// Highlight email box with Google helper
|
|
386
|
+
const emailInput = document.getElementById('email');
|
|
387
|
+
emailInput.placeholder = 'Enter your Google email (e.g. user@gmail.com)';
|
|
388
|
+
emailInput.focus();
|
|
389
|
+
statusMsg.innerText = 'Please enter your Google account email below to link your identity:';
|
|
390
|
+
statusMsg.style.color = '#78716c';
|
|
391
|
+
statusMsg.style.display = 'block';
|
|
392
|
+
return;
|
|
393
|
+
}
|
|
347
394
|
}
|
|
395
|
+
|
|
396
|
+
// If Firebase Auth SDK is not initialized, highlight email input
|
|
397
|
+
const emailInput = document.getElementById('email');
|
|
398
|
+
emailInput.placeholder = 'Enter your Google email (e.g. user@gmail.com)';
|
|
399
|
+
emailInput.focus();
|
|
400
|
+
statusMsg.innerText = 'Enter your Google account email below and click Continue:';
|
|
401
|
+
statusMsg.style.color = '#78716c';
|
|
402
|
+
statusMsg.style.display = 'block';
|
|
348
403
|
});
|
|
349
404
|
</script>
|
|
350
405
|
</body>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browserAuth.js","sourceRoot":"","sources":["../../src/cloud/browserAuth.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAe,MAAM,WAAW,CAAC;AAErD,MAAM,OAAO,iBAAiB;IAC5B;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,cAAc;QAChC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,IAAI,MAAM,GAAuB,IAAI,CAAC;YACtC,IAAI,IAAI,GAAG,KAAK,CAAC;YAEjB,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;gBAC5C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,GAAG,EAAE,oBAAoB,IAAI,EAAE,CAAC,CAAC;gBAEhE,+CAA+C;gBAC/C,IAAI,GAAG,CAAC,QAAQ,KAAK,GAAG,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBACtD,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,0BAA0B,EAAE,CAAC,CAAC;oBACnE,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"browserAuth.js","sourceRoot":"","sources":["../../src/cloud/browserAuth.ts"],"names":[],"mappings":"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"}
|
package/dist/core/config.js
CHANGED
package/dist/core/updater.d.ts
CHANGED
package/dist/core/updater.js
CHANGED
|
@@ -4,7 +4,7 @@ import chalk from 'chalk';
|
|
|
4
4
|
import ora from 'ora';
|
|
5
5
|
const execPromise = util.promisify(exec);
|
|
6
6
|
export class Updater {
|
|
7
|
-
static CURRENT_VERSION = '1.
|
|
7
|
+
static CURRENT_VERSION = '1.34.0';
|
|
8
8
|
static PACKAGE_NAME = 'antri_cli';
|
|
9
9
|
/**
|
|
10
10
|
* Checks for available updates and self-updates the global antri CLI
|