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
37 changes: 33 additions & 4 deletions infrastructure/eid-wallet/src/routes/(app)/sign/+page.svelte
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
<script lang="ts">
import { goto } from "$app/navigation";
import { onMount, getContext } from "svelte";
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import type { GlobalState } from "$lib/global";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import { exists, signPayload } from "@auvo/tauri-plugin-crypto-hw-api";
import { getContext, onMount } from "svelte";

const globalState = getContext<() => GlobalState>("globalState")();

Expand All@@ -15,7 +16,14 @@ interface SigningData {
}

let signingData: SigningData | null = $state(null);
let decodedData: any = $state(null);
let decodedData: {
pollId: string;
voteData: {
optionId?: number;
ranks?: Record<string, number>;
};
userId: string;
} | null = $state(null);
let signingStatus: "pending" | "signing" | "success" | "error" =
$state("pending");
let errorMessage = $state("");
Expand DownExpand Up@@ -71,14 +79,35 @@ async function handleSign() {
// For now, we'll simulate the signing process
await new Promise((resolve) => setTimeout(resolve, 2000)); // Simulate signing delay

// check if default key pair exists
const keyExists = exists("default");

if (!keyExists) {
// this would only indicate that it is an old evault/wallet
// ask them to delete and make a new one maybe or some fallback
// behaviour if we need it
throw new Error("Default key pair does not exist");
}

// Create the signed payload
const signedPayload = {
const signedPayload: {
sessionId: string;
publicKey: string; // Use eName as public key for now
message: string;
signature?: string;
} = {
sessionId: signingData.session,
signature: "simulated_signature_" + Date.now(), // In real implementation, this would be the actual signature
publicKey: vault.ename, // Use eName as public key for now
message: messageToSign,
};

const signature = await signPayload(
"default",
JSON.stringify(signedPayload),
);

signedPayload.signature = signature;

// Send the signed payload to the redirect URI
const response = await fetch(signingData.redirect_uri, {
method: "POST",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import { GlobalState } from "$lib/global";
import { ButtonAction, Drawer } from "$lib/ui";
import { capitalize } from "$lib/utils";
import {
exists,
generate,
getPublicKey,
// signPayload, verifySignature
Expand DownExpand Up@@ -86,10 +87,17 @@ let uri: string;

let error: string | null = $state(null);

onMount(() => {
onMount(async () => {
globalState = getContext<() => GlobalState>("globalState")();
// handle verification logic + sec user data in the store

// check if default keypair exists
const keyExists = await exists("default");
if (!keyExists) {
// if not, generate it
await generateApplicationKeyPair();
}

handleContinue = async () => {
loading = true;
const {
Expand All@@ -103,6 +111,7 @@ onMount(() => {
registryEntropy,
namespace: uuidv4(),
verificationId,
publicKey: await getApplicationPublicKey(),
})
.catch(() => {
loading = false;
Expand Down
38 changes: 38 additions & 0 deletions infrastructure/eid-wallet/src/routes/(auth)/verify/+page.svelte
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,12 @@ import { GlobalState } from "$lib/global";
import { ButtonAction } from "$lib/ui";
import Drawer from "$lib/ui/Drawer/Drawer.svelte";
import { capitalize } from "$lib/utils";
import {
exists,
generate,
getPublicKey,
// signPayload, verifySignature
} from "@auvo/tauri-plugin-crypto-hw-api";
import axios from "axios";
import { getContext, onMount } from "svelte";
import { Shadow } from "svelte-loading-spinners";
Expand DownExpand Up@@ -135,12 +141,43 @@ function watchEventStream(id: string) {
};
}

// IMO, call this function early, check if hardware even supports the app
// docs: https://github.com/auvoid/tauri-plugin-crypto-hw/blob/48d0b9db7083f9819766e7b3bfd19e39de9a77f3/examples/tauri-app/src/App.svelte#L13
async function generateApplicationKeyPair() {
let res: string | undefined;
try {
res = await generate("default");
console.log(res);
} catch (e) {
// Put hardware crypto missing error here
console.log(e);
}
return res;
}

async function getApplicationPublicKey() {
let res: string | undefined;
try {
res = await getPublicKey("default");
console.log(res);
} catch (e) {
console.log(e);
}
return res; // check getPublicKey doc comments (multibase hex format)
}

let handleContinue: () => Promise<void>;

onMount(() => {
globalState = getContext<() => GlobalState>("globalState")();
// handle verification logic + sec user data in the store

// check if default key pair exists
const keyExists = exists("default");
if (!keyExists) {
generateApplicationKeyPair();
}

handleContinue = async () => {
if ($status !== "approved") return verifStep.set(0);
if (!globalState) throw new Error("Global state is not defined");
Expand DownExpand Up@@ -171,6 +208,7 @@ onMount(() => {
registryEntropy,
namespace: uuidv4(),
verificationId: $verificaitonId,
publicKey: await getApplicationPublicKey(),
},
);
if (data.success === true) {
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
37 changes: 33 additions & 4 deletions infrastructure/eid-wallet/src/routes/(app)/sign/+page.svelte
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
<script lang="ts">
import { goto } from "$app/navigation";
import { onMount, getContext } from "svelte";
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import type { GlobalState } from "$lib/global";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import { exists, signPayload } from "@auvo/tauri-plugin-crypto-hw-api";
import { getContext, onMount } from "svelte";

const globalState = getContext<() => GlobalState>("globalState")();

Expand All@@ -15,7 +16,14 @@ interface SigningData {
}

let signingData: SigningData | null = $state(null);
let decodedData: any = $state(null);
let decodedData: {
pollId: string;
voteData: {
optionId?: number;
ranks?: Record<string, number>;
};
userId: string;
} | null = $state(null);
let signingStatus: "pending" | "signing" | "success" | "error" =
$state("pending");
let errorMessage = $state("");
Expand DownExpand Up@@ -71,14 +79,35 @@ async function handleSign() {
// For now, we'll simulate the signing process
await new Promise((resolve) => setTimeout(resolve, 2000)); // Simulate signing delay

// check if default key pair exists
const keyExists = exists("default");

if (!keyExists) {
// this would only indicate that it is an old evault/wallet
// ask them to delete and make a new one maybe or some fallback
// behaviour if we need it
throw new Error("Default key pair does not exist");
}

// Create the signed payload
const signedPayload = {
const signedPayload: {
sessionId: string;
publicKey: string; // Use eName as public key for now
message: string;
signature?: string;
} = {
sessionId: signingData.session,
signature: "simulated_signature_" + Date.now(), // In real implementation, this would be the actual signature
publicKey: vault.ename, // Use eName as public key for now
message: messageToSign,
};

const signature = await signPayload(
"default",
JSON.stringify(signedPayload),
);

signedPayload.signature = signature;

// Send the signed payload to the redirect URI
const response = await fetch(signingData.redirect_uri, {
method: "POST",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import { GlobalState } from "$lib/global";
import { ButtonAction, Drawer } from "$lib/ui";
import { capitalize } from "$lib/utils";
import {
exists,
generate,
getPublicKey,
// signPayload, verifySignature
Expand DownExpand Up@@ -86,10 +87,17 @@ let uri: string;

let error: string | null = $state(null);

onMount(() => {
onMount(async () => {
globalState = getContext<() => GlobalState>("globalState")();
// handle verification logic + sec user data in the store

// check if default keypair exists
const keyExists = await exists("default");
if (!keyExists) {
// if not, generate it
await generateApplicationKeyPair();
}

handleContinue = async () => {
loading = true;
const {
Expand All@@ -103,6 +111,7 @@ onMount(() => {
registryEntropy,
namespace: uuidv4(),
verificationId,
publicKey: await getApplicationPublicKey(),
})
.catch(() => {
loading = false;
Expand Down
38 changes: 38 additions & 0 deletions infrastructure/eid-wallet/src/routes/(auth)/verify/+page.svelte
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,12 @@ import { GlobalState } from "$lib/global";
import { ButtonAction } from "$lib/ui";
import Drawer from "$lib/ui/Drawer/Drawer.svelte";
import { capitalize } from "$lib/utils";
import {
exists,
generate,
getPublicKey,
// signPayload, verifySignature
} from "@auvo/tauri-plugin-crypto-hw-api";
import axios from "axios";
import { getContext, onMount } from "svelte";
import { Shadow } from "svelte-loading-spinners";
Expand DownExpand Up@@ -135,12 +141,43 @@ function watchEventStream(id: string) {
};
}

// IMO, call this function early, check if hardware even supports the app
// docs: https://github.com/auvoid/tauri-plugin-crypto-hw/blob/48d0b9db7083f9819766e7b3bfd19e39de9a77f3/examples/tauri-app/src/App.svelte#L13
async function generateApplicationKeyPair() {
let res: string | undefined;
try {
res = await generate("default");
console.log(res);
} catch (e) {
// Put hardware crypto missing error here
console.log(e);
}
return res;
}

async function getApplicationPublicKey() {
let res: string | undefined;
try {
res = await getPublicKey("default");
console.log(res);
} catch (e) {
console.log(e);
}
return res; // check getPublicKey doc comments (multibase hex format)
}

let handleContinue: () => Promise<void>;

onMount(() => {
globalState = getContext<() => GlobalState>("globalState")();
// handle verification logic + sec user data in the store

// check if default key pair exists
const keyExists = exists("default");
if (!keyExists) {
generateApplicationKeyPair();
}

handleContinue = async () => {
if ($status !== "approved") return verifStep.set(0);
if (!globalState) throw new Error("Global state is not defined");
Expand DownExpand Up@@ -171,6 +208,7 @@ onMount(() => {
registryEntropy,
namespace: uuidv4(),
verificationId: $verificaitonId,
publicKey: await getApplicationPublicKey(),
},
);
if (data.success === true) {
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
37 changes: 33 additions & 4 deletions infrastructure/eid-wallet/src/routes/(app)/sign/+page.svelte
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
<script lang="ts">
import { goto } from "$app/navigation";
import { onMount, getContext } from "svelte";
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import type { GlobalState } from "$lib/global";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import { exists, signPayload } from "@auvo/tauri-plugin-crypto-hw-api";
import { getContext, onMount } from "svelte";

const globalState = getContext<() => GlobalState>("globalState")();

Expand All@@ -15,7 +16,14 @@ interface SigningData {
}

let signingData: SigningData | null = $state(null);
let decodedData: any = $state(null);
let decodedData: {
pollId: string;
voteData: {
optionId?: number;
ranks?: Record<string, number>;
};
userId: string;
} | null = $state(null);
let signingStatus: "pending" | "signing" | "success" | "error" =
$state("pending");
let errorMessage = $state("");
Expand DownExpand Up@@ -71,14 +79,35 @@ async function handleSign() {
// For now, we'll simulate the signing process
await new Promise((resolve) => setTimeout(resolve, 2000)); // Simulate signing delay

// check if default key pair exists
const keyExists = exists("default");

if (!keyExists) {
// this would only indicate that it is an old evault/wallet
// ask them to delete and make a new one maybe or some fallback
// behaviour if we need it
throw new Error("Default key pair does not exist");
}

// Create the signed payload
const signedPayload = {
const signedPayload: {
sessionId: string;
publicKey: string; // Use eName as public key for now
message: string;
signature?: string;
} = {
sessionId: signingData.session,
signature: "simulated_signature_" + Date.now(), // In real implementation, this would be the actual signature
publicKey: vault.ename, // Use eName as public key for now
message: messageToSign,
};

const signature = await signPayload(
"default",
JSON.stringify(signedPayload),
);

signedPayload.signature = signature;

// Send the signed payload to the redirect URI
const response = await fetch(signingData.redirect_uri, {
method: "POST",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import { GlobalState } from "$lib/global";
import { ButtonAction, Drawer } from "$lib/ui";
import { capitalize } from "$lib/utils";
import {
exists,
generate,
getPublicKey,
// signPayload, verifySignature
Expand DownExpand Up@@ -86,10 +87,17 @@ let uri: string;

let error: string | null = $state(null);

onMount(() => {
onMount(async () => {
globalState = getContext<() => GlobalState>("globalState")();
// handle verification logic + sec user data in the store

// check if default keypair exists
const keyExists = await exists("default");
if (!keyExists) {
// if not, generate it
await generateApplicationKeyPair();
}

handleContinue = async () => {
loading = true;
const {
Expand All@@ -103,6 +111,7 @@ onMount(() => {
registryEntropy,
namespace: uuidv4(),
verificationId,
publicKey: await getApplicationPublicKey(),
})
.catch(() => {
loading = false;
Expand Down
38 changes: 38 additions & 0 deletions infrastructure/eid-wallet/src/routes/(auth)/verify/+page.svelte
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,12 @@ import { GlobalState } from "$lib/global";
import { ButtonAction } from "$lib/ui";
import Drawer from "$lib/ui/Drawer/Drawer.svelte";
import { capitalize } from "$lib/utils";
import {
exists,
generate,
getPublicKey,
// signPayload, verifySignature
} from "@auvo/tauri-plugin-crypto-hw-api";
import axios from "axios";
import { getContext, onMount } from "svelte";
import { Shadow } from "svelte-loading-spinners";
Expand DownExpand Up@@ -135,12 +141,43 @@ function watchEventStream(id: string) {
};
}

// IMO, call this function early, check if hardware even supports the app
// docs: https://github.com/auvoid/tauri-plugin-crypto-hw/blob/48d0b9db7083f9819766e7b3bfd19e39de9a77f3/examples/tauri-app/src/App.svelte#L13
async function generateApplicationKeyPair() {
let res: string | undefined;
try {
res = await generate("default");
console.log(res);
} catch (e) {
// Put hardware crypto missing error here
console.log(e);
}
return res;
}

async function getApplicationPublicKey() {
let res: string | undefined;
try {
res = await getPublicKey("default");
console.log(res);
} catch (e) {
console.log(e);
}
return res; // check getPublicKey doc comments (multibase hex format)
}

let handleContinue: () => Promise<void>;

onMount(() => {
globalState = getContext<() => GlobalState>("globalState")();
// handle verification logic + sec user data in the store

// check if default key pair exists
const keyExists = exists("default");
if (!keyExists) {
generateApplicationKeyPair();
}

handleContinue = async () => {
if ($status !== "approved") return verifStep.set(0);
if (!globalState) throw new Error("Global state is not defined");
Expand DownExpand Up@@ -171,6 +208,7 @@ onMount(() => {
registryEntropy,
namespace: uuidv4(),
verificationId: $verificaitonId,
publicKey: await getApplicationPublicKey(),
},
);
if (data.success === true) {
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
37 changes: 33 additions & 4 deletions infrastructure/eid-wallet/src/routes/(app)/sign/+page.svelte
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
<script lang="ts">
import { goto } from "$app/navigation";
import { onMount, getContext } from "svelte";
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import type { GlobalState } from "$lib/global";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import { exists, signPayload } from "@auvo/tauri-plugin-crypto-hw-api";
import { getContext, onMount } from "svelte";

const globalState = getContext<() => GlobalState>("globalState")();

Expand All@@ -15,7 +16,14 @@ interface SigningData {
}

let signingData: SigningData | null = $state(null);
let decodedData: any = $state(null);
let decodedData: {
pollId: string;
voteData: {
optionId?: number;
ranks?: Record<string, number>;
};
userId: string;
} | null = $state(null);
let signingStatus: "pending" | "signing" | "success" | "error" =
$state("pending");
let errorMessage = $state("");
Expand DownExpand Up@@ -71,14 +79,35 @@ async function handleSign() {
// For now, we'll simulate the signing process
await new Promise((resolve) => setTimeout(resolve, 2000)); // Simulate signing delay

// check if default key pair exists
const keyExists = exists("default");

if (!keyExists) {
// this would only indicate that it is an old evault/wallet
// ask them to delete and make a new one maybe or some fallback
// behaviour if we need it
throw new Error("Default key pair does not exist");
}

// Create the signed payload
const signedPayload = {
const signedPayload: {
sessionId: string;
publicKey: string; // Use eName as public key for now
message: string;
signature?: string;
} = {
sessionId: signingData.session,
signature: "simulated_signature_" + Date.now(), // In real implementation, this would be the actual signature
publicKey: vault.ename, // Use eName as public key for now
message: messageToSign,
};

const signature = await signPayload(
"default",
JSON.stringify(signedPayload),
);

signedPayload.signature = signature;

// Send the signed payload to the redirect URI
const response = await fetch(signingData.redirect_uri, {
method: "POST",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import { GlobalState } from "$lib/global";
import { ButtonAction, Drawer } from "$lib/ui";
import { capitalize } from "$lib/utils";
import {
exists,
generate,
getPublicKey,
// signPayload, verifySignature
Expand DownExpand Up@@ -86,10 +87,17 @@ let uri: string;

let error: string | null = $state(null);

onMount(() => {
onMount(async () => {
globalState = getContext<() => GlobalState>("globalState")();
// handle verification logic + sec user data in the store

// check if default keypair exists
const keyExists = await exists("default");
if (!keyExists) {
// if not, generate it
await generateApplicationKeyPair();
}

handleContinue = async () => {
loading = true;
const {
Expand All@@ -103,6 +111,7 @@ onMount(() => {
registryEntropy,
namespace: uuidv4(),
verificationId,
publicKey: await getApplicationPublicKey(),
})
.catch(() => {
loading = false;
Expand Down
38 changes: 38 additions & 0 deletions infrastructure/eid-wallet/src/routes/(auth)/verify/+page.svelte
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,12 @@ import { GlobalState } from "$lib/global";
import { ButtonAction } from "$lib/ui";
import Drawer from "$lib/ui/Drawer/Drawer.svelte";
import { capitalize } from "$lib/utils";
import {
exists,
generate,
getPublicKey,
// signPayload, verifySignature
} from "@auvo/tauri-plugin-crypto-hw-api";
import axios from "axios";
import { getContext, onMount } from "svelte";
import { Shadow } from "svelte-loading-spinners";
Expand DownExpand Up@@ -135,12 +141,43 @@ function watchEventStream(id: string) {
};
}

// IMO, call this function early, check if hardware even supports the app
// docs: https://github.com/auvoid/tauri-plugin-crypto-hw/blob/48d0b9db7083f9819766e7b3bfd19e39de9a77f3/examples/tauri-app/src/App.svelte#L13
async function generateApplicationKeyPair() {
let res: string | undefined;
try {
res = await generate("default");
console.log(res);
} catch (e) {
// Put hardware crypto missing error here
console.log(e);
}
return res;
}

async function getApplicationPublicKey() {
let res: string | undefined;
try {
res = await getPublicKey("default");
console.log(res);
} catch (e) {
console.log(e);
}
return res; // check getPublicKey doc comments (multibase hex format)
}

let handleContinue: () => Promise<void>;

onMount(() => {
globalState = getContext<() => GlobalState>("globalState")();
// handle verification logic + sec user data in the store

// check if default key pair exists
const keyExists = exists("default");
if (!keyExists) {
generateApplicationKeyPair();
}

handleContinue = async () => {
if ($status !== "approved") return verifStep.set(0);
if (!globalState) throw new Error("Global state is not defined");
Expand DownExpand Up@@ -171,6 +208,7 @@ onMount(() => {
registryEntropy,
namespace: uuidv4(),
verificationId: $verificaitonId,
publicKey: await getApplicationPublicKey(),
},
);
if (data.success === true) {
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
37 changes: 33 additions & 4 deletions infrastructure/eid-wallet/src/routes/(app)/sign/+page.svelte
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
<script lang="ts">
import { goto } from "$app/navigation";
import { onMount, getContext } from "svelte";
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import type { GlobalState } from "$lib/global";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import { exists, signPayload } from "@auvo/tauri-plugin-crypto-hw-api";
import { getContext, onMount } from "svelte";

const globalState = getContext<() => GlobalState>("globalState")();

Expand All@@ -15,7 +16,14 @@ interface SigningData {
}

let signingData: SigningData | null = $state(null);
let decodedData: any = $state(null);
let decodedData: {
pollId: string;
voteData: {
optionId?: number;
ranks?: Record<string, number>;
};
userId: string;
} | null = $state(null);
let signingStatus: "pending" | "signing" | "success" | "error" =
$state("pending");
let errorMessage = $state("");
Expand DownExpand Up@@ -71,14 +79,35 @@ async function handleSign() {
// For now, we'll simulate the signing process
await new Promise((resolve) => setTimeout(resolve, 2000)); // Simulate signing delay

// check if default key pair exists
const keyExists = exists("default");

if (!keyExists) {
// this would only indicate that it is an old evault/wallet
// ask them to delete and make a new one maybe or some fallback
// behaviour if we need it
throw new Error("Default key pair does not exist");
}

// Create the signed payload
const signedPayload = {
const signedPayload: {
sessionId: string;
publicKey: string; // Use eName as public key for now
message: string;
signature?: string;
} = {
sessionId: signingData.session,
signature: "simulated_signature_" + Date.now(), // In real implementation, this would be the actual signature
publicKey: vault.ename, // Use eName as public key for now
message: messageToSign,
};

const signature = await signPayload(
"default",
JSON.stringify(signedPayload),
);

signedPayload.signature = signature;

// Send the signed payload to the redirect URI
const response = await fetch(signingData.redirect_uri, {
method: "POST",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import { GlobalState } from "$lib/global";
import { ButtonAction, Drawer } from "$lib/ui";
import { capitalize } from "$lib/utils";
import {
exists,
generate,
getPublicKey,
// signPayload, verifySignature
Expand DownExpand Up@@ -86,10 +87,17 @@ let uri: string;

let error: string | null = $state(null);

onMount(() => {
onMount(async () => {
globalState = getContext<() => GlobalState>("globalState")();
// handle verification logic + sec user data in the store

// check if default keypair exists
const keyExists = await exists("default");
if (!keyExists) {
// if not, generate it
await generateApplicationKeyPair();
}

handleContinue = async () => {
loading = true;
const {
Expand All@@ -103,6 +111,7 @@ onMount(() => {
registryEntropy,
namespace: uuidv4(),
verificationId,
publicKey: await getApplicationPublicKey(),
})
.catch(() => {
loading = false;
Expand Down
38 changes: 38 additions & 0 deletions infrastructure/eid-wallet/src/routes/(auth)/verify/+page.svelte
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,12 @@ import { GlobalState } from "$lib/global";
import { ButtonAction } from "$lib/ui";
import Drawer from "$lib/ui/Drawer/Drawer.svelte";
import { capitalize } from "$lib/utils";
import {
exists,
generate,
getPublicKey,
// signPayload, verifySignature
} from "@auvo/tauri-plugin-crypto-hw-api";
import axios from "axios";
import { getContext, onMount } from "svelte";
import { Shadow } from "svelte-loading-spinners";
Expand DownExpand Up@@ -135,12 +141,43 @@ function watchEventStream(id: string) {
};
}

// IMO, call this function early, check if hardware even supports the app
// docs: https://github.com/auvoid/tauri-plugin-crypto-hw/blob/48d0b9db7083f9819766e7b3bfd19e39de9a77f3/examples/tauri-app/src/App.svelte#L13
async function generateApplicationKeyPair() {
let res: string | undefined;
try {
res = await generate("default");
console.log(res);
} catch (e) {
// Put hardware crypto missing error here
console.log(e);
}
return res;
}

async function getApplicationPublicKey() {
let res: string | undefined;
try {
res = await getPublicKey("default");
console.log(res);
} catch (e) {
console.log(e);
}
return res; // check getPublicKey doc comments (multibase hex format)
}

let handleContinue: () => Promise<void>;

onMount(() => {
globalState = getContext<() => GlobalState>("globalState")();
// handle verification logic + sec user data in the store

// check if default key pair exists
const keyExists = exists("default");
if (!keyExists) {
generateApplicationKeyPair();
}

handleContinue = async () => {
if ($status !== "approved") return verifStep.set(0);
if (!globalState) throw new Error("Global state is not defined");
Expand DownExpand Up@@ -171,6 +208,7 @@ onMount(() => {
registryEntropy,
namespace: uuidv4(),
verificationId: $verificaitonId,
publicKey: await getApplicationPublicKey(),
},
);
if (data.success === true) {
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
37 changes: 33 additions & 4 deletions infrastructure/eid-wallet/src/routes/(app)/sign/+page.svelte
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
<script lang="ts">
import { goto } from "$app/navigation";
import { onMount, getContext } from "svelte";
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import type { GlobalState } from "$lib/global";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import { exists, signPayload } from "@auvo/tauri-plugin-crypto-hw-api";
import { getContext, onMount } from "svelte";

const globalState = getContext<() => GlobalState>("globalState")();

Expand All@@ -15,7 +16,14 @@ interface SigningData {
}

let signingData: SigningData | null = $state(null);
let decodedData: any = $state(null);
let decodedData: {
pollId: string;
voteData: {
optionId?: number;
ranks?: Record<string, number>;
};
userId: string;
} | null = $state(null);
let signingStatus: "pending" | "signing" | "success" | "error" =
$state("pending");
let errorMessage = $state("");
Expand DownExpand Up@@ -71,14 +79,35 @@ async function handleSign() {
// For now, we'll simulate the signing process
await new Promise((resolve) => setTimeout(resolve, 2000)); // Simulate signing delay

// check if default key pair exists
const keyExists = exists("default");

if (!keyExists) {
// this would only indicate that it is an old evault/wallet
// ask them to delete and make a new one maybe or some fallback
// behaviour if we need it
throw new Error("Default key pair does not exist");
}

// Create the signed payload
const signedPayload = {
const signedPayload: {
sessionId: string;
publicKey: string; // Use eName as public key for now
message: string;
signature?: string;
} = {
sessionId: signingData.session,
signature: "simulated_signature_" + Date.now(), // In real implementation, this would be the actual signature
publicKey: vault.ename, // Use eName as public key for now
message: messageToSign,
};

const signature = await signPayload(
"default",
JSON.stringify(signedPayload),
);

signedPayload.signature = signature;

// Send the signed payload to the redirect URI
const response = await fetch(signingData.redirect_uri, {
method: "POST",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import { GlobalState } from "$lib/global";
import { ButtonAction, Drawer } from "$lib/ui";
import { capitalize } from "$lib/utils";
import {
exists,
generate,
getPublicKey,
// signPayload, verifySignature
Expand DownExpand Up@@ -86,10 +87,17 @@ let uri: string;

let error: string | null = $state(null);

onMount(() => {
onMount(async () => {
globalState = getContext<() => GlobalState>("globalState")();
// handle verification logic + sec user data in the store

// check if default keypair exists
const keyExists = await exists("default");
if (!keyExists) {
// if not, generate it
await generateApplicationKeyPair();
}

handleContinue = async () => {
loading = true;
const {
Expand All@@ -103,6 +111,7 @@ onMount(() => {
registryEntropy,
namespace: uuidv4(),
verificationId,
publicKey: await getApplicationPublicKey(),
})
.catch(() => {
loading = false;
Expand Down
38 changes: 38 additions & 0 deletions infrastructure/eid-wallet/src/routes/(auth)/verify/+page.svelte
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,12 @@ import { GlobalState } from "$lib/global";
import { ButtonAction } from "$lib/ui";
import Drawer from "$lib/ui/Drawer/Drawer.svelte";
import { capitalize } from "$lib/utils";
import {
exists,
generate,
getPublicKey,
// signPayload, verifySignature
} from "@auvo/tauri-plugin-crypto-hw-api";
import axios from "axios";
import { getContext, onMount } from "svelte";
import { Shadow } from "svelte-loading-spinners";
Expand DownExpand Up@@ -135,12 +141,43 @@ function watchEventStream(id: string) {
};
}

// IMO, call this function early, check if hardware even supports the app
// docs: https://github.com/auvoid/tauri-plugin-crypto-hw/blob/48d0b9db7083f9819766e7b3bfd19e39de9a77f3/examples/tauri-app/src/App.svelte#L13
async function generateApplicationKeyPair() {
let res: string | undefined;
try {
res = await generate("default");
console.log(res);
} catch (e) {
// Put hardware crypto missing error here
console.log(e);
}
return res;
}

async function getApplicationPublicKey() {
let res: string | undefined;
try {
res = await getPublicKey("default");
console.log(res);
} catch (e) {
console.log(e);
}
return res; // check getPublicKey doc comments (multibase hex format)
}

let handleContinue: () => Promise<void>;

onMount(() => {
globalState = getContext<() => GlobalState>("globalState")();
// handle verification logic + sec user data in the store

// check if default key pair exists
const keyExists = exists("default");
if (!keyExists) {
generateApplicationKeyPair();
}

handleContinue = async () => {
if ($status !== "approved") return verifStep.set(0);
if (!globalState) throw new Error("Global state is not defined");
Expand DownExpand Up@@ -171,6 +208,7 @@ onMount(() => {
registryEntropy,
namespace: uuidv4(),
verificationId: $verificaitonId,
publicKey: await getApplicationPublicKey(),
},
);
if (data.success === true) {
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
37 changes: 33 additions & 4 deletions infrastructure/eid-wallet/src/routes/(app)/sign/+page.svelte
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
<script lang="ts">
import { goto } from "$app/navigation";
import { onMount, getContext } from "svelte";
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import type { GlobalState } from "$lib/global";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import { exists, signPayload } from "@auvo/tauri-plugin-crypto-hw-api";
import { getContext, onMount } from "svelte";

const globalState = getContext<() => GlobalState>("globalState")();

Expand All@@ -15,7 +16,14 @@ interface SigningData {
}

let signingData: SigningData | null = $state(null);
let decodedData: any = $state(null);
let decodedData: {
pollId: string;
voteData: {
optionId?: number;
ranks?: Record<string, number>;
};
userId: string;
} | null = $state(null);
let signingStatus: "pending" | "signing" | "success" | "error" =
$state("pending");
let errorMessage = $state("");
Expand DownExpand Up@@ -71,14 +79,35 @@ async function handleSign() {
// For now, we'll simulate the signing process
await new Promise((resolve) => setTimeout(resolve, 2000)); // Simulate signing delay

// check if default key pair exists
const keyExists = exists("default");

if (!keyExists) {
// this would only indicate that it is an old evault/wallet
// ask them to delete and make a new one maybe or some fallback
// behaviour if we need it
throw new Error("Default key pair does not exist");
}

// Create the signed payload
const signedPayload = {
const signedPayload: {
sessionId: string;
publicKey: string; // Use eName as public key for now
message: string;
signature?: string;
} = {
sessionId: signingData.session,
signature: "simulated_signature_" + Date.now(), // In real implementation, this would be the actual signature
publicKey: vault.ename, // Use eName as public key for now
message: messageToSign,
};

const signature = await signPayload(
"default",
JSON.stringify(signedPayload),
);

signedPayload.signature = signature;

// Send the signed payload to the redirect URI
const response = await fetch(signingData.redirect_uri, {
method: "POST",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import { GlobalState } from "$lib/global";
import { ButtonAction, Drawer } from "$lib/ui";
import { capitalize } from "$lib/utils";
import {
exists,
generate,
getPublicKey,
// signPayload, verifySignature
Expand DownExpand Up@@ -86,10 +87,17 @@ let uri: string;

let error: string | null = $state(null);

onMount(() => {
onMount(async () => {
globalState = getContext<() => GlobalState>("globalState")();
// handle verification logic + sec user data in the store

// check if default keypair exists
const keyExists = await exists("default");
if (!keyExists) {
// if not, generate it
await generateApplicationKeyPair();
}

handleContinue = async () => {
loading = true;
const {
Expand All@@ -103,6 +111,7 @@ onMount(() => {
registryEntropy,
namespace: uuidv4(),
verificationId,
publicKey: await getApplicationPublicKey(),
})
.catch(() => {
loading = false;
Expand Down
38 changes: 38 additions & 0 deletions infrastructure/eid-wallet/src/routes/(auth)/verify/+page.svelte
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,12 @@ import { GlobalState } from "$lib/global";
import { ButtonAction } from "$lib/ui";
import Drawer from "$lib/ui/Drawer/Drawer.svelte";
import { capitalize } from "$lib/utils";
import {
exists,
generate,
getPublicKey,
// signPayload, verifySignature
} from "@auvo/tauri-plugin-crypto-hw-api";
import axios from "axios";
import { getContext, onMount } from "svelte";
import { Shadow } from "svelte-loading-spinners";
Expand DownExpand Up@@ -135,12 +141,43 @@ function watchEventStream(id: string) {
};
}

// IMO, call this function early, check if hardware even supports the app
// docs: https://github.com/auvoid/tauri-plugin-crypto-hw/blob/48d0b9db7083f9819766e7b3bfd19e39de9a77f3/examples/tauri-app/src/App.svelte#L13
async function generateApplicationKeyPair() {
let res: string | undefined;
try {
res = await generate("default");
console.log(res);
} catch (e) {
// Put hardware crypto missing error here
console.log(e);
}
return res;
}

async function getApplicationPublicKey() {
let res: string | undefined;
try {
res = await getPublicKey("default");
console.log(res);
} catch (e) {
console.log(e);
}
return res; // check getPublicKey doc comments (multibase hex format)
}

let handleContinue: () => Promise<void>;

onMount(() => {
globalState = getContext<() => GlobalState>("globalState")();
// handle verification logic + sec user data in the store

// check if default key pair exists
const keyExists = exists("default");
if (!keyExists) {
generateApplicationKeyPair();
}

handleContinue = async () => {
if ($status !== "approved") return verifStep.set(0);
if (!globalState) throw new Error("Global state is not defined");
Expand DownExpand Up@@ -171,6 +208,7 @@ onMount(() => {
registryEntropy,
namespace: uuidv4(),
verificationId: $verificaitonId,
publicKey: await getApplicationPublicKey(),
},
);
if (data.success === true) {
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
37 changes: 33 additions & 4 deletions infrastructure/eid-wallet/src/routes/(app)/sign/+page.svelte
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
<script lang="ts">
import { goto } from "$app/navigation";
import { onMount, getContext } from "svelte";
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import type { GlobalState } from "$lib/global";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import { exists, signPayload } from "@auvo/tauri-plugin-crypto-hw-api";
import { getContext, onMount } from "svelte";

const globalState = getContext<() => GlobalState>("globalState")();

Expand All@@ -15,7 +16,14 @@ interface SigningData {
}

let signingData: SigningData | null = $state(null);
let decodedData: any = $state(null);
let decodedData: {
pollId: string;
voteData: {
optionId?: number;
ranks?: Record<string, number>;
};
userId: string;
} | null = $state(null);
let signingStatus: "pending" | "signing" | "success" | "error" =
$state("pending");
let errorMessage = $state("");
Expand DownExpand Up@@ -71,14 +79,35 @@ async function handleSign() {
// For now, we'll simulate the signing process
await new Promise((resolve) => setTimeout(resolve, 2000)); // Simulate signing delay

// check if default key pair exists
const keyExists = exists("default");

if (!keyExists) {
// this would only indicate that it is an old evault/wallet
// ask them to delete and make a new one maybe or some fallback
// behaviour if we need it
throw new Error("Default key pair does not exist");
}

// Create the signed payload
const signedPayload = {
const signedPayload: {
sessionId: string;
publicKey: string; // Use eName as public key for now
message: string;
signature?: string;
} = {
sessionId: signingData.session,
signature: "simulated_signature_" + Date.now(), // In real implementation, this would be the actual signature
publicKey: vault.ename, // Use eName as public key for now
message: messageToSign,
};

const signature = await signPayload(
"default",
JSON.stringify(signedPayload),
);

signedPayload.signature = signature;

// Send the signed payload to the redirect URI
const response = await fetch(signingData.redirect_uri, {
method: "POST",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import { GlobalState } from "$lib/global";
import { ButtonAction, Drawer } from "$lib/ui";
import { capitalize } from "$lib/utils";
import {
exists,
generate,
getPublicKey,
// signPayload, verifySignature
Expand DownExpand Up@@ -86,10 +87,17 @@ let uri: string;

let error: string | null = $state(null);

onMount(() => {
onMount(async () => {
globalState = getContext<() => GlobalState>("globalState")();
// handle verification logic + sec user data in the store

// check if default keypair exists
const keyExists = await exists("default");
if (!keyExists) {
// if not, generate it
await generateApplicationKeyPair();
}

handleContinue = async () => {
loading = true;
const {
Expand All@@ -103,6 +111,7 @@ onMount(() => {
registryEntropy,
namespace: uuidv4(),
verificationId,
publicKey: await getApplicationPublicKey(),
})
.catch(() => {
loading = false;
Expand Down
38 changes: 38 additions & 0 deletions infrastructure/eid-wallet/src/routes/(auth)/verify/+page.svelte
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,12 @@ import { GlobalState } from "$lib/global";
import { ButtonAction } from "$lib/ui";
import Drawer from "$lib/ui/Drawer/Drawer.svelte";
import { capitalize } from "$lib/utils";
import {
exists,
generate,
getPublicKey,
// signPayload, verifySignature
} from "@auvo/tauri-plugin-crypto-hw-api";
import axios from "axios";
import { getContext, onMount } from "svelte";
import { Shadow } from "svelte-loading-spinners";
Expand DownExpand Up@@ -135,12 +141,43 @@ function watchEventStream(id: string) {
};
}

// IMO, call this function early, check if hardware even supports the app
// docs: https://github.com/auvoid/tauri-plugin-crypto-hw/blob/48d0b9db7083f9819766e7b3bfd19e39de9a77f3/examples/tauri-app/src/App.svelte#L13
async function generateApplicationKeyPair() {
let res: string | undefined;
try {
res = await generate("default");
console.log(res);
} catch (e) {
// Put hardware crypto missing error here
console.log(e);
}
return res;
}

async function getApplicationPublicKey() {
let res: string | undefined;
try {
res = await getPublicKey("default");
console.log(res);
} catch (e) {
console.log(e);
}
return res; // check getPublicKey doc comments (multibase hex format)
}

let handleContinue: () => Promise<void>;

onMount(() => {
globalState = getContext<() => GlobalState>("globalState")();
// handle verification logic + sec user data in the store

// check if default key pair exists
const keyExists = exists("default");
if (!keyExists) {
generateApplicationKeyPair();
}

handleContinue = async () => {
if ($status !== "approved") return verifStep.set(0);
if (!globalState) throw new Error("Global state is not defined");
Expand DownExpand Up@@ -171,6 +208,7 @@ onMount(() => {
registryEntropy,
namespace: uuidv4(),
verificationId: $verificaitonId,
publicKey: await getApplicationPublicKey(),
},
);
if (data.success === true) {
Expand Down
Loading