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
24 changes: 19 additions & 5 deletions infrastructure/eid-wallet/src/routes/(app)/+layout.svelte
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
<script lang="ts">
import { page } from "$app/state";
import type { Snippet } from "svelte";
import type { LayoutData } from "./$types";
import { page } from "$app/state";
import type { Snippet } from "svelte";
import type { LayoutData } from "./$types";

let { data, children }: { data: LayoutData; children: Snippet } = $props();
let { data, children }: { data: LayoutData; children: Snippet } = $props();

let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");
let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");

$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage)
return document.body.classList.add("custom-global-style");
return document.body.classList.remove("custom-global-style");
});
Comment on lines +10 to +15

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Improve effect cleanup and add component unmount handling.

The effect implementation needs better cleanup logic to handle component unmounting and prevent memory leaks.

 $effect(() => {
const isScanPage = currentRoute === "scan-qr";
- if (isScanPage)- return document.body.classList.add("custom-global-style");- return document.body.classList.remove("custom-global-style");++ if (isScanPage) {+ document.body.classList.add("custom-global-style");+ } else {+ document.body.classList.remove("custom-global-style");+ }++ // Cleanup function+ return () => {+ document.body.classList.remove("custom-global-style");+ };
});

This ensures the class is properly removed when the component unmounts or the route changes.

📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage)
return document.body.classList.add("custom-global-style");
return document.body.classList.remove("custom-global-style");
});
$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage) {
document.body.classList.add("custom-global-style");
} else {
document.body.classList.remove("custom-global-style");
}
// Cleanup when the effect re-runs or the component unmounts
return () => {
document.body.classList.remove("custom-global-style");
};
});
🤖 Prompt for AI Agents
In infrastructure/eid-wallet/src/routes/(app)/+layout.svelte around lines 10 to
15, the effect adding or removing the "custom-global-style" class on
document.body lacks proper cleanup for component unmounting. Refactor the effect
to include a cleanup function that removes the class when the component unmounts
or when the route changes, ensuring no leftover side effects or memory leaks.

</script>

<!-- Dev only: remove this when deploying to production -->
Expand All@@ -18,3 +25,10 @@ let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");
<div class="p-6">
{@render children()}
</div>

<style>
:global(body.custom-global-style, body.custom-global-style *:not(button)) {
background-color: #00000000;
overflow-y: hidden;
}
</style>
234 changes: 108 additions & 126 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,107 @@
<script lang="ts">
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import {
FlashlightIcon,
Image02Icon,
QrCodeIcon,
} from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
Format,
type PermissionState,
type Scanned,
cancel,
checkPermissions,
requestPermissions,
scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";

const pathProps: SVGAttributes<SVGPathElement> = {
stroke: "white",
"stroke-width": 7,
"stroke-linecap": "round",
"stroke-linejoin": "round",
};

let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let flashlightOn = $state(false);

let scannedData: Scanned | undefined = $state(undefined);

let scanning = false;
let loading = false;

let permissions_nullable: PermissionState | null;

