Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = 7F2T2WK6DR;
DEVELOPMENT_TEAM = 3FS4B734X5;
ENABLE_BITCODE = NO;
"EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
Expand Down Expand Up @@ -430,7 +430,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = 7F2T2WK6DR;
DEVELOPMENT_TEAM = 3FS4B734X5;
ENABLE_BITCODE = NO;
"EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
Expand Down
40 changes: 33 additions & 7 deletions infrastructure/eid-wallet/src/routes/+layout.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ onMount(async () => {
showSplashScreen = false;
});

const safeAreaTop = $derived.by(() => parseFloat(getComputedStyle(document.documentElement).getPropertyValue('--safe-top')) || 0);


$effect(() => console.log("top", safeAreaTop))

onNavigate((navigation) => {
if (!document.startViewTransition) return;

Expand Down Expand Up @@ -88,10 +93,31 @@ onNavigate((navigation) => {
});
</script>

{#if showSplashScreen}
<SplashScreen />
{:else}
<div class="bg-white h-[100dvh] overflow-scroll">
{@render children?.()}
</div>
{/if}
<main class={`h-[calc(100dvh-${safeAreaTop}px)] overflow-hidden`}>
{#if showSplashScreen}
<SplashScreen />
{:else}
<div class={`bg-white h-[calc(100dvh-${safeAreaTop}px)] overflow-auto`}>
{@render children?.()}
</div>
{/if}
</main>

<style>
:root {
--safe-bottom: env(safe-area-inset-bottom);
--safe-top: env(safe-area-inset-top);
}

body, * {
-webkit-overflow-scrolling: touch; /* keeps momentum scrolling on iOS */
scrollbar-width: none; /* Firefox */
-ms-overflow-style: none; /* IE 10+ */
}

/* Hide scrollbar for WebKit (Chrome, Safari) */
body::-webkit-scrollbar,
*::-webkit-scrollbar {
display: none;
}
</style>
159 changes: 84 additions & 75 deletions infrastructure/evault-core/src/evault.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import { LogService } from "./w3id/log-service";
import { GraphQLServer } from "./protocol/graphql-server";
import { registerHttpRoutes } from "./http/server";
import fastify, {
FastifyInstance,
FastifyRequest,
FastifyReply,
FastifyInstance,
FastifyRequest,
FastifyReply,
} from "fastify";
import { renderVoyagerPage } from "graphql-voyager/middleware";
import { createYoga } from "graphql-yoga";
Expand All @@ -17,80 +17,89 @@ import { W3ID } from "./w3id/w3id";
dotenv.config({ path: path.resolve(__dirname, "../../../.env") });

class EVault {
server: FastifyInstance;
graphqlServer: GraphQLServer;
logService: LogService;
driver: Driver;

constructor() {
const uri = process.env.NEO4J_URI || "bolt://localhost:7687";
const user = process.env.NEO4J_USER || "neo4j";
const password = process.env.NEO4J_PASSWORD || "neo4j";

if (
!process.env.NEO4J_URI ||
!process.env.NEO4J_USER ||
!process.env.NEO4J_PASSWORD
) {
console.warn(
"Using default Neo4j connection parameters. Set NEO4J_URI, NEO4J_USER, and NEO4J_PASSWORD environment variables for custom configuration."
);
server: FastifyInstance;
graphqlServer: GraphQLServer;
logService: LogService;
driver: Driver;

constructor() {
const uri = process.env.NEO4J_URI || "bolt://localhost:7687";
const user = process.env.NEO4J_USER || "neo4j";
const password = process.env.NEO4J_PASSWORD || "neo4j";

if (
!process.env.NEO4J_URI ||
!process.env.NEO4J_USER ||
!process.env.NEO4J_PASSWORD
) {
console.warn(
"Using default Neo4j connection parameters. Set NEO4J_URI, NEO4J_USER, and NEO4J_PASSWORD environment variables for custom configuration.",
);
}

this.driver = neo4j.driver(uri, neo4j.auth.basic(user, password));

const dbService = new DbService(this.driver);
this.logService = new LogService(this.driver);
this.graphqlServer = new GraphQLServer(dbService);

this.server = fastify({
logger: true,
});
}

this.driver = neo4j.driver(uri, neo4j.auth.basic(user, password));

const dbService = new DbService(this.driver);
this.logService = new LogService(this.driver);
this.graphqlServer = new GraphQLServer(dbService);

this.server = fastify({
logger: true,
});
}

async initialize() {
await registerHttpRoutes(this.server);

const w3id = await W3ID.get({
id: process.env.W3ID as string,
driver: this.driver,
password: process.env.ENCRYPTION_PASSWORD,
});

const yoga = this.graphqlServer.init();

this.server.route({
// Bind to the Yoga's endpoint to avoid rendering on any path
url: yoga.graphqlEndpoint,
method: ["GET", "POST", "OPTIONS"],
handler: (req, reply) =>
yoga.handleNodeRequestAndResponse(req, reply, {
req,
reply,
}),
});

// Mount Voyager endpoint
this.server.get("/voyager", (req: FastifyRequest, reply: FastifyReply) => {
reply.type("text/html").send(
renderVoyagerPage({
endpointUrl: "/graphql",
})
);
});
}

async start() {
await this.initialize();

const port = process.env.NOMAD_PORT_http || process.env.PORT || 4000;

await this.server.listen({ port: Number(port), host: "0.0.0.0" });
console.log(`Server started on http://0.0.0.0:${port}`);
console.log(`GraphQL endpoint available at http://0.0.0.0:${port}/graphql`);
console.log(`GraphQL Voyager available at http://0.0.0.0:${port}/voyager`);
console.log(`API Documentation available at http://0.0.0.0:${port}/docs`);
}
async initialize() {
await registerHttpRoutes(this.server);

const w3id = await W3ID.get({
id: process.env.W3ID as string,
driver: this.driver,
password: process.env.ENCRYPTION_PASSWORD,
});

const yoga = this.graphqlServer.init();

this.server.route({
// Bind to the Yoga's endpoint to avoid rendering on any path
url: yoga.graphqlEndpoint,
method: ["GET", "POST", "OPTIONS"],
handler: (req, reply) =>
yoga.handleNodeRequestAndResponse(req, reply, {
req,
reply,
}),
});

// Mount Voyager endpoint
this.server.get(
"/voyager",
(req: FastifyRequest, reply: FastifyReply) => {
reply.type("text/html").send(
renderVoyagerPage({
endpointUrl: "/graphql",
}),
);
},
);
}

async start() {
await this.initialize();

const port = process.env.NOMAD_PORT_http || process.env.PORT || 4000;

await this.server.listen({ port: Number(port), host: "0.0.0.0" });
console.log(`Server started on http://0.0.0.0:${port}`);
console.log(
`GraphQL endpoint available at http://0.0.0.0:${port}/graphql`,
);
console.log(
`GraphQL Voyager available at http://0.0.0.0:${port}/voyager`,
);
console.log(
`API Documentation available at http://0.0.0.0:${port}/docs`,
);
}
}

const evault = new EVault();
Expand Down
2 changes: 2 additions & 0 deletions infrastructure/evault-provisioner/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@
"test": "vitest"
},
"dependencies": {
"@kubernetes/client-node": "^1.3.0",
"axios": "^1.6.7",
"dotenv": "^16.4.5",
"express": "^4.18.2",
"jose": "^5.2.2",
"sha256": "^0.2.0",
"w3id": "workspace:*"
},
"devDependencies": {
Expand Down
18 changes: 2 additions & 16 deletions infrastructure/evault-provisioner/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import express, { Request, Response } from "express";
import axios, { AxiosError } from "axios";
import { generateNomadJob } from "./templates/evault.nomad.js";
import { provisionEVault } from "./templates/evault.nomad.js";
import dotenv from "dotenv";
import { subscribeToAlloc } from "./listeners/alloc.js";
import { W3IDBuilder } from "w3id";
import * as jose from "jose";

Expand Down Expand Up @@ -67,22 +66,9 @@ app.post(

const w3id = userId.id;

const jobJSON = generateNomadJob(w3id, evaultId.id);
await provisionEVault(w3id, evaultId.id);
const jobName = `evault-${w3id}`;

const { data } = await axios.post(
"http://localhost:4646/v1/jobs",
jobJSON,
);
const evalId = data.EvalID;

const sub = subscribeToAlloc(evalId);
sub.on("ready", async (allocId) => {
console.log("Alloc is ready:", allocId);
});
sub.on("error", (err) => {
console.error("Alloc wait failed:", err);
});

res.json({
success: true,
Expand Down
Loading
Loading