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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
24 changes: 19 additions & 5 deletions infrastructure/eid-wallet/src/routes/(app)/+layout.svelte
Original file line number Diff line number Diff 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");
});
</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 number Diff line number Diff 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 Down Expand 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 Down Expand 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 number Diff line number Diff 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
Loading