async function startScan() {
let permissions = await checkPermissions()
.then((permissions) => {
return permissions;
})
.catch(() => {
return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
});

// TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
if (permissions === "prompt") {
permissions = await requestPermissions(); // handle in more detail?
}

permissions_nullable = permissions;

if (permissions === "granted") {
// Scanning parameters
const formats = [Format.QRCode];
const windowed = true;

if (scanning) return;
scanning = true;
scan({ formats, windowed })
.then((res) => {
console.log("Scan result:", res);
scannedData = res;
codeScannedDrawerOpen = true;
})
.catch((error) => {
// TODO: display error to user
console.error("Scan error:", error);
import { PUBLIC_PROVISIONER_URL } from "$env/static/public";
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import { QrCodeIcon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
Format,
type PermissionState,
type Scanned,
cancel,
checkPermissions,
requestPermissions,
scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { getContext, onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";
import type { GlobalState } from "$lib/global";
import axios from "axios";

const globalState = getContext<() => GlobalState>("globalState")();
const pathProps: SVGAttributes<SVGPathElement> = {
stroke: "white",
"stroke-width": 7,
"stroke-linecap": "round",
"stroke-linejoin": "round",
};

let platform = $state();
let hostname = $state();
let session = $state();
let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let scannedData: Scanned | undefined = $state(undefined);
let scanning = false;
let loading = false;
let redirect = $state();
let permissions_nullable: PermissionState | null;

async function startScan() {
let permissions = await checkPermissions()
.then((permissions) => {
return permissions;
})
.finally(() => {
scanning = false;
.catch(() => {
return null;
});

if (permissions === "prompt") {
permissions = await requestPermissions();
}

permissions_nullable = permissions;

if (permissions === "granted") {
const formats = [Format.QRCode];
const windowed = true;

if (scanning) return;
scanning = true;
scan({ formats, windowed })
.then((res) => {
scannedData = res;
const url = new URL(res.content);
platform = url.searchParams.get("platform");
const redirectUrl = new URL(
url.searchParams.get("redirect") || "",
);
redirect = url.searchParams.get("redirect");
session = url.searchParams.get("session");
hostname = redirectUrl.hostname;
codeScannedDrawerOpen = true;
})
.catch((error) => {
console.error("Scan error:", error);
})
.finally(() => {
scanning = false;
});
}
}

console.error("Permission denied or not granted");
// TODO: consider handling GUI for permission denied
}
async function handleAuth() {
const vault = await globalState.vaultController.vault;
if (!vault || !redirect) return;
await axios.post(redirect, { ename: vault.ename, session });
codeScannedDrawerOpen = false;
loggedInDrawerOpen = true;
startScan();
}

async function cancelScan() {
await cancel();
scanning = false;
}
async function cancelScan() {
await cancel();
scanning = false;
}

onMount(async () => {
startScan();
});
onMount(async () => {
startScan();
});

onDestroy(async () => {
await cancelScan();
});
onDestroy(async () => {
await cancelScan();
});
</script>

<AppNav title="Scan QR Code" titleClasses="text-white" iconColor="white" />
Expand All@@ -116,27 +126,7 @@ onDestroy(async () => {

<div
class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center"
>
<Button.Icon icon={Image02Icon} bgColor="white" bgSize="md" />
<Button.Icon
icon={QrCodeIcon}
bgColor="white"
bgSize="lg"
iconSize="lg"
callback={() => {
codeScannedDrawerOpen = true;
}}
/>
<Button.Icon
icon={FlashlightIcon}
aria-label="Toggle flashlight"
bgSize="md"
iconSize={32}
bgColor={flashlightOn ? "white" : "secondary"}
iconColor="black"
onclick={() => (flashlightOn = !flashlightOn)}
/>
</div>
></div>

<!-- code scanned drawer -->
<Drawer
Expand DownExpand Up@@ -166,9 +156,16 @@ onDestroy(async () => {
<p class="text-black-700">You're trying to access the following site</p>

<div class="bg-gray rounded-2xl w-full p-4 mt-4">
<h4 class="text-base text-black-700">Platform Name</h4>
<p class="text-black-700 font-normal capitalize">
{platform ?? "Unable to get name"}
</p>
</div>

<div class="bg-gray rounded-2xl w-full p-4">
<h4 class="text-base text-black-700">Website URL</h4>
<p class="text-black-700 font-normal underline">
{scannedData?.content}
<p class="text-black-700 font-normal">
{hostname ?? scannedData?.content}
</p>
</div>
<div class="flex justify-center gap-3 items-center mt-4">
Expand All@@ -182,15 +179,7 @@ onDestroy(async () => {
>
Decline
</Button.Action>
<Button.Action
variant="solid"
class="w-full"
callback={() => {
codeScannedDrawerOpen = false;
loggedInDrawerOpen = true;
startScan();
}}
>
<Button.Action variant="solid" class="w-full" callback={handleAuth}>
Confirm
</Button.Action>
</div>
Expand DownExpand Up@@ -221,7 +210,7 @@ onDestroy(async () => {
</div>

<h4>You're logged in!</h4>
<p class="text-black-700">You're now connected to this service'</p>
<p class="text-black-700">You're now connected to {platform}</p>

<div class="flex justify-center items-center mt-4">
<Button.Action
Expand All@@ -236,10 +225,3 @@ onDestroy(async () => {
</Button.Action>
</div>
</Drawer>

<style>
:global(body, *:not(button)) {
background-color: #00000000;
overflow-y: hidden;
}
</style>
2 changes: 2 additions & 0 deletions infrastructure/evault-provisioner/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ app.post(
res: Response<ProvisionResponse>,
) => {
try {
console.log("provisioning init");
if (!process.env.PUBLIC_REGISTRY_URL)
throw new Error("PUBLIC_REGISTRY_URL is not set");
const { registryEntropy, namespace, verificationId } = req.body;
Expand All@@ -95,6 +96,7 @@ app.post(
if (verification.consumed)
throw new Error("This verification ID has already been used");

console.log("jwk");
const jwksResponse = await axios.get(
new URL(
`/.well-known/jwks.json`,
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
24 changes: 19 additions & 5 deletions infrastructure/eid-wallet/src/routes/(app)/+layout.svelte
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
<script lang="ts">
import { page } from "$app/state";
import type { Snippet } from "svelte";
import type { LayoutData } from "./$types";
import { page } from "$app/state";
import type { Snippet } from "svelte";
import type { LayoutData } from "./$types";

let { data, children }: { data: LayoutData; children: Snippet } = $props();
let { data, children }: { data: LayoutData; children: Snippet } = $props();

let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");
let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");

$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage)
return document.body.classList.add("custom-global-style");
return document.body.classList.remove("custom-global-style");
});
Comment on lines +10 to +15

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Improve effect cleanup and add component unmount handling.

The effect implementation needs better cleanup logic to handle component unmounting and prevent memory leaks.

 $effect(() => {
const isScanPage = currentRoute === "scan-qr";
- if (isScanPage)- return document.body.classList.add("custom-global-style");- return document.body.classList.remove("custom-global-style");++ if (isScanPage) {+ document.body.classList.add("custom-global-style");+ } else {+ document.body.classList.remove("custom-global-style");+ }++ // Cleanup function+ return () => {+ document.body.classList.remove("custom-global-style");+ };
});

This ensures the class is properly removed when the component unmounts or the route changes.

📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage)
return document.body.classList.add("custom-global-style");
return document.body.classList.remove("custom-global-style");
});
$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage) {
document.body.classList.add("custom-global-style");
} else {
document.body.classList.remove("custom-global-style");
}
// Cleanup when the effect re-runs or the component unmounts
return () => {
document.body.classList.remove("custom-global-style");
};
});
🤖 Prompt for AI Agents
In infrastructure/eid-wallet/src/routes/(app)/+layout.svelte around lines 10 to
15, the effect adding or removing the "custom-global-style" class on
document.body lacks proper cleanup for component unmounting. Refactor the effect
to include a cleanup function that removes the class when the component unmounts
or when the route changes, ensuring no leftover side effects or memory leaks.

</script>

<!-- Dev only: remove this when deploying to production -->
Expand All@@ -18,3 +25,10 @@ let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");
<div class="p-6">
{@render children()}
</div>

<style>
:global(body.custom-global-style, body.custom-global-style *:not(button)) {
background-color: #00000000;
overflow-y: hidden;
}
</style>
234 changes: 108 additions & 126 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,107 @@
<script lang="ts">
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import {
FlashlightIcon,
Image02Icon,
QrCodeIcon,
} from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
Format,
type PermissionState,
type Scanned,
cancel,
checkPermissions,
requestPermissions,
scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";

const pathProps: SVGAttributes<SVGPathElement> = {
stroke: "white",
"stroke-width": 7,
"stroke-linecap": "round",
"stroke-linejoin": "round",
};

let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let flashlightOn = $state(false);

let scannedData: Scanned | undefined = $state(undefined);

let scanning = false;
let loading = false;

let permissions_nullable: PermissionState | null;

async function startScan() {
let permissions = await checkPermissions()
.then((permissions) => {
return permissions;
})
.catch(() => {
return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
});

// TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
if (permissions === "prompt") {
permissions = await requestPermissions(); // handle in more detail?
}

permissions_nullable = permissions;

if (permissions === "granted") {
// Scanning parameters
const formats = [Format.QRCode];
const windowed = true;

if (scanning) return;
scanning = true;
scan({ formats, windowed })
.then((res) => {
console.log("Scan result:", res);
scannedData = res;
codeScannedDrawerOpen = true;
})
.catch((error) => {
// TODO: display error to user
console.error("Scan error:", error);
import { PUBLIC_PROVISIONER_URL } from "$env/static/public";
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import { QrCodeIcon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
Format,
type PermissionState,
type Scanned,
cancel,
checkPermissions,
requestPermissions,
scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { getContext, onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";
import type { GlobalState } from "$lib/global";
import axios from "axios";

const globalState = getContext<() => GlobalState>("globalState")();
const pathProps: SVGAttributes<SVGPathElement> = {
stroke: "white",
"stroke-width": 7,
"stroke-linecap": "round",
"stroke-linejoin": "round",
};

let platform = $state();
let hostname = $state();
let session = $state();
let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let scannedData: Scanned | undefined = $state(undefined);
let scanning = false;
let loading = false;
let redirect = $state();
let permissions_nullable: PermissionState | null;

async function startScan() {
let permissions = await checkPermissions()
.then((permissions) => {
return permissions;
})
.finally(() => {
scanning = false;
.catch(() => {
return null;
});

if (permissions === "prompt") {
permissions = await requestPermissions();
}

permissions_nullable = permissions;

if (permissions === "granted") {
const formats = [Format.QRCode];
const windowed = true;

if (scanning) return;
scanning = true;
scan({ formats, windowed })
.then((res) => {
scannedData = res;
const url = new URL(res.content);
platform = url.searchParams.get("platform");
const redirectUrl = new URL(
url.searchParams.get("redirect") || "",
);
redirect = url.searchParams.get("redirect");
session = url.searchParams.get("session");
hostname = redirectUrl.hostname;
codeScannedDrawerOpen = true;
})
.catch((error) => {
console.error("Scan error:", error);
})
.finally(() => {
scanning = false;
});
}
}

console.error("Permission denied or not granted");
// TODO: consider handling GUI for permission denied
}
async function handleAuth() {
const vault = await globalState.vaultController.vault;
if (!vault || !redirect) return;
await axios.post(redirect, { ename: vault.ename, session });
codeScannedDrawerOpen = false;
loggedInDrawerOpen = true;
startScan();
}

async function cancelScan() {
await cancel();
scanning = false;
}
async function cancelScan() {
await cancel();
scanning = false;
}

onMount(async () => {
startScan();
});
onMount(async () => {
startScan();
});

onDestroy(async () => {
await cancelScan();
});
onDestroy(async () => {
await cancelScan();
});
</script>

<AppNav title="Scan QR Code" titleClasses="text-white" iconColor="white" />
Expand All@@ -116,27 +126,7 @@ onDestroy(async () => {

<div
class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center"
>
<Button.Icon icon={Image02Icon} bgColor="white" bgSize="md" />
<Button.Icon
icon={QrCodeIcon}
bgColor="white"
bgSize="lg"
iconSize="lg"
callback={() => {
codeScannedDrawerOpen = true;
}}
/>
<Button.Icon
icon={FlashlightIcon}
aria-label="Toggle flashlight"
bgSize="md"
iconSize={32}
bgColor={flashlightOn ? "white" : "secondary"}
iconColor="black"
onclick={() => (flashlightOn = !flashlightOn)}
/>
</div>
></div>

<!-- code scanned drawer -->
<Drawer
Expand DownExpand Up@@ -166,9 +156,16 @@ onDestroy(async () => {
<p class="text-black-700">You're trying to access the following site</p>

<div class="bg-gray rounded-2xl w-full p-4 mt-4">
<h4 class="text-base text-black-700">Platform Name</h4>
<p class="text-black-700 font-normal capitalize">
{platform ?? "Unable to get name"}
</p>
</div>

<div class="bg-gray rounded-2xl w-full p-4">
<h4 class="text-base text-black-700">Website URL</h4>
<p class="text-black-700 font-normal underline">
{scannedData?.content}
<p class="text-black-700 font-normal">
{hostname ?? scannedData?.content}
</p>
</div>
<div class="flex justify-center gap-3 items-center mt-4">
Expand All@@ -182,15 +179,7 @@ onDestroy(async () => {
>
Decline
</Button.Action>
<Button.Action
variant="solid"
class="w-full"
callback={() => {
codeScannedDrawerOpen = false;
loggedInDrawerOpen = true;
startScan();
}}
>
<Button.Action variant="solid" class="w-full" callback={handleAuth}>
Confirm
</Button.Action>
</div>
Expand DownExpand Up@@ -221,7 +210,7 @@ onDestroy(async () => {
</div>

<h4>You're logged in!</h4>
<p class="text-black-700">You're now connected to this service'</p>
<p class="text-black-700">You're now connected to {platform}</p>

<div class="flex justify-center items-center mt-4">
<Button.Action
Expand All@@ -236,10 +225,3 @@ onDestroy(async () => {
</Button.Action>
</div>
</Drawer>

<style>
:global(body, *:not(button)) {
background-color: #00000000;
overflow-y: hidden;
}
</style>
2 changes: 2 additions & 0 deletions infrastructure/evault-provisioner/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ app.post(
res: Response<ProvisionResponse>,
) => {
try {
console.log("provisioning init");
if (!process.env.PUBLIC_REGISTRY_URL)
throw new Error("PUBLIC_REGISTRY_URL is not set");
const { registryEntropy, namespace, verificationId } = req.body;
Expand All@@ -95,6 +96,7 @@ app.post(
if (verification.consumed)
throw new Error("This verification ID has already been used");

console.log("jwk");
const jwksResponse = await axios.get(
new URL(
`/.well-known/jwks.json`,
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
24 changes: 19 additions & 5 deletions infrastructure/eid-wallet/src/routes/(app)/+layout.svelte
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
<script lang="ts">
import { page } from "$app/state";
import type { Snippet } from "svelte";
import type { LayoutData } from "./$types";
import { page } from "$app/state";
import type { Snippet } from "svelte";
import type { LayoutData } from "./$types";

let { data, children }: { data: LayoutData; children: Snippet } = $props();
let { data, children }: { data: LayoutData; children: Snippet } = $props();

let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");
let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");

$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage)
return document.body.classList.add("custom-global-style");
return document.body.classList.remove("custom-global-style");
});
Comment on lines +10 to +15

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Improve effect cleanup and add component unmount handling.

The effect implementation needs better cleanup logic to handle component unmounting and prevent memory leaks.

 $effect(() => {
const isScanPage = currentRoute === "scan-qr";
- if (isScanPage)- return document.body.classList.add("custom-global-style");- return document.body.classList.remove("custom-global-style");++ if (isScanPage) {+ document.body.classList.add("custom-global-style");+ } else {+ document.body.classList.remove("custom-global-style");+ }++ // Cleanup function+ return () => {+ document.body.classList.remove("custom-global-style");+ };
});

This ensures the class is properly removed when the component unmounts or the route changes.

📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage)
return document.body.classList.add("custom-global-style");
return document.body.classList.remove("custom-global-style");
});
$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage) {
document.body.classList.add("custom-global-style");
} else {
document.body.classList.remove("custom-global-style");
}
// Cleanup when the effect re-runs or the component unmounts
return () => {
document.body.classList.remove("custom-global-style");
};
});
🤖 Prompt for AI Agents
In infrastructure/eid-wallet/src/routes/(app)/+layout.svelte around lines 10 to
15, the effect adding or removing the "custom-global-style" class on
document.body lacks proper cleanup for component unmounting. Refactor the effect
to include a cleanup function that removes the class when the component unmounts
or when the route changes, ensuring no leftover side effects or memory leaks.

</script>

<!-- Dev only: remove this when deploying to production -->
Expand All@@ -18,3 +25,10 @@ let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");
<div class="p-6">
{@render children()}
</div>

<style>
:global(body.custom-global-style, body.custom-global-style *:not(button)) {
background-color: #00000000;
overflow-y: hidden;
}
</style>
234 changes: 108 additions & 126 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,107 @@
<script lang="ts">
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import {
FlashlightIcon,
Image02Icon,
QrCodeIcon,
} from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
Format,
type PermissionState,
type Scanned,
cancel,
checkPermissions,
requestPermissions,
scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";

const pathProps: SVGAttributes<SVGPathElement> = {
stroke: "white",
"stroke-width": 7,
"stroke-linecap": "round",
"stroke-linejoin": "round",
};

let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let flashlightOn = $state(false);

let scannedData: Scanned | undefined = $state(undefined);

let scanning = false;
let loading = false;

let permissions_nullable: PermissionState | null;

async function startScan() {
let permissions = await checkPermissions()
.then((permissions) => {
return permissions;
})
.catch(() => {
return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
});

// TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
if (permissions === "prompt") {
permissions = await requestPermissions(); // handle in more detail?
}

permissions_nullable = permissions;

if (permissions === "granted") {
// Scanning parameters
const formats = [Format.QRCode];
const windowed = true;

if (scanning) return;
scanning = true;
scan({ formats, windowed })
.then((res) => {
console.log("Scan result:", res);
scannedData = res;
codeScannedDrawerOpen = true;
})
.catch((error) => {
// TODO: display error to user
console.error("Scan error:", error);
import { PUBLIC_PROVISIONER_URL } from "$env/static/public";
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import { QrCodeIcon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
Format,
type PermissionState,
type Scanned,
cancel,
checkPermissions,
requestPermissions,
scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { getContext, onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";
import type { GlobalState } from "$lib/global";
import axios from "axios";

const globalState = getContext<() => GlobalState>("globalState")();
const pathProps: SVGAttributes<SVGPathElement> = {
stroke: "white",
"stroke-width": 7,
"stroke-linecap": "round",
"stroke-linejoin": "round",
};

let platform = $state();
let hostname = $state();
let session = $state();
let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let scannedData: Scanned | undefined = $state(undefined);
let scanning = false;
let loading = false;
let redirect = $state();
let permissions_nullable: PermissionState | null;

async function startScan() {
let permissions = await checkPermissions()
.then((permissions) => {
return permissions;
})
.finally(() => {
scanning = false;
.catch(() => {
return null;
});

if (permissions === "prompt") {
permissions = await requestPermissions();
}

permissions_nullable = permissions;

if (permissions === "granted") {
const formats = [Format.QRCode];
const windowed = true;

if (scanning) return;
scanning = true;
scan({ formats, windowed })
.then((res) => {
scannedData = res;
const url = new URL(res.content);
platform = url.searchParams.get("platform");
const redirectUrl = new URL(
url.searchParams.get("redirect") || "",
);
redirect = url.searchParams.get("redirect");
session = url.searchParams.get("session");
hostname = redirectUrl.hostname;
codeScannedDrawerOpen = true;
})
.catch((error) => {
console.error("Scan error:", error);
})
.finally(() => {
scanning = false;
});
}
}

console.error("Permission denied or not granted");
// TODO: consider handling GUI for permission denied
}
async function handleAuth() {
const vault = await globalState.vaultController.vault;
if (!vault || !redirect) return;
await axios.post(redirect, { ename: vault.ename, session });
codeScannedDrawerOpen = false;
loggedInDrawerOpen = true;
startScan();
}

async function cancelScan() {
await cancel();
scanning = false;
}
async function cancelScan() {
await cancel();
scanning = false;
}

onMount(async () => {
startScan();
});
onMount(async () => {
startScan();
});

onDestroy(async () => {
await cancelScan();
});
onDestroy(async () => {
await cancelScan();
});
</script>

<AppNav title="Scan QR Code" titleClasses="text-white" iconColor="white" />
Expand All@@ -116,27 +126,7 @@ onDestroy(async () => {

<div
class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center"
>
<Button.Icon icon={Image02Icon} bgColor="white" bgSize="md" />
<Button.Icon
icon={QrCodeIcon}
bgColor="white"
bgSize="lg"
iconSize="lg"
callback={() => {
codeScannedDrawerOpen = true;
}}
/>
<Button.Icon
icon={FlashlightIcon}
aria-label="Toggle flashlight"
bgSize="md"
iconSize={32}
bgColor={flashlightOn ? "white" : "secondary"}
iconColor="black"
onclick={() => (flashlightOn = !flashlightOn)}
/>
</div>
></div>

<!-- code scanned drawer -->
<Drawer
Expand DownExpand Up@@ -166,9 +156,16 @@ onDestroy(async () => {
<p class="text-black-700">You're trying to access the following site</p>

<div class="bg-gray rounded-2xl w-full p-4 mt-4">
<h4 class="text-base text-black-700">Platform Name</h4>
<p class="text-black-700 font-normal capitalize">
{platform ?? "Unable to get name"}
</p>
</div>

<div class="bg-gray rounded-2xl w-full p-4">
<h4 class="text-base text-black-700">Website URL</h4>
<p class="text-black-700 font-normal underline">
{scannedData?.content}
<p class="text-black-700 font-normal">
{hostname ?? scannedData?.content}
</p>
</div>
<div class="flex justify-center gap-3 items-center mt-4">
Expand All@@ -182,15 +179,7 @@ onDestroy(async () => {
>
Decline
</Button.Action>
<Button.Action
variant="solid"
class="w-full"
callback={() => {
codeScannedDrawerOpen = false;
loggedInDrawerOpen = true;
startScan();
}}
>
<Button.Action variant="solid" class="w-full" callback={handleAuth}>
Confirm
</Button.Action>
</div>
Expand DownExpand Up@@ -221,7 +210,7 @@ onDestroy(async () => {
</div>

<h4>You're logged in!</h4>
<p class="text-black-700">You're now connected to this service'</p>
<p class="text-black-700">You're now connected to {platform}</p>

<div class="flex justify-center items-center mt-4">
<Button.Action
Expand All@@ -236,10 +225,3 @@ onDestroy(async () => {
</Button.Action>
</div>
</Drawer>

<style>
:global(body, *:not(button)) {
background-color: #00000000;
overflow-y: hidden;
}
</style>
2 changes: 2 additions & 0 deletions infrastructure/evault-provisioner/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ app.post(
res: Response<ProvisionResponse>,
) => {
try {
console.log("provisioning init");
if (!process.env.PUBLIC_REGISTRY_URL)
throw new Error("PUBLIC_REGISTRY_URL is not set");
const { registryEntropy, namespace, verificationId } = req.body;
Expand All@@ -95,6 +96,7 @@ app.post(
if (verification.consumed)
throw new Error("This verification ID has already been used");

console.log("jwk");
const jwksResponse = await axios.get(
new URL(
`/.well-known/jwks.json`,
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
24 changes: 19 additions & 5 deletions infrastructure/eid-wallet/src/routes/(app)/+layout.svelte
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
<script lang="ts">
import { page } from "$app/state";
import type { Snippet } from "svelte";
import type { LayoutData } from "./$types";
import { page } from "$app/state";
import type { Snippet } from "svelte";
import type { LayoutData } from "./$types";

let { data, children }: { data: LayoutData; children: Snippet } = $props();
let { data, children }: { data: LayoutData; children: Snippet } = $props();

let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");
let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");

$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage)
return document.body.classList.add("custom-global-style");
return document.body.classList.remove("custom-global-style");
});
Comment on lines +10 to +15

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Improve effect cleanup and add component unmount handling.

The effect implementation needs better cleanup logic to handle component unmounting and prevent memory leaks.

 $effect(() => {
const isScanPage = currentRoute === "scan-qr";
- if (isScanPage)- return document.body.classList.add("custom-global-style");- return document.body.classList.remove("custom-global-style");++ if (isScanPage) {+ document.body.classList.add("custom-global-style");+ } else {+ document.body.classList.remove("custom-global-style");+ }++ // Cleanup function+ return () => {+ document.body.classList.remove("custom-global-style");+ };
});

This ensures the class is properly removed when the component unmounts or the route changes.

📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage)
return document.body.classList.add("custom-global-style");
return document.body.classList.remove("custom-global-style");
});
$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage) {
document.body.classList.add("custom-global-style");
} else {
document.body.classList.remove("custom-global-style");
}
// Cleanup when the effect re-runs or the component unmounts
return () => {
document.body.classList.remove("custom-global-style");
};
});
🤖 Prompt for AI Agents
In infrastructure/eid-wallet/src/routes/(app)/+layout.svelte around lines 10 to
15, the effect adding or removing the "custom-global-style" class on
document.body lacks proper cleanup for component unmounting. Refactor the effect
to include a cleanup function that removes the class when the component unmounts
or when the route changes, ensuring no leftover side effects or memory leaks.

</script>

<!-- Dev only: remove this when deploying to production -->
Expand All@@ -18,3 +25,10 @@ let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");
<div class="p-6">
{@render children()}
</div>

<style>
:global(body.custom-global-style, body.custom-global-style *:not(button)) {
background-color: #00000000;
overflow-y: hidden;
}
</style>
234 changes: 108 additions & 126 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,107 @@
<script lang="ts">
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import {
FlashlightIcon,
Image02Icon,
QrCodeIcon,
} from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
Format,
type PermissionState,
type Scanned,
cancel,
checkPermissions,
requestPermissions,
scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";

const pathProps: SVGAttributes<SVGPathElement> = {
stroke: "white",
"stroke-width": 7,
"stroke-linecap": "round",
"stroke-linejoin": "round",
};

let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let flashlightOn = $state(false);

let scannedData: Scanned | undefined = $state(undefined);

let scanning = false;
let loading = false;

let permissions_nullable: PermissionState | null;

async function startScan() {
let permissions = await checkPermissions()
.then((permissions) => {
return permissions;
})
.catch(() => {
return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
});

// TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
if (permissions === "prompt") {
permissions = await requestPermissions(); // handle in more detail?
}

permissions_nullable = permissions;

if (permissions === "granted") {
// Scanning parameters
const formats = [Format.QRCode];
const windowed = true;

if (scanning) return;
scanning = true;
scan({ formats, windowed })
.then((res) => {
console.log("Scan result:", res);
scannedData = res;
codeScannedDrawerOpen = true;
})
.catch((error) => {
// TODO: display error to user
console.error("Scan error:", error);
import { PUBLIC_PROVISIONER_URL } from "$env/static/public";
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import { QrCodeIcon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
Format,
type PermissionState,
type Scanned,
cancel,
checkPermissions,
requestPermissions,
scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { getContext, onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";
import type { GlobalState } from "$lib/global";
import axios from "axios";

const globalState = getContext<() => GlobalState>("globalState")();
const pathProps: SVGAttributes<SVGPathElement> = {
stroke: "white",
"stroke-width": 7,
"stroke-linecap": "round",
"stroke-linejoin": "round",
};

let platform = $state();
let hostname = $state();
let session = $state();
let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let scannedData: Scanned | undefined = $state(undefined);
let scanning = false;
let loading = false;
let redirect = $state();
let permissions_nullable: PermissionState | null;

async function startScan() {
let permissions = await checkPermissions()
.then((permissions) => {
return permissions;
})
.finally(() => {
scanning = false;
.catch(() => {
return null;
});

if (permissions === "prompt") {
permissions = await requestPermissions();
}

permissions_nullable = permissions;

if (permissions === "granted") {
const formats = [Format.QRCode];
const windowed = true;

if (scanning) return;
scanning = true;
scan({ formats, windowed })
.then((res) => {
scannedData = res;
const url = new URL(res.content);
platform = url.searchParams.get("platform");
const redirectUrl = new URL(
url.searchParams.get("redirect") || "",
);
redirect = url.searchParams.get("redirect");
session = url.searchParams.get("session");
hostname = redirectUrl.hostname;
codeScannedDrawerOpen = true;
})
.catch((error) => {
console.error("Scan error:", error);
})
.finally(() => {
scanning = false;
});
}
}

console.error("Permission denied or not granted");
// TODO: consider handling GUI for permission denied
}
async function handleAuth() {
const vault = await globalState.vaultController.vault;
if (!vault || !redirect) return;
await axios.post(redirect, { ename: vault.ename, session });
codeScannedDrawerOpen = false;
loggedInDrawerOpen = true;
startScan();
}

async function cancelScan() {
await cancel();
scanning = false;
}
async function cancelScan() {
await cancel();
scanning = false;
}

onMount(async () => {
startScan();
});
onMount(async () => {
startScan();
});

onDestroy(async () => {
await cancelScan();
});
onDestroy(async () => {
await cancelScan();
});
</script>

<AppNav title="Scan QR Code" titleClasses="text-white" iconColor="white" />
Expand All@@ -116,27 +126,7 @@ onDestroy(async () => {

<div
class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center"
>
<Button.Icon icon={Image02Icon} bgColor="white" bgSize="md" />
<Button.Icon
icon={QrCodeIcon}
bgColor="white"
bgSize="lg"
iconSize="lg"
callback={() => {
codeScannedDrawerOpen = true;
}}
/>
<Button.Icon
icon={FlashlightIcon}
aria-label="Toggle flashlight"
bgSize="md"
iconSize={32}
bgColor={flashlightOn ? "white" : "secondary"}
iconColor="black"
onclick={() => (flashlightOn = !flashlightOn)}
/>
</div>
></div>

<!-- code scanned drawer -->
<Drawer
Expand DownExpand Up@@ -166,9 +156,16 @@ onDestroy(async () => {
<p class="text-black-700">You're trying to access the following site</p>

<div class="bg-gray rounded-2xl w-full p-4 mt-4">
<h4 class="text-base text-black-700">Platform Name</h4>
<p class="text-black-700 font-normal capitalize">
{platform ?? "Unable to get name"}
</p>
</div>

<div class="bg-gray rounded-2xl w-full p-4">
<h4 class="text-base text-black-700">Website URL</h4>
<p class="text-black-700 font-normal underline">
{scannedData?.content}
<p class="text-black-700 font-normal">
{hostname ?? scannedData?.content}
</p>
</div>
<div class="flex justify-center gap-3 items-center mt-4">
Expand All@@ -182,15 +179,7 @@ onDestroy(async () => {
>
Decline
</Button.Action>
<Button.Action
variant="solid"
class="w-full"
callback={() => {
codeScannedDrawerOpen = false;
loggedInDrawerOpen = true;
startScan();
}}
>
<Button.Action variant="solid" class="w-full" callback={handleAuth}>
Confirm
</Button.Action>
</div>
Expand DownExpand Up@@ -221,7 +210,7 @@ onDestroy(async () => {
</div>

<h4>You're logged in!</h4>
<p class="text-black-700">You're now connected to this service'</p>
<p class="text-black-700">You're now connected to {platform}</p>

<div class="flex justify-center items-center mt-4">
<Button.Action
Expand All@@ -236,10 +225,3 @@ onDestroy(async () => {
</Button.Action>
</div>
</Drawer>

<style>
:global(body, *:not(button)) {
background-color: #00000000;
overflow-y: hidden;
}
</style>
2 changes: 2 additions & 0 deletions infrastructure/evault-provisioner/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ app.post(
res: Response<ProvisionResponse>,
) => {
try {
console.log("provisioning init");
if (!process.env.PUBLIC_REGISTRY_URL)
throw new Error("PUBLIC_REGISTRY_URL is not set");
const { registryEntropy, namespace, verificationId } = req.body;
Expand All@@ -95,6 +96,7 @@ app.post(
if (verification.consumed)
throw new Error("This verification ID has already been used");

console.log("jwk");
const jwksResponse = await axios.get(
new URL(
`/.well-known/jwks.json`,
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
24 changes: 19 additions & 5 deletions infrastructure/eid-wallet/src/routes/(app)/+layout.svelte
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
<script lang="ts">
import { page } from "$app/state";
import type { Snippet } from "svelte";
import type { LayoutData } from "./$types";
import { page } from "$app/state";
import type { Snippet } from "svelte";
import type { LayoutData } from "./$types";

let { data, children }: { data: LayoutData; children: Snippet } = $props();
let { data, children }: { data: LayoutData; children: Snippet } = $props();

let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");
let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");

$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage)
return document.body.classList.add("custom-global-style");
return document.body.classList.remove("custom-global-style");
});
Comment on lines +10 to +15

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Improve effect cleanup and add component unmount handling.

The effect implementation needs better cleanup logic to handle component unmounting and prevent memory leaks.

 $effect(() => {
const isScanPage = currentRoute === "scan-qr";
- if (isScanPage)- return document.body.classList.add("custom-global-style");- return document.body.classList.remove("custom-global-style");++ if (isScanPage) {+ document.body.classList.add("custom-global-style");+ } else {+ document.body.classList.remove("custom-global-style");+ }++ // Cleanup function+ return () => {+ document.body.classList.remove("custom-global-style");+ };
});

This ensures the class is properly removed when the component unmounts or the route changes.

📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage)
return document.body.classList.add("custom-global-style");
return document.body.classList.remove("custom-global-style");
});
$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage) {
document.body.classList.add("custom-global-style");
} else {
document.body.classList.remove("custom-global-style");
}
// Cleanup when the effect re-runs or the component unmounts
return () => {
document.body.classList.remove("custom-global-style");
};
});
🤖 Prompt for AI Agents
In infrastructure/eid-wallet/src/routes/(app)/+layout.svelte around lines 10 to
15, the effect adding or removing the "custom-global-style" class on
document.body lacks proper cleanup for component unmounting. Refactor the effect
to include a cleanup function that removes the class when the component unmounts
or when the route changes, ensuring no leftover side effects or memory leaks.

</script>

<!-- Dev only: remove this when deploying to production -->
Expand All@@ -18,3 +25,10 @@ let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");
<div class="p-6">
{@render children()}
</div>

<style>
:global(body.custom-global-style, body.custom-global-style *:not(button)) {
background-color: #00000000;
overflow-y: hidden;
}
</style>
234 changes: 108 additions & 126 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,107 @@
<script lang="ts">
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import {
FlashlightIcon,
Image02Icon,
QrCodeIcon,
} from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
Format,
type PermissionState,
type Scanned,
cancel,
checkPermissions,
requestPermissions,
scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";

const pathProps: SVGAttributes<SVGPathElement> = {
stroke: "white",
"stroke-width": 7,
"stroke-linecap": "round",
"stroke-linejoin": "round",
};

let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let flashlightOn = $state(false);

let scannedData: Scanned | undefined = $state(undefined);

let scanning = false;
let loading = false;

let permissions_nullable: PermissionState | null;

async function startScan() {
let permissions = await checkPermissions()
.then((permissions) => {
return permissions;
})
.catch(() => {
return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
});

// TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
if (permissions === "prompt") {
permissions = await requestPermissions(); // handle in more detail?
}

permissions_nullable = permissions;

if (permissions === "granted") {
// Scanning parameters
const formats = [Format.QRCode];
const windowed = true;

if (scanning) return;
scanning = true;
scan({ formats, windowed })
.then((res) => {
console.log("Scan result:", res);
scannedData = res;
codeScannedDrawerOpen = true;
})
.catch((error) => {
// TODO: display error to user
console.error("Scan error:", error);
import { PUBLIC_PROVISIONER_URL } from "$env/static/public";
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import { QrCodeIcon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
Format,
type PermissionState,
type Scanned,
cancel,
checkPermissions,
requestPermissions,
scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { getContext, onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";
import type { GlobalState } from "$lib/global";
import axios from "axios";

const globalState = getContext<() => GlobalState>("globalState")();
const pathProps: SVGAttributes<SVGPathElement> = {
stroke: "white",
"stroke-width": 7,
"stroke-linecap": "round",
"stroke-linejoin": "round",
};

let platform = $state();
let hostname = $state();
let session = $state();
let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let scannedData: Scanned | undefined = $state(undefined);
let scanning = false;
let loading = false;
let redirect = $state();
let permissions_nullable: PermissionState | null;

async function startScan() {
let permissions = await checkPermissions()
.then((permissions) => {
return permissions;
})
.finally(() => {
scanning = false;
.catch(() => {
return null;
});

if (permissions === "prompt") {
permissions = await requestPermissions();
}

permissions_nullable = permissions;

if (permissions === "granted") {
const formats = [Format.QRCode];
const windowed = true;

if (scanning) return;
scanning = true;
scan({ formats, windowed })
.then((res) => {
scannedData = res;
const url = new URL(res.content);
platform = url.searchParams.get("platform");
const redirectUrl = new URL(
url.searchParams.get("redirect") || "",
);
redirect = url.searchParams.get("redirect");
session = url.searchParams.get("session");
hostname = redirectUrl.hostname;
codeScannedDrawerOpen = true;
})
.catch((error) => {
console.error("Scan error:", error);
})
.finally(() => {
scanning = false;
});
}
}

console.error("Permission denied or not granted");
// TODO: consider handling GUI for permission denied
}
async function handleAuth() {
const vault = await globalState.vaultController.vault;
if (!vault || !redirect) return;
await axios.post(redirect, { ename: vault.ename, session });
codeScannedDrawerOpen = false;
loggedInDrawerOpen = true;
startScan();
}

async function cancelScan() {
await cancel();
scanning = false;
}
async function cancelScan() {
await cancel();
scanning = false;
}

onMount(async () => {
startScan();
});
onMount(async () => {
startScan();
});

onDestroy(async () => {
await cancelScan();
});
onDestroy(async () => {
await cancelScan();
});
</script>

<AppNav title="Scan QR Code" titleClasses="text-white" iconColor="white" />
Expand All@@ -116,27 +126,7 @@ onDestroy(async () => {

<div
class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center"
>
<Button.Icon icon={Image02Icon} bgColor="white" bgSize="md" />
<Button.Icon
icon={QrCodeIcon}
bgColor="white"
bgSize="lg"
iconSize="lg"
callback={() => {
codeScannedDrawerOpen = true;
}}
/>
<Button.Icon
icon={FlashlightIcon}
aria-label="Toggle flashlight"
bgSize="md"
iconSize={32}
bgColor={flashlightOn ? "white" : "secondary"}
iconColor="black"
onclick={() => (flashlightOn = !flashlightOn)}
/>
</div>
></div>

<!-- code scanned drawer -->
<Drawer
Expand DownExpand Up@@ -166,9 +156,16 @@ onDestroy(async () => {
<p class="text-black-700">You're trying to access the following site</p>

<div class="bg-gray rounded-2xl w-full p-4 mt-4">
<h4 class="text-base text-black-700">Platform Name</h4>
<p class="text-black-700 font-normal capitalize">
{platform ?? "Unable to get name"}
</p>
</div>

<div class="bg-gray rounded-2xl w-full p-4">
<h4 class="text-base text-black-700">Website URL</h4>
<p class="text-black-700 font-normal underline">
{scannedData?.content}
<p class="text-black-700 font-normal">
{hostname ?? scannedData?.content}
</p>
</div>
<div class="flex justify-center gap-3 items-center mt-4">
Expand All@@ -182,15 +179,7 @@ onDestroy(async () => {
>
Decline
</Button.Action>
<Button.Action
variant="solid"
class="w-full"
callback={() => {
codeScannedDrawerOpen = false;
loggedInDrawerOpen = true;
startScan();
}}
>
<Button.Action variant="solid" class="w-full" callback={handleAuth}>
Confirm
</Button.Action>
</div>
Expand DownExpand Up@@ -221,7 +210,7 @@ onDestroy(async () => {
</div>

<h4>You're logged in!</h4>
<p class="text-black-700">You're now connected to this service'</p>
<p class="text-black-700">You're now connected to {platform}</p>

<div class="flex justify-center items-center mt-4">
<Button.Action
Expand All@@ -236,10 +225,3 @@ onDestroy(async () => {
</Button.Action>
</div>
</Drawer>

<style>
:global(body, *:not(button)) {
background-color: #00000000;
overflow-y: hidden;
}
</style>
2 changes: 2 additions & 0 deletions infrastructure/evault-provisioner/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ app.post(
res: Response<ProvisionResponse>,
) => {
try {
console.log("provisioning init");
if (!process.env.PUBLIC_REGISTRY_URL)
throw new Error("PUBLIC_REGISTRY_URL is not set");
const { registryEntropy, namespace, verificationId } = req.body;
Expand All@@ -95,6 +96,7 @@ app.post(
if (verification.consumed)
throw new Error("This verification ID has already been used");

console.log("jwk");
const jwksResponse = await axios.get(
new URL(
`/.well-known/jwks.json`,
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
24 changes: 19 additions & 5 deletions infrastructure/eid-wallet/src/routes/(app)/+layout.svelte
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
<script lang="ts">
import { page } from "$app/state";
import type { Snippet } from "svelte";
import type { LayoutData } from "./$types";
import { page } from "$app/state";
import type { Snippet } from "svelte";
import type { LayoutData } from "./$types";

let { data, children }: { data: LayoutData; children: Snippet } = $props();
let { data, children }: { data: LayoutData; children: Snippet } = $props();

let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");
let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");

$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage)
return document.body.classList.add("custom-global-style");
return document.body.classList.remove("custom-global-style");
});
Comment on lines +10 to +15

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Improve effect cleanup and add component unmount handling.

The effect implementation needs better cleanup logic to handle component unmounting and prevent memory leaks.

 $effect(() => {
const isScanPage = currentRoute === "scan-qr";
- if (isScanPage)- return document.body.classList.add("custom-global-style");- return document.body.classList.remove("custom-global-style");++ if (isScanPage) {+ document.body.classList.add("custom-global-style");+ } else {+ document.body.classList.remove("custom-global-style");+ }++ // Cleanup function+ return () => {+ document.body.classList.remove("custom-global-style");+ };
});

This ensures the class is properly removed when the component unmounts or the route changes.

📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage)
return document.body.classList.add("custom-global-style");
return document.body.classList.remove("custom-global-style");
});
$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage) {
document.body.classList.add("custom-global-style");
} else {
document.body.classList.remove("custom-global-style");
}
// Cleanup when the effect re-runs or the component unmounts
return () => {
document.body.classList.remove("custom-global-style");
};
});
🤖 Prompt for AI Agents
In infrastructure/eid-wallet/src/routes/(app)/+layout.svelte around lines 10 to
15, the effect adding or removing the "custom-global-style" class on
document.body lacks proper cleanup for component unmounting. Refactor the effect
to include a cleanup function that removes the class when the component unmounts
or when the route changes, ensuring no leftover side effects or memory leaks.

</script>

<!-- Dev only: remove this when deploying to production -->
Expand All@@ -18,3 +25,10 @@ let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");
<div class="p-6">
{@render children()}
</div>

<style>
:global(body.custom-global-style, body.custom-global-style *:not(button)) {
background-color: #00000000;
overflow-y: hidden;
}
</style>
234 changes: 108 additions & 126 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,107 @@
<script lang="ts">
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import {
FlashlightIcon,
Image02Icon,
QrCodeIcon,
} from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
Format,
type PermissionState,
type Scanned,
cancel,
checkPermissions,
requestPermissions,
scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";

const pathProps: SVGAttributes<SVGPathElement> = {
stroke: "white",
"stroke-width": 7,
"stroke-linecap": "round",
"stroke-linejoin": "round",
};

let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let flashlightOn = $state(false);

let scannedData: Scanned | undefined = $state(undefined);

let scanning = false;
let loading = false;

let permissions_nullable: PermissionState | null;

async function startScan() {
let permissions = await checkPermissions()
.then((permissions) => {
return permissions;
})
.catch(() => {
return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
});

// TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
if (permissions === "prompt") {
permissions = await requestPermissions(); // handle in more detail?
}

permissions_nullable = permissions;

if (permissions === "granted") {
// Scanning parameters
const formats = [Format.QRCode];
const windowed = true;

if (scanning) return;
scanning = true;
scan({ formats, windowed })
.then((res) => {
console.log("Scan result:", res);
scannedData = res;
codeScannedDrawerOpen = true;
})
.catch((error) => {
// TODO: display error to user
console.error("Scan error:", error);
import { PUBLIC_PROVISIONER_URL } from "$env/static/public";
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import { QrCodeIcon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
Format,
type PermissionState,
type Scanned,
cancel,
checkPermissions,
requestPermissions,
scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { getContext, onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";
import type { GlobalState } from "$lib/global";
import axios from "axios";

const globalState = getContext<() => GlobalState>("globalState")();
const pathProps: SVGAttributes<SVGPathElement> = {
stroke: "white",
"stroke-width": 7,
"stroke-linecap": "round",
"stroke-linejoin": "round",
};

let platform = $state();
let hostname = $state();
let session = $state();
let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let scannedData: Scanned | undefined = $state(undefined);
let scanning = false;
let loading = false;
let redirect = $state();
let permissions_nullable: PermissionState | null;

async function startScan() {
let permissions = await checkPermissions()
.then((permissions) => {
return permissions;
})
.finally(() => {
scanning = false;
.catch(() => {
return null;
});

if (permissions === "prompt") {
permissions = await requestPermissions();
}

permissions_nullable = permissions;

if (permissions === "granted") {
const formats = [Format.QRCode];
const windowed = true;

if (scanning) return;
scanning = true;
scan({ formats, windowed })
.then((res) => {
scannedData = res;
const url = new URL(res.content);
platform = url.searchParams.get("platform");
const redirectUrl = new URL(
url.searchParams.get("redirect") || "",
);
redirect = url.searchParams.get("redirect");
session = url.searchParams.get("session");
hostname = redirectUrl.hostname;
codeScannedDrawerOpen = true;
})
.catch((error) => {
console.error("Scan error:", error);
})
.finally(() => {
scanning = false;
});
}
}

console.error("Permission denied or not granted");
// TODO: consider handling GUI for permission denied
}
async function handleAuth() {
const vault = await globalState.vaultController.vault;
if (!vault || !redirect) return;
await axios.post(redirect, { ename: vault.ename, session });
codeScannedDrawerOpen = false;
loggedInDrawerOpen = true;
startScan();
}

async function cancelScan() {
await cancel();
scanning = false;
}
async function cancelScan() {
await cancel();
scanning = false;
}

onMount(async () => {
startScan();
});
onMount(async () => {
startScan();
});

onDestroy(async () => {
await cancelScan();
});
onDestroy(async () => {
await cancelScan();
});
</script>

<AppNav title="Scan QR Code" titleClasses="text-white" iconColor="white" />
Expand All@@ -116,27 +126,7 @@ onDestroy(async () => {

<div
class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center"
>
<Button.Icon icon={Image02Icon} bgColor="white" bgSize="md" />
<Button.Icon
icon={QrCodeIcon}
bgColor="white"
bgSize="lg"
iconSize="lg"
callback={() => {
codeScannedDrawerOpen = true;
}}
/>
<Button.Icon
icon={FlashlightIcon}
aria-label="Toggle flashlight"
bgSize="md"
iconSize={32}
bgColor={flashlightOn ? "white" : "secondary"}
iconColor="black"
onclick={() => (flashlightOn = !flashlightOn)}
/>
</div>
></div>

<!-- code scanned drawer -->
<Drawer
Expand DownExpand Up@@ -166,9 +156,16 @@ onDestroy(async () => {
<p class="text-black-700">You're trying to access the following site</p>

<div class="bg-gray rounded-2xl w-full p-4 mt-4">
<h4 class="text-base text-black-700">Platform Name</h4>
<p class="text-black-700 font-normal capitalize">
{platform ?? "Unable to get name"}
</p>
</div>

<div class="bg-gray rounded-2xl w-full p-4">
<h4 class="text-base text-black-700">Website URL</h4>
<p class="text-black-700 font-normal underline">
{scannedData?.content}
<p class="text-black-700 font-normal">
{hostname ?? scannedData?.content}
</p>
</div>
<div class="flex justify-center gap-3 items-center mt-4">
Expand All@@ -182,15 +179,7 @@ onDestroy(async () => {
>
Decline
</Button.Action>
<Button.Action
variant="solid"
class="w-full"
callback={() => {
codeScannedDrawerOpen = false;
loggedInDrawerOpen = true;
startScan();
}}
>
<Button.Action variant="solid" class="w-full" callback={handleAuth}>
Confirm
</Button.Action>
</div>
Expand DownExpand Up@@ -221,7 +210,7 @@ onDestroy(async () => {
</div>

<h4>You're logged in!</h4>
<p class="text-black-700">You're now connected to this service'</p>
<p class="text-black-700">You're now connected to {platform}</p>

<div class="flex justify-center items-center mt-4">
<Button.Action
Expand All@@ -236,10 +225,3 @@ onDestroy(async () => {
</Button.Action>
</div>
</Drawer>

<style>
:global(body, *:not(button)) {
background-color: #00000000;
overflow-y: hidden;
}
</style>
2 changes: 2 additions & 0 deletions infrastructure/evault-provisioner/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ app.post(
res: Response<ProvisionResponse>,
) => {
try {
console.log("provisioning init");
if (!process.env.PUBLIC_REGISTRY_URL)
throw new Error("PUBLIC_REGISTRY_URL is not set");
const { registryEntropy, namespace, verificationId } = req.body;
Expand All@@ -95,6 +96,7 @@ app.post(
if (verification.consumed)
throw new Error("This verification ID has already been used");

console.log("jwk");
const jwksResponse = await axios.get(
new URL(
`/.well-known/jwks.json`,
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
24 changes: 19 additions & 5 deletions infrastructure/eid-wallet/src/routes/(app)/+layout.svelte
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
<script lang="ts">
import { page } from "$app/state";
import type { Snippet } from "svelte";
import type { LayoutData } from "./$types";
import { page } from "$app/state";
import type { Snippet } from "svelte";
import type { LayoutData } from "./$types";

let { data, children }: { data: LayoutData; children: Snippet } = $props();
let { data, children }: { data: LayoutData; children: Snippet } = $props();

let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");
let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");

$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage)
return document.body.classList.add("custom-global-style");
return document.body.classList.remove("custom-global-style");
});
Comment on lines +10 to +15

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Improve effect cleanup and add component unmount handling.

The effect implementation needs better cleanup logic to handle component unmounting and prevent memory leaks.

 $effect(() => {
const isScanPage = currentRoute === "scan-qr";
- if (isScanPage)- return document.body.classList.add("custom-global-style");- return document.body.classList.remove("custom-global-style");++ if (isScanPage) {+ document.body.classList.add("custom-global-style");+ } else {+ document.body.classList.remove("custom-global-style");+ }++ // Cleanup function+ return () => {+ document.body.classList.remove("custom-global-style");+ };
});

This ensures the class is properly removed when the component unmounts or the route changes.

📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage)
return document.body.classList.add("custom-global-style");
return document.body.classList.remove("custom-global-style");
});
$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage) {
document.body.classList.add("custom-global-style");
} else {
document.body.classList.remove("custom-global-style");
}
// Cleanup when the effect re-runs or the component unmounts
return () => {
document.body.classList.remove("custom-global-style");
};
});
🤖 Prompt for AI Agents
In infrastructure/eid-wallet/src/routes/(app)/+layout.svelte around lines 10 to
15, the effect adding or removing the "custom-global-style" class on
document.body lacks proper cleanup for component unmounting. Refactor the effect
to include a cleanup function that removes the class when the component unmounts
or when the route changes, ensuring no leftover side effects or memory leaks.

</script>

<!-- Dev only: remove this when deploying to production -->
Expand All@@ -18,3 +25,10 @@ let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");
<div class="p-6">
{@render children()}
</div>

<style>
:global(body.custom-global-style, body.custom-global-style *:not(button)) {
background-color: #00000000;
overflow-y: hidden;
}
</style>
234 changes: 108 additions & 126 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,107 @@
<script lang="ts">
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import {
FlashlightIcon,
Image02Icon,
QrCodeIcon,
} from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
Format,
type PermissionState,
type Scanned,
cancel,
checkPermissions,
requestPermissions,
scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";

const pathProps: SVGAttributes<SVGPathElement> = {
stroke: "white",
"stroke-width": 7,
"stroke-linecap": "round",
"stroke-linejoin": "round",
};

let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let flashlightOn = $state(false);

let scannedData: Scanned | undefined = $state(undefined);

let scanning = false;
let loading = false;

let permissions_nullable: PermissionState | null;

async function startScan() {
let permissions = await checkPermissions()
.then((permissions) => {
return permissions;
})
.catch(() => {
return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
});

// TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
if (permissions === "prompt") {
permissions = await requestPermissions(); // handle in more detail?
}

permissions_nullable = permissions;

if (permissions === "granted") {
// Scanning parameters
const formats = [Format.QRCode];
const windowed = true;

if (scanning) return;
scanning = true;
scan({ formats, windowed })
.then((res) => {
console.log("Scan result:", res);
scannedData = res;
codeScannedDrawerOpen = true;
})
.catch((error) => {
// TODO: display error to user
console.error("Scan error:", error);
import { PUBLIC_PROVISIONER_URL } from "$env/static/public";
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import { QrCodeIcon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
Format,
type PermissionState,
type Scanned,
cancel,
checkPermissions,
requestPermissions,
scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { getContext, onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";
import type { GlobalState } from "$lib/global";
import axios from "axios";

const globalState = getContext<() => GlobalState>("globalState")();
const pathProps: SVGAttributes<SVGPathElement> = {
stroke: "white",
"stroke-width": 7,
"stroke-linecap": "round",
"stroke-linejoin": "round",
};

let platform = $state();
let hostname = $state();
let session = $state();
let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let scannedData: Scanned | undefined = $state(undefined);
let scanning = false;
let loading = false;
let redirect = $state();
let permissions_nullable: PermissionState | null;

async function startScan() {
let permissions = await checkPermissions()
.then((permissions) => {
return permissions;
})
.finally(() => {
scanning = false;
.catch(() => {
return null;
});

if (permissions === "prompt") {
permissions = await requestPermissions();
}

permissions_nullable = permissions;

if (permissions === "granted") {
const formats = [Format.QRCode];
const windowed = true;

if (scanning) return;
scanning = true;
scan({ formats, windowed })
.then((res) => {
scannedData = res;
const url = new URL(res.content);
platform = url.searchParams.get("platform");
const redirectUrl = new URL(
url.searchParams.get("redirect") || "",
);
redirect = url.searchParams.get("redirect");
session = url.searchParams.get("session");
hostname = redirectUrl.hostname;
codeScannedDrawerOpen = true;
})
.catch((error) => {
console.error("Scan error:", error);
})
.finally(() => {
scanning = false;
});
}
}

console.error("Permission denied or not granted");
// TODO: consider handling GUI for permission denied
}
async function handleAuth() {
const vault = await globalState.vaultController.vault;
if (!vault || !redirect) return;
await axios.post(redirect, { ename: vault.ename, session });
codeScannedDrawerOpen = false;
loggedInDrawerOpen = true;
startScan();
}

async function cancelScan() {
await cancel();
scanning = false;
}
async function cancelScan() {
await cancel();
scanning = false;
}

onMount(async () => {
startScan();
});
onMount(async () => {
startScan();
});

onDestroy(async () => {
await cancelScan();
});
onDestroy(async () => {
await cancelScan();
});
</script>

<AppNav title="Scan QR Code" titleClasses="text-white" iconColor="white" />
Expand All@@ -116,27 +126,7 @@ onDestroy(async () => {

<div
class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center"
>
<Button.Icon icon={Image02Icon} bgColor="white" bgSize="md" />
<Button.Icon
icon={QrCodeIcon}
bgColor="white"
bgSize="lg"
iconSize="lg"
callback={() => {
codeScannedDrawerOpen = true;
}}
/>
<Button.Icon
icon={FlashlightIcon}
aria-label="Toggle flashlight"
bgSize="md"
iconSize={32}
bgColor={flashlightOn ? "white" : "secondary"}
iconColor="black"
onclick={() => (flashlightOn = !flashlightOn)}
/>
</div>
></div>

<!-- code scanned drawer -->
<Drawer
Expand DownExpand Up@@ -166,9 +156,16 @@ onDestroy(async () => {
<p class="text-black-700">You're trying to access the following site</p>

<div class="bg-gray rounded-2xl w-full p-4 mt-4">
<h4 class="text-base text-black-700">Platform Name</h4>
<p class="text-black-700 font-normal capitalize">
{platform ?? "Unable to get name"}
</p>
</div>

<div class="bg-gray rounded-2xl w-full p-4">
<h4 class="text-base text-black-700">Website URL</h4>
<p class="text-black-700 font-normal underline">
{scannedData?.content}
<p class="text-black-700 font-normal">
{hostname ?? scannedData?.content}
</p>
</div>
<div class="flex justify-center gap-3 items-center mt-4">
Expand All@@ -182,15 +179,7 @@ onDestroy(async () => {
>
Decline
</Button.Action>
<Button.Action
variant="solid"
class="w-full"
callback={() => {
codeScannedDrawerOpen = false;
loggedInDrawerOpen = true;
startScan();
}}
>
<Button.Action variant="solid" class="w-full" callback={handleAuth}>
Confirm
</Button.Action>
</div>
Expand DownExpand Up@@ -221,7 +210,7 @@ onDestroy(async () => {
</div>

<h4>You're logged in!</h4>
<p class="text-black-700">You're now connected to this service'</p>
<p class="text-black-700">You're now connected to {platform}</p>

<div class="flex justify-center items-center mt-4">
<Button.Action
Expand All@@ -236,10 +225,3 @@ onDestroy(async () => {
</Button.Action>
</div>
</Drawer>

<style>
:global(body, *:not(button)) {
background-color: #00000000;
overflow-y: hidden;
}
</style>
2 changes: 2 additions & 0 deletions infrastructure/evault-provisioner/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ app.post(
res: Response<ProvisionResponse>,
) => {
try {
console.log("provisioning init");
if (!process.env.PUBLIC_REGISTRY_URL)
throw new Error("PUBLIC_REGISTRY_URL is not set");
const { registryEntropy, namespace, verificationId } = req.body;
Expand All@@ -95,6 +96,7 @@ app.post(
if (verification.consumed)
throw new Error("This verification ID has already been used");

console.log("jwk");
const jwksResponse = await axios.get(
new URL(
`/.well-known/jwks.json`,
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
24 changes: 19 additions & 5 deletions infrastructure/eid-wallet/src/routes/(app)/+layout.svelte
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
<script lang="ts">
import { page } from "$app/state";
import type { Snippet } from "svelte";
import type { LayoutData } from "./$types";
import { page } from "$app/state";
import type { Snippet } from "svelte";
import type { LayoutData } from "./$types";

let { data, children }: { data: LayoutData; children: Snippet } = $props();
let { data, children }: { data: LayoutData; children: Snippet } = $props();

let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");
let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");

$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage)
return document.body.classList.add("custom-global-style");
return document.body.classList.remove("custom-global-style");
});
Comment on lines +10 to +15

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Improve effect cleanup and add component unmount handling.

The effect implementation needs better cleanup logic to handle component unmounting and prevent memory leaks.

 $effect(() => {
const isScanPage = currentRoute === "scan-qr";
- if (isScanPage)- return document.body.classList.add("custom-global-style");- return document.body.classList.remove("custom-global-style");++ if (isScanPage) {+ document.body.classList.add("custom-global-style");+ } else {+ document.body.classList.remove("custom-global-style");+ }++ // Cleanup function+ return () => {+ document.body.classList.remove("custom-global-style");+ };
});

This ensures the class is properly removed when the component unmounts or the route changes.

📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage)
return document.body.classList.add("custom-global-style");
return document.body.classList.remove("custom-global-style");
});
$effect(() => {
const isScanPage = currentRoute === "scan-qr";
if (isScanPage) {
document.body.classList.add("custom-global-style");
} else {
document.body.classList.remove("custom-global-style");
}
// Cleanup when the effect re-runs or the component unmounts
return () => {
document.body.classList.remove("custom-global-style");
};
});
🤖 Prompt for AI Agents
In infrastructure/eid-wallet/src/routes/(app)/+layout.svelte around lines 10 to
15, the effect adding or removing the "custom-global-style" class on
document.body lacks proper cleanup for component unmounting. Refactor the effect
to include a cleanup function that removes the class when the component unmounts
or when the route changes, ensuring no leftover side effects or memory leaks.

</script>

<!-- Dev only: remove this when deploying to production -->
Expand All@@ -18,3 +25,10 @@ let currentRoute = $derived(page.url.pathname.split("/").pop() || "home");
<div class="p-6">
{@render children()}
</div>

<style>
:global(body.custom-global-style, body.custom-global-style *:not(button)) {
background-color: #00000000;
overflow-y: hidden;
}
</style>
234 changes: 108 additions & 126 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,107 @@
<script lang="ts">
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import {
FlashlightIcon,
Image02Icon,
QrCodeIcon,
} from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
Format,
type PermissionState,
type Scanned,
cancel,
checkPermissions,
requestPermissions,
scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";

const pathProps: SVGAttributes<SVGPathElement> = {
stroke: "white",
"stroke-width": 7,
"stroke-linecap": "round",
"stroke-linejoin": "round",
};

let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let flashlightOn = $state(false);

let scannedData: Scanned | undefined = $state(undefined);

let scanning = false;
let loading = false;

let permissions_nullable: PermissionState | null;

async function startScan() {
let permissions = await checkPermissions()
.then((permissions) => {
return permissions;
})
.catch(() => {
return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
});

// TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
if (permissions === "prompt") {
permissions = await requestPermissions(); // handle in more detail?
}

permissions_nullable = permissions;

if (permissions === "granted") {
// Scanning parameters
const formats = [Format.QRCode];
const windowed = true;

if (scanning) return;
scanning = true;
scan({ formats, windowed })
.then((res) => {
console.log("Scan result:", res);
scannedData = res;
codeScannedDrawerOpen = true;
})
.catch((error) => {
// TODO: display error to user
console.error("Scan error:", error);
import { PUBLIC_PROVISIONER_URL } from "$env/static/public";
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import { QrCodeIcon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
Format,
type PermissionState,
type Scanned,
cancel,
checkPermissions,
requestPermissions,
scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { getContext, onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";
import type { GlobalState } from "$lib/global";
import axios from "axios";

const globalState = getContext<() => GlobalState>("globalState")();
const pathProps: SVGAttributes<SVGPathElement> = {
stroke: "white",
"stroke-width": 7,
"stroke-linecap": "round",
"stroke-linejoin": "round",
};

let platform = $state();
let hostname = $state();
let session = $state();
let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let scannedData: Scanned | undefined = $state(undefined);
let scanning = false;
let loading = false;
let redirect = $state();
let permissions_nullable: PermissionState | null;

async function startScan() {
let permissions = await checkPermissions()
.then((permissions) => {
return permissions;
})
.finally(() => {
scanning = false;
.catch(() => {
return null;
});

if (permissions === "prompt") {
permissions = await requestPermissions();
}

permissions_nullable = permissions;

if (permissions === "granted") {
const formats = [Format.QRCode];
const windowed = true;

if (scanning) return;
scanning = true;
scan({ formats, windowed })
.then((res) => {
scannedData = res;
const url = new URL(res.content);
platform = url.searchParams.get("platform");
const redirectUrl = new URL(
url.searchParams.get("redirect") || "",
);
redirect = url.searchParams.get("redirect");
session = url.searchParams.get("session");
hostname = redirectUrl.hostname;
codeScannedDrawerOpen = true;
})
.catch((error) => {
console.error("Scan error:", error);
})
.finally(() => {
scanning = false;
});
}
}

console.error("Permission denied or not granted");
// TODO: consider handling GUI for permission denied
}
async function handleAuth() {
const vault = await globalState.vaultController.vault;
if (!vault || !redirect) return;
await axios.post(redirect, { ename: vault.ename, session });
codeScannedDrawerOpen = false;
loggedInDrawerOpen = true;
startScan();
}

async function cancelScan() {
await cancel();
scanning = false;
}
async function cancelScan() {
await cancel();
scanning = false;
}

onMount(async () => {
startScan();
});
onMount(async () => {
startScan();
});

onDestroy(async () => {
await cancelScan();
});
onDestroy(async () => {
await cancelScan();
});
</script>

<AppNav title="Scan QR Code" titleClasses="text-white" iconColor="white" />
Expand All@@ -116,27 +126,7 @@ onDestroy(async () => {

<div
class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center"
>
<Button.Icon icon={Image02Icon} bgColor="white" bgSize="md" />
<Button.Icon
icon={QrCodeIcon}
bgColor="white"
bgSize="lg"
iconSize="lg"
callback={() => {
codeScannedDrawerOpen = true;
}}
/>
<Button.Icon
icon={FlashlightIcon}
aria-label="Toggle flashlight"
bgSize="md"
iconSize={32}
bgColor={flashlightOn ? "white" : "secondary"}
iconColor="black"
onclick={() => (flashlightOn = !flashlightOn)}
/>
</div>
></div>

<!-- code scanned drawer -->
<Drawer
Expand DownExpand Up@@ -166,9 +156,16 @@ onDestroy(async () => {
<p class="text-black-700">You're trying to access the following site</p>

<div class="bg-gray rounded-2xl w-full p-4 mt-4">
<h4 class="text-base text-black-700">Platform Name</h4>
<p class="text-black-700 font-normal capitalize">
{platform ?? "Unable to get name"}
</p>
</div>

<div class="bg-gray rounded-2xl w-full p-4">
<h4 class="text-base text-black-700">Website URL</h4>
<p class="text-black-700 font-normal underline">
{scannedData?.content}
<p class="text-black-700 font-normal">
{hostname ?? scannedData?.content}
</p>
</div>
<div class="flex justify-center gap-3 items-center mt-4">
Expand All@@ -182,15 +179,7 @@ onDestroy(async () => {
>
Decline
</Button.Action>
<Button.Action
variant="solid"
class="w-full"
callback={() => {
codeScannedDrawerOpen = false;
loggedInDrawerOpen = true;
startScan();
}}
>
<Button.Action variant="solid" class="w-full" callback={handleAuth}>
Confirm
</Button.Action>
</div>
Expand DownExpand Up@@ -221,7 +210,7 @@ onDestroy(async () => {
</div>

<h4>You're logged in!</h4>
<p class="text-black-700">You're now connected to this service'</p>
<p class="text-black-700">You're now connected to {platform}</p>

<div class="flex justify-center items-center mt-4">
<Button.Action
Expand All@@ -236,10 +225,3 @@ onDestroy(async () => {
</Button.Action>
</div>
</Drawer>

<style>
:global(body, *:not(button)) {
background-color: #00000000;
overflow-y: hidden;
}
</style>
2 changes: 2 additions & 0 deletions infrastructure/evault-provisioner/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ app.post(
res: Response<ProvisionResponse>,
) => {
try {
console.log("provisioning init");
if (!process.env.PUBLIC_REGISTRY_URL)
throw new Error("PUBLIC_REGISTRY_URL is not set");
const { registryEntropy, namespace, verificationId } = req.body;
Expand All@@ -95,6 +96,7 @@ app.post(
if (verification.consumed)
throw new Error("This verification ID has already been used");

console.log("jwk");
const jwksResponse = await axios.get(
new URL(
`/.well-known/jwks.json`,
Expand Down
Loading