antri_cli 1.32.0 → 1.33.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 +62 -10
- 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;IA0FjE,OAAO,CAAC,MAAM,CAAC,WAAW;IAe1B,OAAO,CAAC,MAAM,CAAC,eAAe;CAyS/B"}
|
|
@@ -14,8 +14,11 @@ 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';
|
|
17
20
|
res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
|
|
18
|
-
res.end(this.renderLoginPage(port));
|
|
21
|
+
res.end(this.renderLoginPage(port, projectId));
|
|
19
22
|
return;
|
|
20
23
|
}
|
|
21
24
|
// 2. Auth Callback Endpoint
|
|
@@ -102,7 +105,7 @@ export class BrowserAuthServer {
|
|
|
102
105
|
exec(`xdg-open "${targetUrl}"`);
|
|
103
106
|
}
|
|
104
107
|
}
|
|
105
|
-
static renderLoginPage(port) {
|
|
108
|
+
static renderLoginPage(port, projectId = 'antri-agentic-hackathon') {
|
|
106
109
|
return `<!DOCTYPE html>
|
|
107
110
|
<html lang="en">
|
|
108
111
|
<head>
|
|
@@ -280,7 +283,7 @@ export class BrowserAuthServer {
|
|
|
280
283
|
<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
284
|
<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
285
|
</svg>
|
|
283
|
-
Sign in with Google
|
|
286
|
+
<span id="google-btn-text">Sign in with Google</span>
|
|
284
287
|
</button>
|
|
285
288
|
|
|
286
289
|
<div class="divider"><span>OR EMAIL</span></div>
|
|
@@ -302,8 +305,28 @@ export class BrowserAuthServer {
|
|
|
302
305
|
</div>
|
|
303
306
|
</div>
|
|
304
307
|
|
|
305
|
-
|
|
306
|
-
|
|
308
|
+
<!-- Firebase Web SDK for Real Google Sign-In Popup -->
|
|
309
|
+
<script type="module">
|
|
310
|
+
import { initializeApp } from 'https://www.gstatic.com/firebasejs/10.8.0/firebase-app.js';
|
|
311
|
+
import { getAuth, signInWithPopup, GoogleAuthProvider } from 'https://www.gstatic.com/firebasejs/10.8.0/firebase-auth.js';
|
|
312
|
+
|
|
313
|
+
const firebaseConfig = {
|
|
314
|
+
projectId: "${projectId}",
|
|
315
|
+
authDomain: "${projectId}.firebaseapp.com"
|
|
316
|
+
};
|
|
317
|
+
|
|
318
|
+
let authInstance = null;
|
|
319
|
+
let googleProvider = null;
|
|
320
|
+
|
|
321
|
+
try {
|
|
322
|
+
const app = initializeApp(firebaseConfig);
|
|
323
|
+
authInstance = getAuth(app);
|
|
324
|
+
googleProvider = new GoogleAuthProvider();
|
|
325
|
+
} catch (err) {
|
|
326
|
+
console.warn('Firebase init:', err);
|
|
327
|
+
}
|
|
328
|
+
|
|
329
|
+
window.authenticate = async function(email, provider = 'email', token = '') {
|
|
307
330
|
const statusMsg = document.getElementById('status-msg');
|
|
308
331
|
const submitBtn = document.getElementById('submit-btn');
|
|
309
332
|
statusMsg.style.display = 'none';
|
|
@@ -314,7 +337,7 @@ export class BrowserAuthServer {
|
|
|
314
337
|
const res = await fetch('/api/callback', {
|
|
315
338
|
method: 'POST',
|
|
316
339
|
headers: { 'Content-Type': 'application/json' },
|
|
317
|
-
body: JSON.stringify({ email, provider })
|
|
340
|
+
body: JSON.stringify({ email, provider, googleToken: token })
|
|
318
341
|
});
|
|
319
342
|
const data = await res.json();
|
|
320
343
|
if (data.success) {
|
|
@@ -332,18 +355,47 @@ export class BrowserAuthServer {
|
|
|
332
355
|
submitBtn.disabled = false;
|
|
333
356
|
submitBtn.innerText = 'Continue to CLI';
|
|
334
357
|
}
|
|
335
|
-
}
|
|
358
|
+
};
|
|
336
359
|
|
|
337
360
|
document.getElementById('email-form').addEventListener('submit', (e) => {
|
|
338
361
|
e.preventDefault();
|
|
339
362
|
const email = document.getElementById('email').value.trim();
|
|
340
|
-
if (email) authenticate(email, 'email');
|
|
363
|
+
if (email) window.authenticate(email, 'email');
|
|
341
364
|
});
|
|
342
365
|
|
|
343
|
-
document.getElementById('google-btn').addEventListener('click', () => {
|
|
366
|
+
document.getElementById('google-btn').addEventListener('click', async () => {
|
|
367
|
+
const googleBtnText = document.getElementById('google-btn-text');
|
|
368
|
+
const statusMsg = document.getElementById('status-msg');
|
|
369
|
+
statusMsg.style.display = 'none';
|
|
370
|
+
|
|
371
|
+
if (authInstance && googleProvider) {
|
|
372
|
+
try {
|
|
373
|
+
googleBtnText.innerText = 'Connecting to Google...';
|
|
374
|
+
const result = await signInWithPopup(authInstance, googleProvider);
|
|
375
|
+
const user = result.user;
|
|
376
|
+
if (user && user.email) {
|
|
377
|
+
const token = await user.getIdToken();
|
|
378
|
+
await window.authenticate(user.email, 'google', token);
|
|
379
|
+
return;
|
|
380
|
+
}
|
|
381
|
+
} catch (err) {
|
|
382
|
+
console.warn('Firebase popup error:', err);
|
|
383
|
+
// If popup failed due to domain authorization or popup blocker, fall back to email
|
|
384
|
+
const email = prompt('Enter your Google Account email (e.g. user@gmail.com):');
|
|
385
|
+
if (email && email.includes('@')) {
|
|
386
|
+
await window.authenticate(email.trim(), 'google');
|
|
387
|
+
return;
|
|
388
|
+
}
|
|
389
|
+
statusMsg.innerText = err.message || 'Google sign-in error';
|
|
390
|
+
statusMsg.style.display = 'block';
|
|
391
|
+
googleBtnText.innerText = 'Sign in with Google';
|
|
392
|
+
return;
|
|
393
|
+
}
|
|
394
|
+
}
|
|
395
|
+
|
|
344
396
|
const email = prompt('Enter your Google Account email (e.g. user@gmail.com):');
|
|
345
397
|
if (email && email.includes('@')) {
|
|
346
|
-
authenticate(email.trim(), 'google');
|
|
398
|
+
await window.authenticate(email.trim(), 'google');
|
|
347
399
|
}
|
|
348
400
|
});
|
|
349
401
|
</script>
|
|
@@ -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.33.0';
|
|
8
8
|
static PACKAGE_NAME = 'antri_cli';
|
|
9
9
|
/**
|
|
10
10
|
* Checks for available updates and self-updates the global antri CLI
|