Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 2 additions & 20 deletions infrastructure/eid-wallet/src/lib/global/controllers/evault.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,14 +92,9 @@ export class VaultController {
*/
async syncPublicKey(eName: string): Promise<void> {
try {
// Check if we've already saved the public key
// Note: We always check the actual source (whois endpoint) instead of relying on localStorage
// localStorage flag is only used as a hint, but we verify against the server
const savedKey = localStorage.getItem(`publicKeySaved_${eName}`);
Comment thread
coodos marked this conversation as resolved.
if (savedKey === "true") {
console.log(
`Public key already saved for ${eName}, skipping sync`,
);
return;
}

if (!this.#keyService) {
console.warn(
Expand DownExpand Up@@ -211,25 +206,13 @@ export class VaultController {
}
}

console.log("=".repeat(70));
console.log("🔄 [VaultController] syncPublicKey called");
console.log("=".repeat(70));
console.log(`eName: ${eName}`);
console.log(`Key ID for sync: ${KEY_ID}`);
console.log(`Context for sync: ${context}`);
console.log(`Is fake/pre-verification: ${isFake}`);

// Get public key using the same method as getApplicationPublicKey() in onboarding/verify
let publicKey: string | undefined;
try {
publicKey = await this.#keyService.getPublicKey(
KEY_ID,
context,
);
console.log(
`Public key retrieved: ${publicKey?.substring(0, 60)}...`,
);
console.log(`Public key (full): ${publicKey}`);
} catch (error) {
console.error(
`Failed to get public key for ${KEY_ID} with context ${context}:`,
Expand All@@ -244,7 +227,6 @@ export class VaultController {
);
return;
}
console.log("=".repeat(70));

// Get authentication token from environment variable
const authToken = PUBLIC_EID_WALLET_TOKEN || null;
Expand Down
42 changes: 42 additions & 0 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/scanLogic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ interface ScanStores {
authError: Writable<string | null>;
signingError: Writable<string | null>;
authLoading: Writable<boolean>;
isFromScan: Writable<boolean>;
}

interface ScanActions {
Expand DownExpand Up@@ -143,6 +144,7 @@ export function createScanLogic({
const authError = writable<string | null>(null);
const signingError = writable<string | null>(null);
const authLoading = writable(false);
const isFromScan = writable(false);

let permissionsNullable: PermissionState | null = null;

Expand DownExpand Up@@ -284,6 +286,43 @@ export function createScanLogic({
);
}

const fromScan = get(isFromScan);

if (fromScan) {
// For scan: Make POST request with JSON payload
const payload = {
ename: vault.ename,
session: get(session) as string,
signature: signature,
appVersion: "0.4.0",
};

console.log(`📤 Making POST request to: ${redirectUrl}`);
console.log("📦 Payload:", payload);

const response = await fetch(redirectUrl, {
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify(payload),
});

if (!response.ok) {
throw new Error(
`Failed to submit authentication: ${response.status} ${response.statusText}`,
);
}

console.log("✅ POST request successful");

// For scan: Close drawer and show success, skip deeplink redirect logic
codeScannedDrawerOpen.set(false);
loggedInDrawerOpen.set(true);
startScan();
return;
}
// For deeplink: Open URL with encoded URI
// Strip path from redirectUri and append /deeplink-login
const loginUrl = new URL("/deeplink-login", redirectUrl);
loginUrl.searchParams.set("ename", vault.ename);
Expand DownExpand Up@@ -417,6 +456,7 @@ export function createScanLogic({
hostname.set(redirectUrl.hostname);
isSigningRequest.set(false);
authError.set(null); // Clear any previous auth errors
isFromScan.set(true); // Mark that this auth request came from scanning
codeScannedDrawerOpen.set(true);
}

Expand DownExpand Up@@ -1148,6 +1188,7 @@ export function createScanLogic({

isSigningRequest.set(false);
authError.set(null); // Clear any previous auth errors
isFromScan.set(false); // Mark that this auth request came from deeplink
codeScannedDrawerOpen.set(true);
} else if (data.type === "sign") {
console.log("Handling signing deep link");
Expand DownExpand Up@@ -1395,6 +1436,7 @@ export function createScanLogic({
authError,
signingError,
authLoading,
isFromScan,
},
actions: {
startScan,
Expand Down
6 changes: 4 additions & 2 deletions infrastructure/evault-core/src/core/http/server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,10 @@ export async function registerHttpRoutes(
type: "object",
properties: {
w3id: { type: "string" },
publicKey: { type: "string", nullable: true },
keyBindingCertificates: {
type: "array",
items: { type: "string" },
},
Comment thread
coderabbitai[bot] marked this conversation as resolved.
},
},
400: {
Expand DownExpand Up@@ -154,7 +157,6 @@ export async function registerHttpRoutes(
w3id: eName,
keyBindingCertificates: keyBindingCertificates,
};
console.log("Whois request:", result);
return result;
},
);
Expand Down
1 change: 1 addition & 0 deletions platforms/emover-api/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
"cors": "^2.8.5",
"dotenv": "^16.4.5",
"express": "^4.18.2",
"jose": "^5.2.0",
"jsonwebtoken": "^9.0.2",
"pg": "^8.11.3",
"reflect-metadata": "^0.2.1",
Expand Down
65 changes: 57 additions & 8 deletions platforms/emover-api/src/services/MigrationService.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { randomUUID } from "crypto";
import { EventEmitter } from "events";
import axios from "axios";
import * as jose from "jose";
import { AppDataSource } from "../database/data-source";
import { Migration, MigrationStatus } from "../database/entities/Migration";

Expand DownExpand Up@@ -86,17 +87,65 @@ export class MigrationService extends EventEmitter {
},
},
);
if (whoisResponse.data.publicKey) {
publicKey = whoisResponse.data.publicKey;
console.log(
`[MIGRATION] Retrieved public key from old evault: ${publicKey.substring(0, 20)}...`,
);
migration.logs += `[MIGRATION] Retrieved public key from old evault\n`;

// Extract public key from keyBindingCertificates array
const keyBindingCertificates = whoisResponse.data?.keyBindingCertificates;
if (keyBindingCertificates && Array.isArray(keyBindingCertificates) && keyBindingCertificates.length > 0) {
try {
// Get registry JWKS for JWT verification
const jwksUrl = new URL("/.well-known/jwks.json", this.registryUrl).toString();
const jwksResponse = await axios.get(jwksUrl, {
timeout: 10000,
});
const JWKS = jose.createLocalJWKSet(jwksResponse.data);

// Extract public key from first certificate (or try all until one works)
for (const jwt of keyBindingCertificates) {
try {
const { payload } = await jose.jwtVerify(jwt, JWKS);

// Verify ename matches
if (payload.ename !== eName) {
continue;
}

// Extract publicKey from JWT payload
const extractedPublicKey = payload.publicKey as string;
if (extractedPublicKey) {
publicKey = extractedPublicKey;
console.log(
`[MIGRATION] Retrieved public key from old evault: ${publicKey.substring(0, 20)}...`,
);
migration.logs += `[MIGRATION] Retrieved public key from old evault\n`;
break; // Found valid key, exit loop
}
} catch (error) {
// JWT verification failed, try next certificate
console.warn(
`[MIGRATION] Failed to verify key binding certificate, trying next...`,
);
continue;
}
}

if (publicKey === "0x0000000000000000000000000000000000000000") {
console.warn(
`[MIGRATION] No valid public key found in certificates, using default`,
);
migration.logs += `[MIGRATION] Warning: No valid public key found in certificates, using default\n`;
}
} catch (error) {
console.error(
`[MIGRATION ERROR] Failed to verify key binding certificates:`,
error,
);
migration.logs += `[MIGRATION ERROR] Failed to verify certificates, using default\n`;
}
} else {
console.warn(
`[MIGRATION] No public key found in old evault, using default`,
`[MIGRATION] No key binding certificates found in old evault, using default`,
);
migration.logs += `[MIGRATION] Warning: No public key found in old evault, using default\n`;
migration.logs += `[MIGRATION] Warning: No key binding certificates found in old evault, using default\n`;
}
} catch (error) {
console.error(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 2 additions & 20 deletions infrastructure/eid-wallet/src/lib/global/controllers/evault.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,14 +92,9 @@ export class VaultController {
*/
async syncPublicKey(eName: string): Promise<void> {
try {
// Check if we've already saved the public key
// Note: We always check the actual source (whois endpoint) instead of relying on localStorage
// localStorage flag is only used as a hint, but we verify against the server
const savedKey = localStorage.getItem(`publicKeySaved_${eName}`);
Comment thread
coodos marked this conversation as resolved.
if (savedKey === "true") {
console.log(
`Public key already saved for ${eName}, skipping sync`,
);
return;
}

if (!this.#keyService) {
console.warn(
Expand DownExpand Up@@ -211,25 +206,13 @@ export class VaultController {
}
}

console.log("=".repeat(70));
console.log("🔄 [VaultController] syncPublicKey called");
console.log("=".repeat(70));
console.log(`eName: ${eName}`);
console.log(`Key ID for sync: ${KEY_ID}`);
console.log(`Context for sync: ${context}`);
console.log(`Is fake/pre-verification: ${isFake}`);

// Get public key using the same method as getApplicationPublicKey() in onboarding/verify
let publicKey: string | undefined;
try {
publicKey = await this.#keyService.getPublicKey(
KEY_ID,
context,
);
console.log(
`Public key retrieved: ${publicKey?.substring(0, 60)}...`,
);
console.log(`Public key (full): ${publicKey}`);
} catch (error) {
console.error(
`Failed to get public key for ${KEY_ID} with context ${context}:`,
Expand All@@ -244,7 +227,6 @@ export class VaultController {
);
return;
}
console.log("=".repeat(70));

// Get authentication token from environment variable
const authToken = PUBLIC_EID_WALLET_TOKEN || null;
Expand Down
42 changes: 42 additions & 0 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/scanLogic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ interface ScanStores {
authError: Writable<string | null>;
signingError: Writable<string | null>;
authLoading: Writable<boolean>;
isFromScan: Writable<boolean>;
}

interface ScanActions {
Expand DownExpand Up@@ -143,6 +144,7 @@ export function createScanLogic({
const authError = writable<string | null>(null);
const signingError = writable<string | null>(null);
const authLoading = writable(false);
const isFromScan = writable(false);

let permissionsNullable: PermissionState | null = null;

Expand DownExpand Up@@ -284,6 +286,43 @@ export function createScanLogic({
);
}

const fromScan = get(isFromScan);

if (fromScan) {
// For scan: Make POST request with JSON payload
const payload = {
ename: vault.ename,
session: get(session) as string,
signature: signature,
appVersion: "0.4.0",
};

console.log(`📤 Making POST request to: ${redirectUrl}`);
console.log("📦 Payload:", payload);

const response = await fetch(redirectUrl, {
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify(payload),
});

if (!response.ok) {
throw new Error(
`Failed to submit authentication: ${response.status} ${response.statusText}`,
);
}

console.log("✅ POST request successful");

// For scan: Close drawer and show success, skip deeplink redirect logic
codeScannedDrawerOpen.set(false);
loggedInDrawerOpen.set(true);
startScan();
return;
}
// For deeplink: Open URL with encoded URI
// Strip path from redirectUri and append /deeplink-login
const loginUrl = new URL("/deeplink-login", redirectUrl);
loginUrl.searchParams.set("ename", vault.ename);
Expand DownExpand Up@@ -417,6 +456,7 @@ export function createScanLogic({
hostname.set(redirectUrl.hostname);
isSigningRequest.set(false);
authError.set(null); // Clear any previous auth errors
isFromScan.set(true); // Mark that this auth request came from scanning
codeScannedDrawerOpen.set(true);
}

Expand DownExpand Up@@ -1148,6 +1188,7 @@ export function createScanLogic({

isSigningRequest.set(false);
authError.set(null); // Clear any previous auth errors
isFromScan.set(false); // Mark that this auth request came from deeplink
codeScannedDrawerOpen.set(true);
} else if (data.type === "sign") {
console.log("Handling signing deep link");
Expand DownExpand Up@@ -1395,6 +1436,7 @@ export function createScanLogic({
authError,
signingError,
authLoading,
isFromScan,
},
actions: {
startScan,
Expand Down
6 changes: 4 additions & 2 deletions infrastructure/evault-core/src/core/http/server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,10 @@ export async function registerHttpRoutes(
type: "object",
properties: {
w3id: { type: "string" },
publicKey: { type: "string", nullable: true },
keyBindingCertificates: {
type: "array",
items: { type: "string" },
},
Comment thread
coderabbitai[bot] marked this conversation as resolved.
},
},
400: {
Expand DownExpand Up@@ -154,7 +157,6 @@ export async function registerHttpRoutes(
w3id: eName,
keyBindingCertificates: keyBindingCertificates,
};
console.log("Whois request:", result);
return result;
},
);
Expand Down
1 change: 1 addition & 0 deletions platforms/emover-api/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
"cors": "^2.8.5",
"dotenv": "^16.4.5",
"express": "^4.18.2",
"jose": "^5.2.0",
"jsonwebtoken": "^9.0.2",
"pg": "^8.11.3",
"reflect-metadata": "^0.2.1",
Expand Down
65 changes: 57 additions & 8 deletions platforms/emover-api/src/services/MigrationService.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { randomUUID } from "crypto";
import { EventEmitter } from "events";
import axios from "axios";
import * as jose from "jose";
import { AppDataSource } from "../database/data-source";
import { Migration, MigrationStatus } from "../database/entities/Migration";

Expand DownExpand Up@@ -86,17 +87,65 @@ export class MigrationService extends EventEmitter {
},
},
);
if (whoisResponse.data.publicKey) {
publicKey = whoisResponse.data.publicKey;
console.log(
`[MIGRATION] Retrieved public key from old evault: ${publicKey.substring(0, 20)}...`,
);
migration.logs += `[MIGRATION] Retrieved public key from old evault\n`;

// Extract public key from keyBindingCertificates array
const keyBindingCertificates = whoisResponse.data?.keyBindingCertificates;
if (keyBindingCertificates && Array.isArray(keyBindingCertificates) && keyBindingCertificates.length > 0) {
try {
// Get registry JWKS for JWT verification
const jwksUrl = new URL("/.well-known/jwks.json", this.registryUrl).toString();
const jwksResponse = await axios.get(jwksUrl, {
timeout: 10000,
});
const JWKS = jose.createLocalJWKSet(jwksResponse.data);

// Extract public key from first certificate (or try all until one works)
for (const jwt of keyBindingCertificates) {
try {
const { payload } = await jose.jwtVerify(jwt, JWKS);

// Verify ename matches
if (payload.ename !== eName) {
continue;
}

// Extract publicKey from JWT payload
const extractedPublicKey = payload.publicKey as string;
if (extractedPublicKey) {
publicKey = extractedPublicKey;
console.log(
`[MIGRATION] Retrieved public key from old evault: ${publicKey.substring(0, 20)}...`,
);
migration.logs += `[MIGRATION] Retrieved public key from old evault\n`;
break; // Found valid key, exit loop
}
} catch (error) {
// JWT verification failed, try next certificate
console.warn(
`[MIGRATION] Failed to verify key binding certificate, trying next...`,
);
continue;
}
}

if (publicKey === "0x0000000000000000000000000000000000000000") {
console.warn(
`[MIGRATION] No valid public key found in certificates, using default`,
);
migration.logs += `[MIGRATION] Warning: No valid public key found in certificates, using default\n`;
}
} catch (error) {
console.error(
`[MIGRATION ERROR] Failed to verify key binding certificates:`,
error,
);
migration.logs += `[MIGRATION ERROR] Failed to verify certificates, using default\n`;
}
} else {
console.warn(
`[MIGRATION] No public key found in old evault, using default`,
`[MIGRATION] No key binding certificates found in old evault, using default`,
);
migration.logs += `[MIGRATION] Warning: No public key found in old evault, using default\n`;
migration.logs += `[MIGRATION] Warning: No key binding certificates found in old evault, using default\n`;
}
} catch (error) {
console.error(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 2 additions & 20 deletions infrastructure/eid-wallet/src/lib/global/controllers/evault.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,14 +92,9 @@ export class VaultController {
*/
async syncPublicKey(eName: string): Promise<void> {
try {
// Check if we've already saved the public key
// Note: We always check the actual source (whois endpoint) instead of relying on localStorage
// localStorage flag is only used as a hint, but we verify against the server
const savedKey = localStorage.getItem(`publicKeySaved_${eName}`);
Comment thread
coodos marked this conversation as resolved.
if (savedKey === "true") {
console.log(
`Public key already saved for ${eName}, skipping sync`,
);
return;
}

if (!this.#keyService) {
console.warn(
Expand DownExpand Up@@ -211,25 +206,13 @@ export class VaultController {
}
}

console.log("=".repeat(70));
console.log("🔄 [VaultController] syncPublicKey called");
console.log("=".repeat(70));
console.log(`eName: ${eName}`);
console.log(`Key ID for sync: ${KEY_ID}`);
console.log(`Context for sync: ${context}`);
console.log(`Is fake/pre-verification: ${isFake}`);

// Get public key using the same method as getApplicationPublicKey() in onboarding/verify
let publicKey: string | undefined;
try {
publicKey = await this.#keyService.getPublicKey(
KEY_ID,
context,
);
console.log(
`Public key retrieved: ${publicKey?.substring(0, 60)}...`,
);
console.log(`Public key (full): ${publicKey}`);
} catch (error) {
console.error(
`Failed to get public key for ${KEY_ID} with context ${context}:`,
Expand All@@ -244,7 +227,6 @@ export class VaultController {
);
return;
}
console.log("=".repeat(70));

// Get authentication token from environment variable
const authToken = PUBLIC_EID_WALLET_TOKEN || null;
Expand Down
42 changes: 42 additions & 0 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/scanLogic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ interface ScanStores {
authError: Writable<string | null>;
signingError: Writable<string | null>;
authLoading: Writable<boolean>;
isFromScan: Writable<boolean>;
}

interface ScanActions {
Expand DownExpand Up@@ -143,6 +144,7 @@ export function createScanLogic({
const authError = writable<string | null>(null);
const signingError = writable<string | null>(null);
const authLoading = writable(false);
const isFromScan = writable(false);

let permissionsNullable: PermissionState | null = null;

Expand DownExpand Up@@ -284,6 +286,43 @@ export function createScanLogic({
);
}

const fromScan = get(isFromScan);

if (fromScan) {
// For scan: Make POST request with JSON payload
const payload = {
ename: vault.ename,
session: get(session) as string,
signature: signature,
appVersion: "0.4.0",
};

console.log(`📤 Making POST request to: ${redirectUrl}`);
console.log("📦 Payload:", payload);

const response = await fetch(redirectUrl, {
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify(payload),
});

if (!response.ok) {
throw new Error(
`Failed to submit authentication: ${response.status} ${response.statusText}`,
);
}

console.log("✅ POST request successful");

// For scan: Close drawer and show success, skip deeplink redirect logic
codeScannedDrawerOpen.set(false);
loggedInDrawerOpen.set(true);
startScan();
return;
}
// For deeplink: Open URL with encoded URI
// Strip path from redirectUri and append /deeplink-login
const loginUrl = new URL("/deeplink-login", redirectUrl);
loginUrl.searchParams.set("ename", vault.ename);
Expand DownExpand Up@@ -417,6 +456,7 @@ export function createScanLogic({
hostname.set(redirectUrl.hostname);
isSigningRequest.set(false);
authError.set(null); // Clear any previous auth errors
isFromScan.set(true); // Mark that this auth request came from scanning
codeScannedDrawerOpen.set(true);
}

Expand DownExpand Up@@ -1148,6 +1188,7 @@ export function createScanLogic({

isSigningRequest.set(false);
authError.set(null); // Clear any previous auth errors
isFromScan.set(false); // Mark that this auth request came from deeplink
codeScannedDrawerOpen.set(true);
} else if (data.type === "sign") {
console.log("Handling signing deep link");
Expand DownExpand Up@@ -1395,6 +1436,7 @@ export function createScanLogic({
authError,
signingError,
authLoading,
isFromScan,
},
actions: {
startScan,
Expand Down
6 changes: 4 additions & 2 deletions infrastructure/evault-core/src/core/http/server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,10 @@ export async function registerHttpRoutes(
type: "object",
properties: {
w3id: { type: "string" },
publicKey: { type: "string", nullable: true },
keyBindingCertificates: {
type: "array",
items: { type: "string" },
},
Comment thread
coderabbitai[bot] marked this conversation as resolved.
},
},
400: {
Expand DownExpand Up@@ -154,7 +157,6 @@ export async function registerHttpRoutes(
w3id: eName,
keyBindingCertificates: keyBindingCertificates,
};
console.log("Whois request:", result);
return result;
},
);
Expand Down
1 change: 1 addition & 0 deletions platforms/emover-api/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
"cors": "^2.8.5",
"dotenv": "^16.4.5",
"express": "^4.18.2",
"jose": "^5.2.0",
"jsonwebtoken": "^9.0.2",
"pg": "^8.11.3",
"reflect-metadata": "^0.2.1",
Expand Down
65 changes: 57 additions & 8 deletions platforms/emover-api/src/services/MigrationService.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { randomUUID } from "crypto";
import { EventEmitter } from "events";
import axios from "axios";
import * as jose from "jose";
import { AppDataSource } from "../database/data-source";
import { Migration, MigrationStatus } from "../database/entities/Migration";

Expand DownExpand Up@@ -86,17 +87,65 @@ export class MigrationService extends EventEmitter {
},
},
);
if (whoisResponse.data.publicKey) {
publicKey = whoisResponse.data.publicKey;
console.log(
`[MIGRATION] Retrieved public key from old evault: ${publicKey.substring(0, 20)}...`,
);
migration.logs += `[MIGRATION] Retrieved public key from old evault\n`;

// Extract public key from keyBindingCertificates array
const keyBindingCertificates = whoisResponse.data?.keyBindingCertificates;
if (keyBindingCertificates && Array.isArray(keyBindingCertificates) && keyBindingCertificates.length > 0) {
try {
// Get registry JWKS for JWT verification
const jwksUrl = new URL("/.well-known/jwks.json", this.registryUrl).toString();
const jwksResponse = await axios.get(jwksUrl, {
timeout: 10000,
});
const JWKS = jose.createLocalJWKSet(jwksResponse.data);

// Extract public key from first certificate (or try all until one works)
for (const jwt of keyBindingCertificates) {
try {
const { payload } = await jose.jwtVerify(jwt, JWKS);

// Verify ename matches
if (payload.ename !== eName) {
continue;
}

// Extract publicKey from JWT payload
const extractedPublicKey = payload.publicKey as string;
if (extractedPublicKey) {
publicKey = extractedPublicKey;
console.log(
`[MIGRATION] Retrieved public key from old evault: ${publicKey.substring(0, 20)}...`,
);
migration.logs += `[MIGRATION] Retrieved public key from old evault\n`;
break; // Found valid key, exit loop
}
} catch (error) {
// JWT verification failed, try next certificate
console.warn(
`[MIGRATION] Failed to verify key binding certificate, trying next...`,
);
continue;
}
}

if (publicKey === "0x0000000000000000000000000000000000000000") {
console.warn(
`[MIGRATION] No valid public key found in certificates, using default`,
);
migration.logs += `[MIGRATION] Warning: No valid public key found in certificates, using default\n`;
}
} catch (error) {
console.error(
`[MIGRATION ERROR] Failed to verify key binding certificates:`,
error,
);
migration.logs += `[MIGRATION ERROR] Failed to verify certificates, using default\n`;
}
} else {
console.warn(
`[MIGRATION] No public key found in old evault, using default`,
`[MIGRATION] No key binding certificates found in old evault, using default`,
);
migration.logs += `[MIGRATION] Warning: No public key found in old evault, using default\n`;
migration.logs += `[MIGRATION] Warning: No key binding certificates found in old evault, using default\n`;
}
} catch (error) {
console.error(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 2 additions & 20 deletions infrastructure/eid-wallet/src/lib/global/controllers/evault.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,14 +92,9 @@ export class VaultController {
*/
async syncPublicKey(eName: string): Promise<void> {
try {
// Check if we've already saved the public key
// Note: We always check the actual source (whois endpoint) instead of relying on localStorage
// localStorage flag is only used as a hint, but we verify against the server
const savedKey = localStorage.getItem(`publicKeySaved_${eName}`);
Comment thread
coodos marked this conversation as resolved.
if (savedKey === "true") {
console.log(
`Public key already saved for ${eName}, skipping sync`,
);
return;
}

if (!this.#keyService) {
console.warn(
Expand DownExpand Up@@ -211,25 +206,13 @@ export class VaultController {
}
}

console.log("=".repeat(70));
console.log("🔄 [VaultController] syncPublicKey called");
console.log("=".repeat(70));
console.log(`eName: ${eName}`);
console.log(`Key ID for sync: ${KEY_ID}`);
console.log(`Context for sync: ${context}`);
console.log(`Is fake/pre-verification: ${isFake}`);

// Get public key using the same method as getApplicationPublicKey() in onboarding/verify
let publicKey: string | undefined;
try {
publicKey = await this.#keyService.getPublicKey(
KEY_ID,
context,
);
console.log(
`Public key retrieved: ${publicKey?.substring(0, 60)}...`,
);
console.log(`Public key (full): ${publicKey}`);
} catch (error) {
console.error(
`Failed to get public key for ${KEY_ID} with context ${context}:`,
Expand All@@ -244,7 +227,6 @@ export class VaultController {
);
return;
}
console.log("=".repeat(70));

// Get authentication token from environment variable
const authToken = PUBLIC_EID_WALLET_TOKEN || null;
Expand Down
42 changes: 42 additions & 0 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/scanLogic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ interface ScanStores {
authError: Writable<string | null>;
signingError: Writable<string | null>;
authLoading: Writable<boolean>;
isFromScan: Writable<boolean>;
}

interface ScanActions {
Expand DownExpand Up@@ -143,6 +144,7 @@ export function createScanLogic({
const authError = writable<string | null>(null);
const signingError = writable<string | null>(null);
const authLoading = writable(false);
const isFromScan = writable(false);

let permissionsNullable: PermissionState | null = null;

Expand DownExpand Up@@ -284,6 +286,43 @@ export function createScanLogic({
);
}

const fromScan = get(isFromScan);

if (fromScan) {
// For scan: Make POST request with JSON payload
const payload = {
ename: vault.ename,
session: get(session) as string,
signature: signature,
appVersion: "0.4.0",
};

console.log(`📤 Making POST request to: ${redirectUrl}`);
console.log("📦 Payload:", payload);

const response = await fetch(redirectUrl, {
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify(payload),
});

if (!response.ok) {
throw new Error(
`Failed to submit authentication: ${response.status} ${response.statusText}`,
);
}

console.log("✅ POST request successful");

// For scan: Close drawer and show success, skip deeplink redirect logic
codeScannedDrawerOpen.set(false);
loggedInDrawerOpen.set(true);
startScan();
return;
}
// For deeplink: Open URL with encoded URI
// Strip path from redirectUri and append /deeplink-login
const loginUrl = new URL("/deeplink-login", redirectUrl);
loginUrl.searchParams.set("ename", vault.ename);
Expand DownExpand Up@@ -417,6 +456,7 @@ export function createScanLogic({
hostname.set(redirectUrl.hostname);
isSigningRequest.set(false);
authError.set(null); // Clear any previous auth errors
isFromScan.set(true); // Mark that this auth request came from scanning
codeScannedDrawerOpen.set(true);
}

Expand DownExpand Up@@ -1148,6 +1188,7 @@ export function createScanLogic({

isSigningRequest.set(false);
authError.set(null); // Clear any previous auth errors
isFromScan.set(false); // Mark that this auth request came from deeplink
codeScannedDrawerOpen.set(true);
} else if (data.type === "sign") {
console.log("Handling signing deep link");
Expand DownExpand Up@@ -1395,6 +1436,7 @@ export function createScanLogic({
authError,
signingError,
authLoading,
isFromScan,
},
actions: {
startScan,
Expand Down
6 changes: 4 additions & 2 deletions infrastructure/evault-core/src/core/http/server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,10 @@ export async function registerHttpRoutes(
type: "object",
properties: {
w3id: { type: "string" },
publicKey: { type: "string", nullable: true },
keyBindingCertificates: {
type: "array",
items: { type: "string" },
},
Comment thread
coderabbitai[bot] marked this conversation as resolved.
},
},
400: {
Expand DownExpand Up@@ -154,7 +157,6 @@ export async function registerHttpRoutes(
w3id: eName,
keyBindingCertificates: keyBindingCertificates,
};
console.log("Whois request:", result);
return result;
},
);
Expand Down
1 change: 1 addition & 0 deletions platforms/emover-api/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
"cors": "^2.8.5",
"dotenv": "^16.4.5",
"express": "^4.18.2",
"jose": "^5.2.0",
"jsonwebtoken": "^9.0.2",
"pg": "^8.11.3",
"reflect-metadata": "^0.2.1",
Expand Down
65 changes: 57 additions & 8 deletions platforms/emover-api/src/services/MigrationService.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { randomUUID } from "crypto";
import { EventEmitter } from "events";
import axios from "axios";
import * as jose from "jose";
import { AppDataSource } from "../database/data-source";
import { Migration, MigrationStatus } from "../database/entities/Migration";

Expand DownExpand Up@@ -86,17 +87,65 @@ export class MigrationService extends EventEmitter {
},
},
);
if (whoisResponse.data.publicKey) {
publicKey = whoisResponse.data.publicKey;
console.log(
`[MIGRATION] Retrieved public key from old evault: ${publicKey.substring(0, 20)}...`,
);
migration.logs += `[MIGRATION] Retrieved public key from old evault\n`;

// Extract public key from keyBindingCertificates array
const keyBindingCertificates = whoisResponse.data?.keyBindingCertificates;
if (keyBindingCertificates && Array.isArray(keyBindingCertificates) && keyBindingCertificates.length > 0) {
try {
// Get registry JWKS for JWT verification
const jwksUrl = new URL("/.well-known/jwks.json", this.registryUrl).toString();
const jwksResponse = await axios.get(jwksUrl, {
timeout: 10000,
});
const JWKS = jose.createLocalJWKSet(jwksResponse.data);

// Extract public key from first certificate (or try all until one works)
for (const jwt of keyBindingCertificates) {
try {
const { payload } = await jose.jwtVerify(jwt, JWKS);

// Verify ename matches
if (payload.ename !== eName) {
continue;
}

// Extract publicKey from JWT payload
const extractedPublicKey = payload.publicKey as string;
if (extractedPublicKey) {
publicKey = extractedPublicKey;
console.log(
`[MIGRATION] Retrieved public key from old evault: ${publicKey.substring(0, 20)}...`,
);
migration.logs += `[MIGRATION] Retrieved public key from old evault\n`;
break; // Found valid key, exit loop
}
} catch (error) {
// JWT verification failed, try next certificate
console.warn(
`[MIGRATION] Failed to verify key binding certificate, trying next...`,
);
continue;
}
}

if (publicKey === "0x0000000000000000000000000000000000000000") {
console.warn(
`[MIGRATION] No valid public key found in certificates, using default`,
);
migration.logs += `[MIGRATION] Warning: No valid public key found in certificates, using default\n`;
}
} catch (error) {
console.error(
`[MIGRATION ERROR] Failed to verify key binding certificates:`,
error,
);
migration.logs += `[MIGRATION ERROR] Failed to verify certificates, using default\n`;
}
} else {
console.warn(
`[MIGRATION] No public key found in old evault, using default`,
`[MIGRATION] No key binding certificates found in old evault, using default`,
);
migration.logs += `[MIGRATION] Warning: No public key found in old evault, using default\n`;
migration.logs += `[MIGRATION] Warning: No key binding certificates found in old evault, using default\n`;
}
} catch (error) {
console.error(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 2 additions & 20 deletions infrastructure/eid-wallet/src/lib/global/controllers/evault.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,14 +92,9 @@ export class VaultController {
*/
async syncPublicKey(eName: string): Promise<void> {
try {
// Check if we've already saved the public key
// Note: We always check the actual source (whois endpoint) instead of relying on localStorage
// localStorage flag is only used as a hint, but we verify against the server
const savedKey = localStorage.getItem(`publicKeySaved_${eName}`);
Comment thread
coodos marked this conversation as resolved.
if (savedKey === "true") {
console.log(
`Public key already saved for ${eName}, skipping sync`,
);
return;
}

if (!this.#keyService) {
console.warn(
Expand DownExpand Up@@ -211,25 +206,13 @@ export class VaultController {
}
}

console.log("=".repeat(70));
console.log("🔄 [VaultController] syncPublicKey called");
console.log("=".repeat(70));
console.log(`eName: ${eName}`);
console.log(`Key ID for sync: ${KEY_ID}`);
console.log(`Context for sync: ${context}`);
console.log(`Is fake/pre-verification: ${isFake}`);

// Get public key using the same method as getApplicationPublicKey() in onboarding/verify
let publicKey: string | undefined;
try {
publicKey = await this.#keyService.getPublicKey(
KEY_ID,
context,
);
console.log(
`Public key retrieved: ${publicKey?.substring(0, 60)}...`,
);
console.log(`Public key (full): ${publicKey}`);
} catch (error) {
console.error(
`Failed to get public key for ${KEY_ID} with context ${context}:`,
Expand All@@ -244,7 +227,6 @@ export class VaultController {
);
return;
}
console.log("=".repeat(70));

// Get authentication token from environment variable
const authToken = PUBLIC_EID_WALLET_TOKEN || null;
Expand Down
42 changes: 42 additions & 0 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/scanLogic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ interface ScanStores {
authError: Writable<string | null>;
signingError: Writable<string | null>;
authLoading: Writable<boolean>;
isFromScan: Writable<boolean>;
}

interface ScanActions {
Expand DownExpand Up@@ -143,6 +144,7 @@ export function createScanLogic({
const authError = writable<string | null>(null);
const signingError = writable<string | null>(null);
const authLoading = writable(false);
const isFromScan = writable(false);

let permissionsNullable: PermissionState | null = null;

Expand DownExpand Up@@ -284,6 +286,43 @@ export function createScanLogic({
);
}

const fromScan = get(isFromScan);

if (fromScan) {
// For scan: Make POST request with JSON payload
const payload = {
ename: vault.ename,
session: get(session) as string,
signature: signature,
appVersion: "0.4.0",
};

console.log(`📤 Making POST request to: ${redirectUrl}`);
console.log("📦 Payload:", payload);

const response = await fetch(redirectUrl, {
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify(payload),
});

if (!response.ok) {
throw new Error(
`Failed to submit authentication: ${response.status} ${response.statusText}`,
);
}

console.log("✅ POST request successful");

// For scan: Close drawer and show success, skip deeplink redirect logic
codeScannedDrawerOpen.set(false);
loggedInDrawerOpen.set(true);
startScan();
return;
}
// For deeplink: Open URL with encoded URI
// Strip path from redirectUri and append /deeplink-login
const loginUrl = new URL("/deeplink-login", redirectUrl);
loginUrl.searchParams.set("ename", vault.ename);
Expand DownExpand Up@@ -417,6 +456,7 @@ export function createScanLogic({
hostname.set(redirectUrl.hostname);
isSigningRequest.set(false);
authError.set(null); // Clear any previous auth errors
isFromScan.set(true); // Mark that this auth request came from scanning
codeScannedDrawerOpen.set(true);
}

Expand DownExpand Up@@ -1148,6 +1188,7 @@ export function createScanLogic({

isSigningRequest.set(false);
authError.set(null); // Clear any previous auth errors
isFromScan.set(false); // Mark that this auth request came from deeplink
codeScannedDrawerOpen.set(true);
} else if (data.type === "sign") {
console.log("Handling signing deep link");
Expand DownExpand Up@@ -1395,6 +1436,7 @@ export function createScanLogic({
authError,
signingError,
authLoading,
isFromScan,
},
actions: {
startScan,
Expand Down
6 changes: 4 additions & 2 deletions infrastructure/evault-core/src/core/http/server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,10 @@ export async function registerHttpRoutes(
type: "object",
properties: {
w3id: { type: "string" },
publicKey: { type: "string", nullable: true },
keyBindingCertificates: {
type: "array",
items: { type: "string" },
},
Comment thread
coderabbitai[bot] marked this conversation as resolved.
},
},
400: {
Expand DownExpand Up@@ -154,7 +157,6 @@ export async function registerHttpRoutes(
w3id: eName,
keyBindingCertificates: keyBindingCertificates,
};
console.log("Whois request:", result);
return result;
},
);
Expand Down
1 change: 1 addition & 0 deletions platforms/emover-api/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
"cors": "^2.8.5",
"dotenv": "^16.4.5",
"express": "^4.18.2",
"jose": "^5.2.0",
"jsonwebtoken": "^9.0.2",
"pg": "^8.11.3",
"reflect-metadata": "^0.2.1",
Expand Down
65 changes: 57 additions & 8 deletions platforms/emover-api/src/services/MigrationService.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { randomUUID } from "crypto";
import { EventEmitter } from "events";
import axios from "axios";
import * as jose from "jose";
import { AppDataSource } from "../database/data-source";
import { Migration, MigrationStatus } from "../database/entities/Migration";

Expand DownExpand Up@@ -86,17 +87,65 @@ export class MigrationService extends EventEmitter {
},
},
);
if (whoisResponse.data.publicKey) {
publicKey = whoisResponse.data.publicKey;
console.log(
`[MIGRATION] Retrieved public key from old evault: ${publicKey.substring(0, 20)}...`,
);
migration.logs += `[MIGRATION] Retrieved public key from old evault\n`;

// Extract public key from keyBindingCertificates array
const keyBindingCertificates = whoisResponse.data?.keyBindingCertificates;
if (keyBindingCertificates && Array.isArray(keyBindingCertificates) && keyBindingCertificates.length > 0) {
try {
// Get registry JWKS for JWT verification
const jwksUrl = new URL("/.well-known/jwks.json", this.registryUrl).toString();
const jwksResponse = await axios.get(jwksUrl, {
timeout: 10000,
});
const JWKS = jose.createLocalJWKSet(jwksResponse.data);

// Extract public key from first certificate (or try all until one works)
for (const jwt of keyBindingCertificates) {
try {
const { payload } = await jose.jwtVerify(jwt, JWKS);

// Verify ename matches
if (payload.ename !== eName) {
continue;
}

// Extract publicKey from JWT payload
const extractedPublicKey = payload.publicKey as string;
if (extractedPublicKey) {
publicKey = extractedPublicKey;
console.log(
`[MIGRATION] Retrieved public key from old evault: ${publicKey.substring(0, 20)}...`,
);
migration.logs += `[MIGRATION] Retrieved public key from old evault\n`;
break; // Found valid key, exit loop
}
} catch (error) {
// JWT verification failed, try next certificate
console.warn(
`[MIGRATION] Failed to verify key binding certificate, trying next...`,
);
continue;
}
}

if (publicKey === "0x0000000000000000000000000000000000000000") {
console.warn(
`[MIGRATION] No valid public key found in certificates, using default`,
);
migration.logs += `[MIGRATION] Warning: No valid public key found in certificates, using default\n`;
}
} catch (error) {
console.error(
`[MIGRATION ERROR] Failed to verify key binding certificates:`,
error,
);
migration.logs += `[MIGRATION ERROR] Failed to verify certificates, using default\n`;
}
} else {
console.warn(
`[MIGRATION] No public key found in old evault, using default`,
`[MIGRATION] No key binding certificates found in old evault, using default`,
);
migration.logs += `[MIGRATION] Warning: No public key found in old evault, using default\n`;
migration.logs += `[MIGRATION] Warning: No key binding certificates found in old evault, using default\n`;
}
} catch (error) {
console.error(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 2 additions & 20 deletions infrastructure/eid-wallet/src/lib/global/controllers/evault.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,14 +92,9 @@ export class VaultController {
*/
async syncPublicKey(eName: string): Promise<void> {
try {
// Check if we've already saved the public key
// Note: We always check the actual source (whois endpoint) instead of relying on localStorage
// localStorage flag is only used as a hint, but we verify against the server
const savedKey = localStorage.getItem(`publicKeySaved_${eName}`);
Comment thread
coodos marked this conversation as resolved.
if (savedKey === "true") {
console.log(
`Public key already saved for ${eName}, skipping sync`,
);
return;
}

if (!this.#keyService) {
console.warn(
Expand DownExpand Up@@ -211,25 +206,13 @@ export class VaultController {
}
}

console.log("=".repeat(70));
console.log("🔄 [VaultController] syncPublicKey called");
console.log("=".repeat(70));
console.log(`eName: ${eName}`);
console.log(`Key ID for sync: ${KEY_ID}`);
console.log(`Context for sync: ${context}`);
console.log(`Is fake/pre-verification: ${isFake}`);

// Get public key using the same method as getApplicationPublicKey() in onboarding/verify
let publicKey: string | undefined;
try {
publicKey = await this.#keyService.getPublicKey(
KEY_ID,
context,
);
console.log(
`Public key retrieved: ${publicKey?.substring(0, 60)}...`,
);
console.log(`Public key (full): ${publicKey}`);
} catch (error) {
console.error(
`Failed to get public key for ${KEY_ID} with context ${context}:`,
Expand All@@ -244,7 +227,6 @@ export class VaultController {
);
return;
}
console.log("=".repeat(70));

// Get authentication token from environment variable
const authToken = PUBLIC_EID_WALLET_TOKEN || null;
Expand Down
42 changes: 42 additions & 0 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/scanLogic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ interface ScanStores {
authError: Writable<string | null>;
signingError: Writable<string | null>;
authLoading: Writable<boolean>;
isFromScan: Writable<boolean>;
}

interface ScanActions {
Expand DownExpand Up@@ -143,6 +144,7 @@ export function createScanLogic({
const authError = writable<string | null>(null);
const signingError = writable<string | null>(null);
const authLoading = writable(false);
const isFromScan = writable(false);

let permissionsNullable: PermissionState | null = null;

Expand DownExpand Up@@ -284,6 +286,43 @@ export function createScanLogic({
);
}

const fromScan = get(isFromScan);

if (fromScan) {
// For scan: Make POST request with JSON payload
const payload = {
ename: vault.ename,
session: get(session) as string,
signature: signature,
appVersion: "0.4.0",
};

console.log(`📤 Making POST request to: ${redirectUrl}`);
console.log("📦 Payload:", payload);

const response = await fetch(redirectUrl, {
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify(payload),
});

if (!response.ok) {
throw new Error(
`Failed to submit authentication: ${response.status} ${response.statusText}`,
);
}

console.log("✅ POST request successful");

// For scan: Close drawer and show success, skip deeplink redirect logic
codeScannedDrawerOpen.set(false);
loggedInDrawerOpen.set(true);
startScan();
return;
}
// For deeplink: Open URL with encoded URI
// Strip path from redirectUri and append /deeplink-login
const loginUrl = new URL("/deeplink-login", redirectUrl);
loginUrl.searchParams.set("ename", vault.ename);
Expand DownExpand Up@@ -417,6 +456,7 @@ export function createScanLogic({
hostname.set(redirectUrl.hostname);
isSigningRequest.set(false);
authError.set(null); // Clear any previous auth errors
isFromScan.set(true); // Mark that this auth request came from scanning
codeScannedDrawerOpen.set(true);
}

Expand DownExpand Up@@ -1148,6 +1188,7 @@ export function createScanLogic({

isSigningRequest.set(false);
authError.set(null); // Clear any previous auth errors
isFromScan.set(false); // Mark that this auth request came from deeplink
codeScannedDrawerOpen.set(true);
} else if (data.type === "sign") {
console.log("Handling signing deep link");
Expand DownExpand Up@@ -1395,6 +1436,7 @@ export function createScanLogic({
authError,
signingError,
authLoading,
isFromScan,
},
actions: {
startScan,
Expand Down
6 changes: 4 additions & 2 deletions infrastructure/evault-core/src/core/http/server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,10 @@ export async function registerHttpRoutes(
type: "object",
properties: {
w3id: { type: "string" },
publicKey: { type: "string", nullable: true },
keyBindingCertificates: {
type: "array",
items: { type: "string" },
},
Comment thread
coderabbitai[bot] marked this conversation as resolved.
},
},
400: {
Expand DownExpand Up@@ -154,7 +157,6 @@ export async function registerHttpRoutes(
w3id: eName,
keyBindingCertificates: keyBindingCertificates,
};
console.log("Whois request:", result);
return result;
},
);
Expand Down
1 change: 1 addition & 0 deletions platforms/emover-api/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
"cors": "^2.8.5",
"dotenv": "^16.4.5",
"express": "^4.18.2",
"jose": "^5.2.0",
"jsonwebtoken": "^9.0.2",
"pg": "^8.11.3",
"reflect-metadata": "^0.2.1",
Expand Down
65 changes: 57 additions & 8 deletions platforms/emover-api/src/services/MigrationService.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { randomUUID } from "crypto";
import { EventEmitter } from "events";
import axios from "axios";
import * as jose from "jose";
import { AppDataSource } from "../database/data-source";
import { Migration, MigrationStatus } from "../database/entities/Migration";

Expand DownExpand Up@@ -86,17 +87,65 @@ export class MigrationService extends EventEmitter {
},
},
);
if (whoisResponse.data.publicKey) {
publicKey = whoisResponse.data.publicKey;
console.log(
`[MIGRATION] Retrieved public key from old evault: ${publicKey.substring(0, 20)}...`,
);
migration.logs += `[MIGRATION] Retrieved public key from old evault\n`;

// Extract public key from keyBindingCertificates array
const keyBindingCertificates = whoisResponse.data?.keyBindingCertificates;
if (keyBindingCertificates && Array.isArray(keyBindingCertificates) && keyBindingCertificates.length > 0) {
try {
// Get registry JWKS for JWT verification
const jwksUrl = new URL("/.well-known/jwks.json", this.registryUrl).toString();
const jwksResponse = await axios.get(jwksUrl, {
timeout: 10000,
});
const JWKS = jose.createLocalJWKSet(jwksResponse.data);

// Extract public key from first certificate (or try all until one works)
for (const jwt of keyBindingCertificates) {
try {
const { payload } = await jose.jwtVerify(jwt, JWKS);

// Verify ename matches
if (payload.ename !== eName) {
continue;
}

// Extract publicKey from JWT payload
const extractedPublicKey = payload.publicKey as string;
if (extractedPublicKey) {
publicKey = extractedPublicKey;
console.log(
`[MIGRATION] Retrieved public key from old evault: ${publicKey.substring(0, 20)}...`,
);
migration.logs += `[MIGRATION] Retrieved public key from old evault\n`;
break; // Found valid key, exit loop
}
} catch (error) {
// JWT verification failed, try next certificate
console.warn(
`[MIGRATION] Failed to verify key binding certificate, trying next...`,
);
continue;
}
}

if (publicKey === "0x0000000000000000000000000000000000000000") {
console.warn(
`[MIGRATION] No valid public key found in certificates, using default`,
);
migration.logs += `[MIGRATION] Warning: No valid public key found in certificates, using default\n`;
}
} catch (error) {
console.error(
`[MIGRATION ERROR] Failed to verify key binding certificates:`,
error,
);
migration.logs += `[MIGRATION ERROR] Failed to verify certificates, using default\n`;
}
} else {
console.warn(
`[MIGRATION] No public key found in old evault, using default`,
`[MIGRATION] No key binding certificates found in old evault, using default`,
);
migration.logs += `[MIGRATION] Warning: No public key found in old evault, using default\n`;
migration.logs += `[MIGRATION] Warning: No key binding certificates found in old evault, using default\n`;
}
} catch (error) {
console.error(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 2 additions & 20 deletions infrastructure/eid-wallet/src/lib/global/controllers/evault.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,14 +92,9 @@ export class VaultController {
*/
async syncPublicKey(eName: string): Promise<void> {
try {
// Check if we've already saved the public key
// Note: We always check the actual source (whois endpoint) instead of relying on localStorage
// localStorage flag is only used as a hint, but we verify against the server
const savedKey = localStorage.getItem(`publicKeySaved_${eName}`);
Comment thread
coodos marked this conversation as resolved.
if (savedKey === "true") {
console.log(
`Public key already saved for ${eName}, skipping sync`,
);
return;
}

if (!this.#keyService) {
console.warn(
Expand DownExpand Up@@ -211,25 +206,13 @@ export class VaultController {
}
}

console.log("=".repeat(70));
console.log("🔄 [VaultController] syncPublicKey called");
console.log("=".repeat(70));
console.log(`eName: ${eName}`);
console.log(`Key ID for sync: ${KEY_ID}`);
console.log(`Context for sync: ${context}`);
console.log(`Is fake/pre-verification: ${isFake}`);

// Get public key using the same method as getApplicationPublicKey() in onboarding/verify
let publicKey: string | undefined;
try {
publicKey = await this.#keyService.getPublicKey(
KEY_ID,
context,
);
console.log(
`Public key retrieved: ${publicKey?.substring(0, 60)}...`,
);
console.log(`Public key (full): ${publicKey}`);
} catch (error) {
console.error(
`Failed to get public key for ${KEY_ID} with context ${context}:`,
Expand All@@ -244,7 +227,6 @@ export class VaultController {
);
return;
}
console.log("=".repeat(70));

// Get authentication token from environment variable
const authToken = PUBLIC_EID_WALLET_TOKEN || null;
Expand Down
42 changes: 42 additions & 0 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/scanLogic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ interface ScanStores {
authError: Writable<string | null>;
signingError: Writable<string | null>;
authLoading: Writable<boolean>;
isFromScan: Writable<boolean>;
}

interface ScanActions {
Expand DownExpand Up@@ -143,6 +144,7 @@ export function createScanLogic({
const authError = writable<string | null>(null);
const signingError = writable<string | null>(null);
const authLoading = writable(false);
const isFromScan = writable(false);

let permissionsNullable: PermissionState | null = null;

Expand DownExpand Up@@ -284,6 +286,43 @@ export function createScanLogic({
);
}

const fromScan = get(isFromScan);

if (fromScan) {
// For scan: Make POST request with JSON payload
const payload = {
ename: vault.ename,
session: get(session) as string,
signature: signature,
appVersion: "0.4.0",
};

console.log(`📤 Making POST request to: ${redirectUrl}`);
console.log("📦 Payload:", payload);

const response = await fetch(redirectUrl, {
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify(payload),
});

if (!response.ok) {
throw new Error(
`Failed to submit authentication: ${response.status} ${response.statusText}`,
);
}

console.log("✅ POST request successful");

// For scan: Close drawer and show success, skip deeplink redirect logic
codeScannedDrawerOpen.set(false);
loggedInDrawerOpen.set(true);
startScan();
return;
}
// For deeplink: Open URL with encoded URI
// Strip path from redirectUri and append /deeplink-login
const loginUrl = new URL("/deeplink-login", redirectUrl);
loginUrl.searchParams.set("ename", vault.ename);
Expand DownExpand Up@@ -417,6 +456,7 @@ export function createScanLogic({
hostname.set(redirectUrl.hostname);
isSigningRequest.set(false);
authError.set(null); // Clear any previous auth errors
isFromScan.set(true); // Mark that this auth request came from scanning
codeScannedDrawerOpen.set(true);
}

Expand DownExpand Up@@ -1148,6 +1188,7 @@ export function createScanLogic({

isSigningRequest.set(false);
authError.set(null); // Clear any previous auth errors
isFromScan.set(false); // Mark that this auth request came from deeplink
codeScannedDrawerOpen.set(true);
} else if (data.type === "sign") {
console.log("Handling signing deep link");
Expand DownExpand Up@@ -1395,6 +1436,7 @@ export function createScanLogic({
authError,
signingError,
authLoading,
isFromScan,
},
actions: {
startScan,
Expand Down
6 changes: 4 additions & 2 deletions infrastructure/evault-core/src/core/http/server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,10 @@ export async function registerHttpRoutes(
type: "object",
properties: {
w3id: { type: "string" },
publicKey: { type: "string", nullable: true },
keyBindingCertificates: {
type: "array",
items: { type: "string" },
},
Comment thread
coderabbitai[bot] marked this conversation as resolved.
},
},
400: {
Expand DownExpand Up@@ -154,7 +157,6 @@ export async function registerHttpRoutes(
w3id: eName,
keyBindingCertificates: keyBindingCertificates,
};
console.log("Whois request:", result);
return result;
},
);
Expand Down
1 change: 1 addition & 0 deletions platforms/emover-api/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
"cors": "^2.8.5",
"dotenv": "^16.4.5",
"express": "^4.18.2",
"jose": "^5.2.0",
"jsonwebtoken": "^9.0.2",
"pg": "^8.11.3",
"reflect-metadata": "^0.2.1",
Expand Down
65 changes: 57 additions & 8 deletions platforms/emover-api/src/services/MigrationService.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { randomUUID } from "crypto";
import { EventEmitter } from "events";
import axios from "axios";
import * as jose from "jose";
import { AppDataSource } from "../database/data-source";
import { Migration, MigrationStatus } from "../database/entities/Migration";

Expand DownExpand Up@@ -86,17 +87,65 @@ export class MigrationService extends EventEmitter {
},
},
);
if (whoisResponse.data.publicKey) {
publicKey = whoisResponse.data.publicKey;
console.log(
`[MIGRATION] Retrieved public key from old evault: ${publicKey.substring(0, 20)}...`,
);
migration.logs += `[MIGRATION] Retrieved public key from old evault\n`;

// Extract public key from keyBindingCertificates array
const keyBindingCertificates = whoisResponse.data?.keyBindingCertificates;
if (keyBindingCertificates && Array.isArray(keyBindingCertificates) && keyBindingCertificates.length > 0) {
try {
// Get registry JWKS for JWT verification
const jwksUrl = new URL("/.well-known/jwks.json", this.registryUrl).toString();
const jwksResponse = await axios.get(jwksUrl, {
timeout: 10000,
});
const JWKS = jose.createLocalJWKSet(jwksResponse.data);

// Extract public key from first certificate (or try all until one works)
for (const jwt of keyBindingCertificates) {
try {
const { payload } = await jose.jwtVerify(jwt, JWKS);

// Verify ename matches
if (payload.ename !== eName) {
continue;
}

// Extract publicKey from JWT payload
const extractedPublicKey = payload.publicKey as string;
if (extractedPublicKey) {
publicKey = extractedPublicKey;
console.log(
`[MIGRATION] Retrieved public key from old evault: ${publicKey.substring(0, 20)}...`,
);
migration.logs += `[MIGRATION] Retrieved public key from old evault\n`;
break; // Found valid key, exit loop
}
} catch (error) {
// JWT verification failed, try next certificate
console.warn(
`[MIGRATION] Failed to verify key binding certificate, trying next...`,
);
continue;
}
}

if (publicKey === "0x0000000000000000000000000000000000000000") {
console.warn(
`[MIGRATION] No valid public key found in certificates, using default`,
);
migration.logs += `[MIGRATION] Warning: No valid public key found in certificates, using default\n`;
}
} catch (error) {
console.error(
`[MIGRATION ERROR] Failed to verify key binding certificates:`,
error,
);
migration.logs += `[MIGRATION ERROR] Failed to verify certificates, using default\n`;
}
} else {
console.warn(
`[MIGRATION] No public key found in old evault, using default`,
`[MIGRATION] No key binding certificates found in old evault, using default`,
);
migration.logs += `[MIGRATION] Warning: No public key found in old evault, using default\n`;
migration.logs += `[MIGRATION] Warning: No key binding certificates found in old evault, using default\n`;
}
} catch (error) {
console.error(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 2 additions & 20 deletions infrastructure/eid-wallet/src/lib/global/controllers/evault.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,14 +92,9 @@ export class VaultController {
*/
async syncPublicKey(eName: string): Promise<void> {
try {
// Check if we've already saved the public key
// Note: We always check the actual source (whois endpoint) instead of relying on localStorage
// localStorage flag is only used as a hint, but we verify against the server
const savedKey = localStorage.getItem(`publicKeySaved_${eName}`);
Comment thread
coodos marked this conversation as resolved.
if (savedKey === "true") {
console.log(
`Public key already saved for ${eName}, skipping sync`,
);
return;
}

if (!this.#keyService) {
console.warn(
Expand DownExpand Up@@ -211,25 +206,13 @@ export class VaultController {
}
}

console.log("=".repeat(70));
console.log("🔄 [VaultController] syncPublicKey called");
console.log("=".repeat(70));
console.log(`eName: ${eName}`);
console.log(`Key ID for sync: ${KEY_ID}`);
console.log(`Context for sync: ${context}`);
console.log(`Is fake/pre-verification: ${isFake}`);

// Get public key using the same method as getApplicationPublicKey() in onboarding/verify
let publicKey: string | undefined;
try {
publicKey = await this.#keyService.getPublicKey(
KEY_ID,
context,
);
console.log(
`Public key retrieved: ${publicKey?.substring(0, 60)}...`,
);
console.log(`Public key (full): ${publicKey}`);
} catch (error) {
console.error(
`Failed to get public key for ${KEY_ID} with context ${context}:`,
Expand All@@ -244,7 +227,6 @@ export class VaultController {
);
return;
}
console.log("=".repeat(70));

// Get authentication token from environment variable
const authToken = PUBLIC_EID_WALLET_TOKEN || null;
Expand Down
42 changes: 42 additions & 0 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/scanLogic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ interface ScanStores {
authError: Writable<string | null>;
signingError: Writable<string | null>;
authLoading: Writable<boolean>;
isFromScan: Writable<boolean>;
}

interface ScanActions {
Expand DownExpand Up@@ -143,6 +144,7 @@ export function createScanLogic({
const authError = writable<string | null>(null);
const signingError = writable<string | null>(null);
const authLoading = writable(false);
const isFromScan = writable(false);

let permissionsNullable: PermissionState | null = null;

Expand DownExpand Up@@ -284,6 +286,43 @@ export function createScanLogic({
);
}

const fromScan = get(isFromScan);

if (fromScan) {
// For scan: Make POST request with JSON payload
const payload = {
ename: vault.ename,
session: get(session) as string,
signature: signature,
appVersion: "0.4.0",
};

console.log(`📤 Making POST request to: ${redirectUrl}`);
console.log("📦 Payload:", payload);

const response = await fetch(redirectUrl, {
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify(payload),
});

if (!response.ok) {
throw new Error(
`Failed to submit authentication: ${response.status} ${response.statusText}`,
);
}

console.log("✅ POST request successful");

// For scan: Close drawer and show success, skip deeplink redirect logic
codeScannedDrawerOpen.set(false);
loggedInDrawerOpen.set(true);
startScan();
return;
}
// For deeplink: Open URL with encoded URI
// Strip path from redirectUri and append /deeplink-login
const loginUrl = new URL("/deeplink-login", redirectUrl);
loginUrl.searchParams.set("ename", vault.ename);
Expand DownExpand Up@@ -417,6 +456,7 @@ export function createScanLogic({
hostname.set(redirectUrl.hostname);
isSigningRequest.set(false);
authError.set(null); // Clear any previous auth errors
isFromScan.set(true); // Mark that this auth request came from scanning
codeScannedDrawerOpen.set(true);
}

Expand DownExpand Up@@ -1148,6 +1188,7 @@ export function createScanLogic({

isSigningRequest.set(false);
authError.set(null); // Clear any previous auth errors
isFromScan.set(false); // Mark that this auth request came from deeplink
codeScannedDrawerOpen.set(true);
} else if (data.type === "sign") {
console.log("Handling signing deep link");
Expand DownExpand Up@@ -1395,6 +1436,7 @@ export function createScanLogic({
authError,
signingError,
authLoading,
isFromScan,
},
actions: {
startScan,
Expand Down
6 changes: 4 additions & 2 deletions infrastructure/evault-core/src/core/http/server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,10 @@ export async function registerHttpRoutes(
type: "object",
properties: {
w3id: { type: "string" },
publicKey: { type: "string", nullable: true },
keyBindingCertificates: {
type: "array",
items: { type: "string" },
},
Comment thread
coderabbitai[bot] marked this conversation as resolved.
},
},
400: {
Expand DownExpand Up@@ -154,7 +157,6 @@ export async function registerHttpRoutes(
w3id: eName,
keyBindingCertificates: keyBindingCertificates,
};
console.log("Whois request:", result);
return result;
},
);
Expand Down
1 change: 1 addition & 0 deletions platforms/emover-api/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
"cors": "^2.8.5",
"dotenv": "^16.4.5",
"express": "^4.18.2",
"jose": "^5.2.0",
"jsonwebtoken": "^9.0.2",
"pg": "^8.11.3",
"reflect-metadata": "^0.2.1",
Expand Down
65 changes: 57 additions & 8 deletions platforms/emover-api/src/services/MigrationService.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { randomUUID } from "crypto";
import { EventEmitter } from "events";
import axios from "axios";
import * as jose from "jose";
import { AppDataSource } from "../database/data-source";
import { Migration, MigrationStatus } from "../database/entities/Migration";

Expand DownExpand Up@@ -86,17 +87,65 @@ export class MigrationService extends EventEmitter {
},
},
);
if (whoisResponse.data.publicKey) {
publicKey = whoisResponse.data.publicKey;
console.log(
`[MIGRATION] Retrieved public key from old evault: ${publicKey.substring(0, 20)}...`,
);
migration.logs += `[MIGRATION] Retrieved public key from old evault\n`;

// Extract public key from keyBindingCertificates array
const keyBindingCertificates = whoisResponse.data?.keyBindingCertificates;
if (keyBindingCertificates && Array.isArray(keyBindingCertificates) && keyBindingCertificates.length > 0) {
try {
// Get registry JWKS for JWT verification
const jwksUrl = new URL("/.well-known/jwks.json", this.registryUrl).toString();
const jwksResponse = await axios.get(jwksUrl, {
timeout: 10000,
});
const JWKS = jose.createLocalJWKSet(jwksResponse.data);

// Extract public key from first certificate (or try all until one works)
for (const jwt of keyBindingCertificates) {
try {
const { payload } = await jose.jwtVerify(jwt, JWKS);

// Verify ename matches
if (payload.ename !== eName) {
continue;
}

// Extract publicKey from JWT payload
const extractedPublicKey = payload.publicKey as string;
if (extractedPublicKey) {
publicKey = extractedPublicKey;
console.log(
`[MIGRATION] Retrieved public key from old evault: ${publicKey.substring(0, 20)}...`,
);
migration.logs += `[MIGRATION] Retrieved public key from old evault\n`;
break; // Found valid key, exit loop
}
} catch (error) {
// JWT verification failed, try next certificate
console.warn(
`[MIGRATION] Failed to verify key binding certificate, trying next...`,
);
continue;
}
}

if (publicKey === "0x0000000000000000000000000000000000000000") {
console.warn(
`[MIGRATION] No valid public key found in certificates, using default`,
);
migration.logs += `[MIGRATION] Warning: No valid public key found in certificates, using default\n`;
}
} catch (error) {
console.error(
`[MIGRATION ERROR] Failed to verify key binding certificates:`,
error,
);
migration.logs += `[MIGRATION ERROR] Failed to verify certificates, using default\n`;
}
} else {
console.warn(
`[MIGRATION] No public key found in old evault, using default`,
`[MIGRATION] No key binding certificates found in old evault, using default`,
);
migration.logs += `[MIGRATION] Warning: No public key found in old evault, using default\n`;
migration.logs += `[MIGRATION] Warning: No key binding certificates found in old evault, using default\n`;
}
} catch (error) {
console.error(
Expand Down
Loading