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
3 changes: 2 additions & 1 deletion package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,8 @@
"dev:core:apps": "pnpm exec concurrently -n registry,evault,sandbox \"pnpm --filter registry dev\" \"pnpm --filter evault-core dev\" \"pnpm --filter dev-sandbox dev\"",
"docker:core": "docker compose -f docker-compose.databases.yml up -d",
"docker:core:down": "docker compose -f docker-compose.databases.yml down",
"generate-entropy-jwk": "node scripts/generate-registry-entropy-jwk.cjs"
"generate-entropy-jwk": "node scripts/generate-registry-entropy-jwk.cjs",
"env:regen": "./scripts/update-env-ip.sh -a"
Comment thread
coodos marked this conversation as resolved.
},
"devDependencies": {
"@biomejs/biome": "^1.9.4",
Expand Down
233 changes: 233 additions & 0 deletions platforms/evoting/api/src/controllers/DelegationController.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,233 @@
import { Request, Response } from "express";
import { DelegationService } from "../services/DelegationService";
import { VoteService } from "../services/VoteService";

export class DelegationController {
private delegationService: DelegationService;
private voteService: VoteService;

constructor() {
this.delegationService = new DelegationService();
this.voteService = new VoteService();
}

async createDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const { delegateId } = req.body;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

if (!delegateId) {
return res.status(400).json({ error: "Missing delegateId" });
}

const delegation = await this.delegationService.createDelegation(
pollId,
delegatorId,
delegateId
);

res.status(201).json(delegation);
} catch (error: any) {
console.error("Error creating delegation:", error);
res.status(400).json({ error: error.message });
}
}

async revokeDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.revokeDelegationByPoll(
pollId,
delegatorId
);

res.json(delegation);
} catch (error: any) {
console.error("Error revoking delegation:", error);
res.status(400).json({ error: error.message });
}
}

async acceptDelegation(req: Request, res: Response) {
try {
const { id } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.acceptDelegation(
id,
delegateId
);

res.json(delegation);
} catch (error: any) {
console.error("Error accepting delegation:", error);
res.status(400).json({ error: error.message });
}
}

async rejectDelegation(req: Request, res: Response) {
try {
const { id } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.rejectDelegation(
id,
delegateId
);

res.json(delegation);
} catch (error: any) {
console.error("Error rejecting delegation:", error);
res.status(400).json({ error: error.message });
}
}

async getActiveDelegations(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegateId = (req as any).user?.id;
const includeUsed = req.query.includeUsed === "true" || req.query.includeUsed === "1";

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = includeUsed
? await this.delegationService.getActiveAndUsedDelegationsForDelegate(
pollId,
delegateId
)
: await this.delegationService.getActiveDelegationsForDelegate(
pollId,
delegateId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting active delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getPendingDelegations(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = await this.delegationService.getPendingDelegationsForDelegate(
pollId,
delegateId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting pending delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getAllPendingDelegations(req: Request, res: Response) {
try {
const userId = (req as any).user?.id;

if (!userId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = await this.delegationService.getAllPendingDelegationsForUser(
userId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting all pending delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getMyDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.getDelegationForDelegator(
pollId,
delegatorId
);

res.json(delegation);
} catch (error: any) {
console.error("Error getting my delegation:", error);
res.status(500).json({ error: error.message });
}
}

async castDelegatedVote(req: Request, res: Response) {
try {
const { pollId } = req.params;
const { delegatorId, voteData, mode } = req.body;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

if (!delegatorId || !voteData) {
return res.status(400).json({ error: "Missing delegatorId or voteData" });
}

const vote = await this.voteService.castDelegatedVote(
pollId,
delegateId,
delegatorId,
voteData,
mode || "normal"
);

res.status(201).json(vote);
} catch (error: any) {
console.error("Error casting delegated vote:", error);
res.status(400).json({ error: error.message });
}
}

async canPollHaveDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;

const result = await this.delegationService.canPollHaveDelegation(pollId);

res.json(result);
} catch (error: any) {
console.error("Error checking delegation eligibility:", error);
res.status(500).json({ error: error.message });
}
}
Comment thread
coodos marked this conversation as resolved.
}
15 changes: 13 additions & 2 deletions platforms/evoting/api/src/controllers/SigningController.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { Request, Response } from "express";
import { SigningService } from "../services/SigningService";
import type { SigningDelegationContext } from "../services/SigningService";

export class SigningController {
private signingService: SigningService | null = null;
Expand DownExpand Up@@ -37,15 +38,25 @@ export class SigningController {
// Create a new signing session for a vote
async createSigningSession(req: Request, res: Response) {
try {
const { pollId, voteData, userId } = req.body;
const { pollId, voteData, userId, delegationContext } = req.body as {
pollId?: string;
voteData?: any;
userId?: string;
delegationContext?: SigningDelegationContext;
};

if (!pollId || !voteData || !userId) {
return res.status(400).json({
error: "Missing required fields: pollId, voteData, userId"
});
}

const session = await this.ensureService().createSession(pollId, voteData, userId);
const session = await this.ensureService().createSession(
pollId,
voteData,
userId,
delegationContext
);

res.status(201).json({
sessionId: session.id,
Expand Down
3 changes: 2 additions & 1 deletion platforms/evoting/api/src/database/data-source.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { PollVotingState } from "./entities/PollVotingState";
import { MetaEnvelopeMap } from "./entities/MetaEnvelopeMap";
import { Message } from "./entities/Message";
import { VoteReputationResult } from "./entities/VoteReputationResult";
import { Delegation } from "./entities/Delegation";
import { PostgresSubscriber } from "../web3adapter/watchers/subscriber";

config({ path: path.resolve(__dirname, "../../../../.env") });
Expand All@@ -19,7 +20,7 @@ export const dataSourceOptions: DataSourceOptions = {
type: "postgres",
url: process.env.EVOTING_DATABASE_URL,
synchronize: false,
entities: [User, Group, Verification, Poll, Vote, PollVotingState, MetaEnvelopeMap, Message, VoteReputationResult],
entities: [User, Group, Verification, Poll, Vote, PollVotingState, MetaEnvelopeMap, Message, VoteReputationResult, Delegation],
migrations: [path.join(__dirname, "migrations", "*.ts")],
logging: process.env.NODE_ENV === "development",
subscribers: [PostgresSubscriber],
Expand Down
52 changes: 52 additions & 0 deletions platforms/evoting/api/src/database/entities/Delegation.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import {
Column,
CreateDateColumn,
Entity,
JoinColumn,
ManyToOne,
PrimaryGeneratedColumn,
UpdateDateColumn,
} from "typeorm";
import { Poll } from "./Poll";
import { User } from "./User";

export type DelegationStatus = "pending" | "active" | "rejected" | "revoked" | "used";

@Entity("delegations")
export class Delegation {
@PrimaryGeneratedColumn("uuid")
id!: string;

@ManyToOne(() => Poll, { onDelete: "CASCADE" })
@JoinColumn({ name: "pollId" })
poll!: Poll;

@Column("uuid")
pollId!: string;

@ManyToOne(() => User, { onDelete: "CASCADE" })
@JoinColumn({ name: "delegatorId" })
delegator!: User;

@Column("uuid")
delegatorId!: string;

@ManyToOne(() => User, { onDelete: "CASCADE" })
@JoinColumn({ name: "delegateId" })
delegate!: User;

@Column("uuid")
delegateId!: string;

@Column("enum", {
enum: ["pending", "active", "rejected", "revoked", "used"],
default: "pending",
})
status!: DelegationStatus;

@CreateDateColumn()
createdAt!: Date;

@UpdateDateColumn()
updatedAt!: Date;
}
Comment thread
coodos marked this conversation as resolved.
7 changes: 7 additions & 0 deletions platforms/evoting/api/src/database/entities/Vote.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,13 @@ export class Vote {
@Column("uuid")
userId!: string;

@ManyToOne(() => User, { nullable: true })
@JoinColumn({ name: "castById" })
castBy!: User | null;

@Column("uuid", { nullable: true })
castById!: string | null;

// This can be user ID, session ID, or anonymous identifier
@Column("varchar", { length: 255 })
voterId!: string;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1771588337031 implements MigrationInterface {
name = 'Migration1771588337031'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`CREATE TYPE "public"."delegations_status_enum" AS ENUM('pending', 'active', 'rejected', 'revoked', 'used')`);
await queryRunner.query(`CREATE TABLE "delegations" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "pollId" uuid NOT NULL, "delegatorId" uuid NOT NULL, "delegateId" uuid NOT NULL, "status" "public"."delegations_status_enum" NOT NULL DEFAULT 'pending', "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_01f9fbbc9b3bf52236a4e951b19" PRIMARY KEY ("id"))`);
await queryRunner.query(`ALTER TABLE "votes" ADD "castById" uuid`);
await queryRunner.query(`ALTER TABLE "votes" ADD CONSTRAINT "FK_c3f766036bdc68567015a3f6f9b" FOREIGN KEY ("castById") REFERENCES "users"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
Comment thread
coodos marked this conversation as resolved.
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_32c81d839deb11bcfd8f83ba2f9" FOREIGN KEY ("pollId") REFERENCES "polls"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_2efda215aa6a265a536fe68dcf6" FOREIGN KEY ("delegatorId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_2d4590d0c84a5ca333fd64e4c2a" FOREIGN KEY ("delegateId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_2d4590d0c84a5ca333fd64e4c2a"`);
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_2efda215aa6a265a536fe68dcf6"`);
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_32c81d839deb11bcfd8f83ba2f9"`);
await queryRunner.query(`ALTER TABLE "votes" DROP CONSTRAINT "FK_c3f766036bdc68567015a3f6f9b"`);
await queryRunner.query(`ALTER TABLE "votes" DROP COLUMN "castById"`);
await queryRunner.query(`DROP TABLE "delegations"`);
await queryRunner.query(`DROP TYPE "public"."delegations_status_enum"`);
}

}
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
3 changes: 2 additions & 1 deletion package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,8 @@
"dev:core:apps": "pnpm exec concurrently -n registry,evault,sandbox \"pnpm --filter registry dev\" \"pnpm --filter evault-core dev\" \"pnpm --filter dev-sandbox dev\"",
"docker:core": "docker compose -f docker-compose.databases.yml up -d",
"docker:core:down": "docker compose -f docker-compose.databases.yml down",
"generate-entropy-jwk": "node scripts/generate-registry-entropy-jwk.cjs"
"generate-entropy-jwk": "node scripts/generate-registry-entropy-jwk.cjs",
"env:regen": "./scripts/update-env-ip.sh -a"
Comment thread
coodos marked this conversation as resolved.
},
"devDependencies": {
"@biomejs/biome": "^1.9.4",
Expand Down
233 changes: 233 additions & 0 deletions platforms/evoting/api/src/controllers/DelegationController.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,233 @@
import { Request, Response } from "express";
import { DelegationService } from "../services/DelegationService";
import { VoteService } from "../services/VoteService";

export class DelegationController {
private delegationService: DelegationService;
private voteService: VoteService;

constructor() {
this.delegationService = new DelegationService();
this.voteService = new VoteService();
}

async createDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const { delegateId } = req.body;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

if (!delegateId) {
return res.status(400).json({ error: "Missing delegateId" });
}

const delegation = await this.delegationService.createDelegation(
pollId,
delegatorId,
delegateId
);

res.status(201).json(delegation);
} catch (error: any) {
console.error("Error creating delegation:", error);
res.status(400).json({ error: error.message });
}
}

async revokeDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.revokeDelegationByPoll(
pollId,
delegatorId
);

res.json(delegation);
} catch (error: any) {
console.error("Error revoking delegation:", error);
res.status(400).json({ error: error.message });
}
}

async acceptDelegation(req: Request, res: Response) {
try {
const { id } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.acceptDelegation(
id,
delegateId
);

res.json(delegation);
} catch (error: any) {
console.error("Error accepting delegation:", error);
res.status(400).json({ error: error.message });
}
}

async rejectDelegation(req: Request, res: Response) {
try {
const { id } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.rejectDelegation(
id,
delegateId
);

res.json(delegation);
} catch (error: any) {
console.error("Error rejecting delegation:", error);
res.status(400).json({ error: error.message });
}
}

async getActiveDelegations(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegateId = (req as any).user?.id;
const includeUsed = req.query.includeUsed === "true" || req.query.includeUsed === "1";

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = includeUsed
? await this.delegationService.getActiveAndUsedDelegationsForDelegate(
pollId,
delegateId
)
: await this.delegationService.getActiveDelegationsForDelegate(
pollId,
delegateId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting active delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getPendingDelegations(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = await this.delegationService.getPendingDelegationsForDelegate(
pollId,
delegateId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting pending delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getAllPendingDelegations(req: Request, res: Response) {
try {
const userId = (req as any).user?.id;

if (!userId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = await this.delegationService.getAllPendingDelegationsForUser(
userId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting all pending delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getMyDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.getDelegationForDelegator(
pollId,
delegatorId
);

res.json(delegation);
} catch (error: any) {
console.error("Error getting my delegation:", error);
res.status(500).json({ error: error.message });
}
}

async castDelegatedVote(req: Request, res: Response) {
try {
const { pollId } = req.params;
const { delegatorId, voteData, mode } = req.body;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

if (!delegatorId || !voteData) {
return res.status(400).json({ error: "Missing delegatorId or voteData" });
}

const vote = await this.voteService.castDelegatedVote(
pollId,
delegateId,
delegatorId,
voteData,
mode || "normal"
);

res.status(201).json(vote);
} catch (error: any) {
console.error("Error casting delegated vote:", error);
res.status(400).json({ error: error.message });
}
}

async canPollHaveDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;

const result = await this.delegationService.canPollHaveDelegation(pollId);

res.json(result);
} catch (error: any) {
console.error("Error checking delegation eligibility:", error);
res.status(500).json({ error: error.message });
}
}
Comment thread
coodos marked this conversation as resolved.
}
15 changes: 13 additions & 2 deletions platforms/evoting/api/src/controllers/SigningController.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { Request, Response } from "express";
import { SigningService } from "../services/SigningService";
import type { SigningDelegationContext } from "../services/SigningService";

export class SigningController {
private signingService: SigningService | null = null;
Expand DownExpand Up@@ -37,15 +38,25 @@ export class SigningController {
// Create a new signing session for a vote
async createSigningSession(req: Request, res: Response) {
try {
const { pollId, voteData, userId } = req.body;
const { pollId, voteData, userId, delegationContext } = req.body as {
pollId?: string;
voteData?: any;
userId?: string;
delegationContext?: SigningDelegationContext;
};

if (!pollId || !voteData || !userId) {
return res.status(400).json({
error: "Missing required fields: pollId, voteData, userId"
});
}

const session = await this.ensureService().createSession(pollId, voteData, userId);
const session = await this.ensureService().createSession(
pollId,
voteData,
userId,
delegationContext
);

res.status(201).json({
sessionId: session.id,
Expand Down
3 changes: 2 additions & 1 deletion platforms/evoting/api/src/database/data-source.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { PollVotingState } from "./entities/PollVotingState";
import { MetaEnvelopeMap } from "./entities/MetaEnvelopeMap";
import { Message } from "./entities/Message";
import { VoteReputationResult } from "./entities/VoteReputationResult";
import { Delegation } from "./entities/Delegation";
import { PostgresSubscriber } from "../web3adapter/watchers/subscriber";

config({ path: path.resolve(__dirname, "../../../../.env") });
Expand All@@ -19,7 +20,7 @@ export const dataSourceOptions: DataSourceOptions = {
type: "postgres",
url: process.env.EVOTING_DATABASE_URL,
synchronize: false,
entities: [User, Group, Verification, Poll, Vote, PollVotingState, MetaEnvelopeMap, Message, VoteReputationResult],
entities: [User, Group, Verification, Poll, Vote, PollVotingState, MetaEnvelopeMap, Message, VoteReputationResult, Delegation],
migrations: [path.join(__dirname, "migrations", "*.ts")],
logging: process.env.NODE_ENV === "development",
subscribers: [PostgresSubscriber],
Expand Down
52 changes: 52 additions & 0 deletions platforms/evoting/api/src/database/entities/Delegation.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import {
Column,
CreateDateColumn,
Entity,
JoinColumn,
ManyToOne,
PrimaryGeneratedColumn,
UpdateDateColumn,
} from "typeorm";
import { Poll } from "./Poll";
import { User } from "./User";

export type DelegationStatus = "pending" | "active" | "rejected" | "revoked" | "used";

@Entity("delegations")
export class Delegation {
@PrimaryGeneratedColumn("uuid")
id!: string;

@ManyToOne(() => Poll, { onDelete: "CASCADE" })
@JoinColumn({ name: "pollId" })
poll!: Poll;

@Column("uuid")
pollId!: string;

@ManyToOne(() => User, { onDelete: "CASCADE" })
@JoinColumn({ name: "delegatorId" })
delegator!: User;

@Column("uuid")
delegatorId!: string;

@ManyToOne(() => User, { onDelete: "CASCADE" })
@JoinColumn({ name: "delegateId" })
delegate!: User;

@Column("uuid")
delegateId!: string;

@Column("enum", {
enum: ["pending", "active", "rejected", "revoked", "used"],
default: "pending",
})
status!: DelegationStatus;

@CreateDateColumn()
createdAt!: Date;

@UpdateDateColumn()
updatedAt!: Date;
}
Comment thread
coodos marked this conversation as resolved.
7 changes: 7 additions & 0 deletions platforms/evoting/api/src/database/entities/Vote.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,13 @@ export class Vote {
@Column("uuid")
userId!: string;

@ManyToOne(() => User, { nullable: true })
@JoinColumn({ name: "castById" })
castBy!: User | null;

@Column("uuid", { nullable: true })
castById!: string | null;

// This can be user ID, session ID, or anonymous identifier
@Column("varchar", { length: 255 })
voterId!: string;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1771588337031 implements MigrationInterface {
name = 'Migration1771588337031'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`CREATE TYPE "public"."delegations_status_enum" AS ENUM('pending', 'active', 'rejected', 'revoked', 'used')`);
await queryRunner.query(`CREATE TABLE "delegations" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "pollId" uuid NOT NULL, "delegatorId" uuid NOT NULL, "delegateId" uuid NOT NULL, "status" "public"."delegations_status_enum" NOT NULL DEFAULT 'pending', "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_01f9fbbc9b3bf52236a4e951b19" PRIMARY KEY ("id"))`);
await queryRunner.query(`ALTER TABLE "votes" ADD "castById" uuid`);
await queryRunner.query(`ALTER TABLE "votes" ADD CONSTRAINT "FK_c3f766036bdc68567015a3f6f9b" FOREIGN KEY ("castById") REFERENCES "users"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
Comment thread
coodos marked this conversation as resolved.
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_32c81d839deb11bcfd8f83ba2f9" FOREIGN KEY ("pollId") REFERENCES "polls"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_2efda215aa6a265a536fe68dcf6" FOREIGN KEY ("delegatorId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_2d4590d0c84a5ca333fd64e4c2a" FOREIGN KEY ("delegateId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_2d4590d0c84a5ca333fd64e4c2a"`);
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_2efda215aa6a265a536fe68dcf6"`);
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_32c81d839deb11bcfd8f83ba2f9"`);
await queryRunner.query(`ALTER TABLE "votes" DROP CONSTRAINT "FK_c3f766036bdc68567015a3f6f9b"`);
await queryRunner.query(`ALTER TABLE "votes" DROP COLUMN "castById"`);
await queryRunner.query(`DROP TABLE "delegations"`);
await queryRunner.query(`DROP TYPE "public"."delegations_status_enum"`);
}

}
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
3 changes: 2 additions & 1 deletion package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,8 @@
"dev:core:apps": "pnpm exec concurrently -n registry,evault,sandbox \"pnpm --filter registry dev\" \"pnpm --filter evault-core dev\" \"pnpm --filter dev-sandbox dev\"",
"docker:core": "docker compose -f docker-compose.databases.yml up -d",
"docker:core:down": "docker compose -f docker-compose.databases.yml down",
"generate-entropy-jwk": "node scripts/generate-registry-entropy-jwk.cjs"
"generate-entropy-jwk": "node scripts/generate-registry-entropy-jwk.cjs",
"env:regen": "./scripts/update-env-ip.sh -a"
Comment thread
coodos marked this conversation as resolved.
},
"devDependencies": {
"@biomejs/biome": "^1.9.4",
Expand Down
233 changes: 233 additions & 0 deletions platforms/evoting/api/src/controllers/DelegationController.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,233 @@
import { Request, Response } from "express";
import { DelegationService } from "../services/DelegationService";
import { VoteService } from "../services/VoteService";

export class DelegationController {
private delegationService: DelegationService;
private voteService: VoteService;

constructor() {
this.delegationService = new DelegationService();
this.voteService = new VoteService();
}

async createDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const { delegateId } = req.body;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

if (!delegateId) {
return res.status(400).json({ error: "Missing delegateId" });
}

const delegation = await this.delegationService.createDelegation(
pollId,
delegatorId,
delegateId
);

res.status(201).json(delegation);
} catch (error: any) {
console.error("Error creating delegation:", error);
res.status(400).json({ error: error.message });
}
}

async revokeDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.revokeDelegationByPoll(
pollId,
delegatorId
);

res.json(delegation);
} catch (error: any) {
console.error("Error revoking delegation:", error);
res.status(400).json({ error: error.message });
}
}

async acceptDelegation(req: Request, res: Response) {
try {
const { id } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.acceptDelegation(
id,
delegateId
);

res.json(delegation);
} catch (error: any) {
console.error("Error accepting delegation:", error);
res.status(400).json({ error: error.message });
}
}

async rejectDelegation(req: Request, res: Response) {
try {
const { id } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.rejectDelegation(
id,
delegateId
);

res.json(delegation);
} catch (error: any) {
console.error("Error rejecting delegation:", error);
res.status(400).json({ error: error.message });
}
}

async getActiveDelegations(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegateId = (req as any).user?.id;
const includeUsed = req.query.includeUsed === "true" || req.query.includeUsed === "1";

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = includeUsed
? await this.delegationService.getActiveAndUsedDelegationsForDelegate(
pollId,
delegateId
)
: await this.delegationService.getActiveDelegationsForDelegate(
pollId,
delegateId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting active delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getPendingDelegations(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = await this.delegationService.getPendingDelegationsForDelegate(
pollId,
delegateId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting pending delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getAllPendingDelegations(req: Request, res: Response) {
try {
const userId = (req as any).user?.id;

if (!userId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = await this.delegationService.getAllPendingDelegationsForUser(
userId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting all pending delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getMyDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.getDelegationForDelegator(
pollId,
delegatorId
);

res.json(delegation);
} catch (error: any) {
console.error("Error getting my delegation:", error);
res.status(500).json({ error: error.message });
}
}

async castDelegatedVote(req: Request, res: Response) {
try {
const { pollId } = req.params;
const { delegatorId, voteData, mode } = req.body;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

if (!delegatorId || !voteData) {
return res.status(400).json({ error: "Missing delegatorId or voteData" });
}

const vote = await this.voteService.castDelegatedVote(
pollId,
delegateId,
delegatorId,
voteData,
mode || "normal"
);

res.status(201).json(vote);
} catch (error: any) {
console.error("Error casting delegated vote:", error);
res.status(400).json({ error: error.message });
}
}

async canPollHaveDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;

const result = await this.delegationService.canPollHaveDelegation(pollId);

res.json(result);
} catch (error: any) {
console.error("Error checking delegation eligibility:", error);
res.status(500).json({ error: error.message });
}
}
Comment thread
coodos marked this conversation as resolved.
}
15 changes: 13 additions & 2 deletions platforms/evoting/api/src/controllers/SigningController.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { Request, Response } from "express";
import { SigningService } from "../services/SigningService";
import type { SigningDelegationContext } from "../services/SigningService";

export class SigningController {
private signingService: SigningService | null = null;
Expand DownExpand Up@@ -37,15 +38,25 @@ export class SigningController {
// Create a new signing session for a vote
async createSigningSession(req: Request, res: Response) {
try {
const { pollId, voteData, userId } = req.body;
const { pollId, voteData, userId, delegationContext } = req.body as {
pollId?: string;
voteData?: any;
userId?: string;
delegationContext?: SigningDelegationContext;
};

if (!pollId || !voteData || !userId) {
return res.status(400).json({
error: "Missing required fields: pollId, voteData, userId"
});
}

const session = await this.ensureService().createSession(pollId, voteData, userId);
const session = await this.ensureService().createSession(
pollId,
voteData,
userId,
delegationContext
);

res.status(201).json({
sessionId: session.id,
Expand Down
3 changes: 2 additions & 1 deletion platforms/evoting/api/src/database/data-source.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { PollVotingState } from "./entities/PollVotingState";
import { MetaEnvelopeMap } from "./entities/MetaEnvelopeMap";
import { Message } from "./entities/Message";
import { VoteReputationResult } from "./entities/VoteReputationResult";
import { Delegation } from "./entities/Delegation";
import { PostgresSubscriber } from "../web3adapter/watchers/subscriber";

config({ path: path.resolve(__dirname, "../../../../.env") });
Expand All@@ -19,7 +20,7 @@ export const dataSourceOptions: DataSourceOptions = {
type: "postgres",
url: process.env.EVOTING_DATABASE_URL,
synchronize: false,
entities: [User, Group, Verification, Poll, Vote, PollVotingState, MetaEnvelopeMap, Message, VoteReputationResult],
entities: [User, Group, Verification, Poll, Vote, PollVotingState, MetaEnvelopeMap, Message, VoteReputationResult, Delegation],
migrations: [path.join(__dirname, "migrations", "*.ts")],
logging: process.env.NODE_ENV === "development",
subscribers: [PostgresSubscriber],
Expand Down
52 changes: 52 additions & 0 deletions platforms/evoting/api/src/database/entities/Delegation.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import {
Column,
CreateDateColumn,
Entity,
JoinColumn,
ManyToOne,
PrimaryGeneratedColumn,
UpdateDateColumn,
} from "typeorm";
import { Poll } from "./Poll";
import { User } from "./User";

export type DelegationStatus = "pending" | "active" | "rejected" | "revoked" | "used";

@Entity("delegations")
export class Delegation {
@PrimaryGeneratedColumn("uuid")
id!: string;

@ManyToOne(() => Poll, { onDelete: "CASCADE" })
@JoinColumn({ name: "pollId" })
poll!: Poll;

@Column("uuid")
pollId!: string;

@ManyToOne(() => User, { onDelete: "CASCADE" })
@JoinColumn({ name: "delegatorId" })
delegator!: User;

@Column("uuid")
delegatorId!: string;

@ManyToOne(() => User, { onDelete: "CASCADE" })
@JoinColumn({ name: "delegateId" })
delegate!: User;

@Column("uuid")
delegateId!: string;

@Column("enum", {
enum: ["pending", "active", "rejected", "revoked", "used"],
default: "pending",
})
status!: DelegationStatus;

@CreateDateColumn()
createdAt!: Date;

@UpdateDateColumn()
updatedAt!: Date;
}
Comment thread
coodos marked this conversation as resolved.
7 changes: 7 additions & 0 deletions platforms/evoting/api/src/database/entities/Vote.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,13 @@ export class Vote {
@Column("uuid")
userId!: string;

@ManyToOne(() => User, { nullable: true })
@JoinColumn({ name: "castById" })
castBy!: User | null;

@Column("uuid", { nullable: true })
castById!: string | null;

// This can be user ID, session ID, or anonymous identifier
@Column("varchar", { length: 255 })
voterId!: string;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1771588337031 implements MigrationInterface {
name = 'Migration1771588337031'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`CREATE TYPE "public"."delegations_status_enum" AS ENUM('pending', 'active', 'rejected', 'revoked', 'used')`);
await queryRunner.query(`CREATE TABLE "delegations" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "pollId" uuid NOT NULL, "delegatorId" uuid NOT NULL, "delegateId" uuid NOT NULL, "status" "public"."delegations_status_enum" NOT NULL DEFAULT 'pending', "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_01f9fbbc9b3bf52236a4e951b19" PRIMARY KEY ("id"))`);
await queryRunner.query(`ALTER TABLE "votes" ADD "castById" uuid`);
await queryRunner.query(`ALTER TABLE "votes" ADD CONSTRAINT "FK_c3f766036bdc68567015a3f6f9b" FOREIGN KEY ("castById") REFERENCES "users"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
Comment thread
coodos marked this conversation as resolved.
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_32c81d839deb11bcfd8f83ba2f9" FOREIGN KEY ("pollId") REFERENCES "polls"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_2efda215aa6a265a536fe68dcf6" FOREIGN KEY ("delegatorId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_2d4590d0c84a5ca333fd64e4c2a" FOREIGN KEY ("delegateId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_2d4590d0c84a5ca333fd64e4c2a"`);
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_2efda215aa6a265a536fe68dcf6"`);
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_32c81d839deb11bcfd8f83ba2f9"`);
await queryRunner.query(`ALTER TABLE "votes" DROP CONSTRAINT "FK_c3f766036bdc68567015a3f6f9b"`);
await queryRunner.query(`ALTER TABLE "votes" DROP COLUMN "castById"`);
await queryRunner.query(`DROP TABLE "delegations"`);
await queryRunner.query(`DROP TYPE "public"."delegations_status_enum"`);
}

}
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
3 changes: 2 additions & 1 deletion package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,8 @@
"dev:core:apps": "pnpm exec concurrently -n registry,evault,sandbox \"pnpm --filter registry dev\" \"pnpm --filter evault-core dev\" \"pnpm --filter dev-sandbox dev\"",
"docker:core": "docker compose -f docker-compose.databases.yml up -d",
"docker:core:down": "docker compose -f docker-compose.databases.yml down",
"generate-entropy-jwk": "node scripts/generate-registry-entropy-jwk.cjs"
"generate-entropy-jwk": "node scripts/generate-registry-entropy-jwk.cjs",
"env:regen": "./scripts/update-env-ip.sh -a"
Comment thread
coodos marked this conversation as resolved.
},
"devDependencies": {
"@biomejs/biome": "^1.9.4",
Expand Down
233 changes: 233 additions & 0 deletions platforms/evoting/api/src/controllers/DelegationController.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,233 @@
import { Request, Response } from "express";
import { DelegationService } from "../services/DelegationService";
import { VoteService } from "../services/VoteService";

export class DelegationController {
private delegationService: DelegationService;
private voteService: VoteService;

constructor() {
this.delegationService = new DelegationService();
this.voteService = new VoteService();
}

async createDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const { delegateId } = req.body;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

if (!delegateId) {
return res.status(400).json({ error: "Missing delegateId" });
}

const delegation = await this.delegationService.createDelegation(
pollId,
delegatorId,
delegateId
);

res.status(201).json(delegation);
} catch (error: any) {
console.error("Error creating delegation:", error);
res.status(400).json({ error: error.message });
}
}

async revokeDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.revokeDelegationByPoll(
pollId,
delegatorId
);

res.json(delegation);
} catch (error: any) {
console.error("Error revoking delegation:", error);
res.status(400).json({ error: error.message });
}
}

async acceptDelegation(req: Request, res: Response) {
try {
const { id } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.acceptDelegation(
id,
delegateId
);

res.json(delegation);
} catch (error: any) {
console.error("Error accepting delegation:", error);
res.status(400).json({ error: error.message });
}
}

async rejectDelegation(req: Request, res: Response) {
try {
const { id } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.rejectDelegation(
id,
delegateId
);

res.json(delegation);
} catch (error: any) {
console.error("Error rejecting delegation:", error);
res.status(400).json({ error: error.message });
}
}

async getActiveDelegations(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegateId = (req as any).user?.id;
const includeUsed = req.query.includeUsed === "true" || req.query.includeUsed === "1";

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = includeUsed
? await this.delegationService.getActiveAndUsedDelegationsForDelegate(
pollId,
delegateId
)
: await this.delegationService.getActiveDelegationsForDelegate(
pollId,
delegateId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting active delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getPendingDelegations(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = await this.delegationService.getPendingDelegationsForDelegate(
pollId,
delegateId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting pending delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getAllPendingDelegations(req: Request, res: Response) {
try {
const userId = (req as any).user?.id;

if (!userId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = await this.delegationService.getAllPendingDelegationsForUser(
userId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting all pending delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getMyDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.getDelegationForDelegator(
pollId,
delegatorId
);

res.json(delegation);
} catch (error: any) {
console.error("Error getting my delegation:", error);
res.status(500).json({ error: error.message });
}
}

async castDelegatedVote(req: Request, res: Response) {
try {
const { pollId } = req.params;
const { delegatorId, voteData, mode } = req.body;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

if (!delegatorId || !voteData) {
return res.status(400).json({ error: "Missing delegatorId or voteData" });
}

const vote = await this.voteService.castDelegatedVote(
pollId,
delegateId,
delegatorId,
voteData,
mode || "normal"
);

res.status(201).json(vote);
} catch (error: any) {
console.error("Error casting delegated vote:", error);
res.status(400).json({ error: error.message });
}
}

async canPollHaveDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;

const result = await this.delegationService.canPollHaveDelegation(pollId);

res.json(result);
} catch (error: any) {
console.error("Error checking delegation eligibility:", error);
res.status(500).json({ error: error.message });
}
}
Comment thread
coodos marked this conversation as resolved.
}
15 changes: 13 additions & 2 deletions platforms/evoting/api/src/controllers/SigningController.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { Request, Response } from "express";
import { SigningService } from "../services/SigningService";
import type { SigningDelegationContext } from "../services/SigningService";

export class SigningController {
private signingService: SigningService | null = null;
Expand DownExpand Up@@ -37,15 +38,25 @@ export class SigningController {
// Create a new signing session for a vote
async createSigningSession(req: Request, res: Response) {
try {
const { pollId, voteData, userId } = req.body;
const { pollId, voteData, userId, delegationContext } = req.body as {
pollId?: string;
voteData?: any;
userId?: string;
delegationContext?: SigningDelegationContext;
};

if (!pollId || !voteData || !userId) {
return res.status(400).json({
error: "Missing required fields: pollId, voteData, userId"
});
}

const session = await this.ensureService().createSession(pollId, voteData, userId);
const session = await this.ensureService().createSession(
pollId,
voteData,
userId,
delegationContext
);

res.status(201).json({
sessionId: session.id,
Expand Down
3 changes: 2 additions & 1 deletion platforms/evoting/api/src/database/data-source.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { PollVotingState } from "./entities/PollVotingState";
import { MetaEnvelopeMap } from "./entities/MetaEnvelopeMap";
import { Message } from "./entities/Message";
import { VoteReputationResult } from "./entities/VoteReputationResult";
import { Delegation } from "./entities/Delegation";
import { PostgresSubscriber } from "../web3adapter/watchers/subscriber";

config({ path: path.resolve(__dirname, "../../../../.env") });
Expand All@@ -19,7 +20,7 @@ export const dataSourceOptions: DataSourceOptions = {
type: "postgres",
url: process.env.EVOTING_DATABASE_URL,
synchronize: false,
entities: [User, Group, Verification, Poll, Vote, PollVotingState, MetaEnvelopeMap, Message, VoteReputationResult],
entities: [User, Group, Verification, Poll, Vote, PollVotingState, MetaEnvelopeMap, Message, VoteReputationResult, Delegation],
migrations: [path.join(__dirname, "migrations", "*.ts")],
logging: process.env.NODE_ENV === "development",
subscribers: [PostgresSubscriber],
Expand Down
52 changes: 52 additions & 0 deletions platforms/evoting/api/src/database/entities/Delegation.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import {
Column,
CreateDateColumn,
Entity,
JoinColumn,
ManyToOne,
PrimaryGeneratedColumn,
UpdateDateColumn,
} from "typeorm";
import { Poll } from "./Poll";
import { User } from "./User";

export type DelegationStatus = "pending" | "active" | "rejected" | "revoked" | "used";

@Entity("delegations")
export class Delegation {
@PrimaryGeneratedColumn("uuid")
id!: string;

@ManyToOne(() => Poll, { onDelete: "CASCADE" })
@JoinColumn({ name: "pollId" })
poll!: Poll;

@Column("uuid")
pollId!: string;

@ManyToOne(() => User, { onDelete: "CASCADE" })
@JoinColumn({ name: "delegatorId" })
delegator!: User;

@Column("uuid")
delegatorId!: string;

@ManyToOne(() => User, { onDelete: "CASCADE" })
@JoinColumn({ name: "delegateId" })
delegate!: User;

@Column("uuid")
delegateId!: string;

@Column("enum", {
enum: ["pending", "active", "rejected", "revoked", "used"],
default: "pending",
})
status!: DelegationStatus;

@CreateDateColumn()
createdAt!: Date;

@UpdateDateColumn()
updatedAt!: Date;
}
Comment thread
coodos marked this conversation as resolved.
7 changes: 7 additions & 0 deletions platforms/evoting/api/src/database/entities/Vote.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,13 @@ export class Vote {
@Column("uuid")
userId!: string;

@ManyToOne(() => User, { nullable: true })
@JoinColumn({ name: "castById" })
castBy!: User | null;

@Column("uuid", { nullable: true })
castById!: string | null;

// This can be user ID, session ID, or anonymous identifier
@Column("varchar", { length: 255 })
voterId!: string;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1771588337031 implements MigrationInterface {
name = 'Migration1771588337031'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`CREATE TYPE "public"."delegations_status_enum" AS ENUM('pending', 'active', 'rejected', 'revoked', 'used')`);
await queryRunner.query(`CREATE TABLE "delegations" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "pollId" uuid NOT NULL, "delegatorId" uuid NOT NULL, "delegateId" uuid NOT NULL, "status" "public"."delegations_status_enum" NOT NULL DEFAULT 'pending', "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_01f9fbbc9b3bf52236a4e951b19" PRIMARY KEY ("id"))`);
await queryRunner.query(`ALTER TABLE "votes" ADD "castById" uuid`);
await queryRunner.query(`ALTER TABLE "votes" ADD CONSTRAINT "FK_c3f766036bdc68567015a3f6f9b" FOREIGN KEY ("castById") REFERENCES "users"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
Comment thread
coodos marked this conversation as resolved.
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_32c81d839deb11bcfd8f83ba2f9" FOREIGN KEY ("pollId") REFERENCES "polls"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_2efda215aa6a265a536fe68dcf6" FOREIGN KEY ("delegatorId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_2d4590d0c84a5ca333fd64e4c2a" FOREIGN KEY ("delegateId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_2d4590d0c84a5ca333fd64e4c2a"`);
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_2efda215aa6a265a536fe68dcf6"`);
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_32c81d839deb11bcfd8f83ba2f9"`);
await queryRunner.query(`ALTER TABLE "votes" DROP CONSTRAINT "FK_c3f766036bdc68567015a3f6f9b"`);
await queryRunner.query(`ALTER TABLE "votes" DROP COLUMN "castById"`);
await queryRunner.query(`DROP TABLE "delegations"`);
await queryRunner.query(`DROP TYPE "public"."delegations_status_enum"`);
}

}
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
3 changes: 2 additions & 1 deletion package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,8 @@
"dev:core:apps": "pnpm exec concurrently -n registry,evault,sandbox \"pnpm --filter registry dev\" \"pnpm --filter evault-core dev\" \"pnpm --filter dev-sandbox dev\"",
"docker:core": "docker compose -f docker-compose.databases.yml up -d",
"docker:core:down": "docker compose -f docker-compose.databases.yml down",
"generate-entropy-jwk": "node scripts/generate-registry-entropy-jwk.cjs"
"generate-entropy-jwk": "node scripts/generate-registry-entropy-jwk.cjs",
"env:regen": "./scripts/update-env-ip.sh -a"
Comment thread
coodos marked this conversation as resolved.
},
"devDependencies": {
"@biomejs/biome": "^1.9.4",
Expand Down
233 changes: 233 additions & 0 deletions platforms/evoting/api/src/controllers/DelegationController.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,233 @@
import { Request, Response } from "express";
import { DelegationService } from "../services/DelegationService";
import { VoteService } from "../services/VoteService";

export class DelegationController {
private delegationService: DelegationService;
private voteService: VoteService;

constructor() {
this.delegationService = new DelegationService();
this.voteService = new VoteService();
}

async createDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const { delegateId } = req.body;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

if (!delegateId) {
return res.status(400).json({ error: "Missing delegateId" });
}

const delegation = await this.delegationService.createDelegation(
pollId,
delegatorId,
delegateId
);

res.status(201).json(delegation);
} catch (error: any) {
console.error("Error creating delegation:", error);
res.status(400).json({ error: error.message });
}
}

async revokeDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.revokeDelegationByPoll(
pollId,
delegatorId
);

res.json(delegation);
} catch (error: any) {
console.error("Error revoking delegation:", error);
res.status(400).json({ error: error.message });
}
}

async acceptDelegation(req: Request, res: Response) {
try {
const { id } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.acceptDelegation(
id,
delegateId
);

res.json(delegation);
} catch (error: any) {
console.error("Error accepting delegation:", error);
res.status(400).json({ error: error.message });
}
}

async rejectDelegation(req: Request, res: Response) {
try {
const { id } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.rejectDelegation(
id,
delegateId
);

res.json(delegation);
} catch (error: any) {
console.error("Error rejecting delegation:", error);
res.status(400).json({ error: error.message });
}
}

async getActiveDelegations(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegateId = (req as any).user?.id;
const includeUsed = req.query.includeUsed === "true" || req.query.includeUsed === "1";

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = includeUsed
? await this.delegationService.getActiveAndUsedDelegationsForDelegate(
pollId,
delegateId
)
: await this.delegationService.getActiveDelegationsForDelegate(
pollId,
delegateId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting active delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getPendingDelegations(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = await this.delegationService.getPendingDelegationsForDelegate(
pollId,
delegateId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting pending delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getAllPendingDelegations(req: Request, res: Response) {
try {
const userId = (req as any).user?.id;

if (!userId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = await this.delegationService.getAllPendingDelegationsForUser(
userId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting all pending delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getMyDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.getDelegationForDelegator(
pollId,
delegatorId
);

res.json(delegation);
} catch (error: any) {
console.error("Error getting my delegation:", error);
res.status(500).json({ error: error.message });
}
}

async castDelegatedVote(req: Request, res: Response) {
try {
const { pollId } = req.params;
const { delegatorId, voteData, mode } = req.body;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

if (!delegatorId || !voteData) {
return res.status(400).json({ error: "Missing delegatorId or voteData" });
}

const vote = await this.voteService.castDelegatedVote(
pollId,
delegateId,
delegatorId,
voteData,
mode || "normal"
);

res.status(201).json(vote);
} catch (error: any) {
console.error("Error casting delegated vote:", error);
res.status(400).json({ error: error.message });
}
}

async canPollHaveDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;

const result = await this.delegationService.canPollHaveDelegation(pollId);

res.json(result);
} catch (error: any) {
console.error("Error checking delegation eligibility:", error);
res.status(500).json({ error: error.message });
}
}
Comment thread
coodos marked this conversation as resolved.
}
15 changes: 13 additions & 2 deletions platforms/evoting/api/src/controllers/SigningController.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { Request, Response } from "express";
import { SigningService } from "../services/SigningService";
import type { SigningDelegationContext } from "../services/SigningService";

export class SigningController {
private signingService: SigningService | null = null;
Expand DownExpand Up@@ -37,15 +38,25 @@ export class SigningController {
// Create a new signing session for a vote
async createSigningSession(req: Request, res: Response) {
try {
const { pollId, voteData, userId } = req.body;
const { pollId, voteData, userId, delegationContext } = req.body as {
pollId?: string;
voteData?: any;
userId?: string;
delegationContext?: SigningDelegationContext;
};

if (!pollId || !voteData || !userId) {
return res.status(400).json({
error: "Missing required fields: pollId, voteData, userId"
});
}

const session = await this.ensureService().createSession(pollId, voteData, userId);
const session = await this.ensureService().createSession(
pollId,
voteData,
userId,
delegationContext
);

res.status(201).json({
sessionId: session.id,
Expand Down
3 changes: 2 additions & 1 deletion platforms/evoting/api/src/database/data-source.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { PollVotingState } from "./entities/PollVotingState";
import { MetaEnvelopeMap } from "./entities/MetaEnvelopeMap";
import { Message } from "./entities/Message";
import { VoteReputationResult } from "./entities/VoteReputationResult";
import { Delegation } from "./entities/Delegation";
import { PostgresSubscriber } from "../web3adapter/watchers/subscriber";

config({ path: path.resolve(__dirname, "../../../../.env") });
Expand All@@ -19,7 +20,7 @@ export const dataSourceOptions: DataSourceOptions = {
type: "postgres",
url: process.env.EVOTING_DATABASE_URL,
synchronize: false,
entities: [User, Group, Verification, Poll, Vote, PollVotingState, MetaEnvelopeMap, Message, VoteReputationResult],
entities: [User, Group, Verification, Poll, Vote, PollVotingState, MetaEnvelopeMap, Message, VoteReputationResult, Delegation],
migrations: [path.join(__dirname, "migrations", "*.ts")],
logging: process.env.NODE_ENV === "development",
subscribers: [PostgresSubscriber],
Expand Down
52 changes: 52 additions & 0 deletions platforms/evoting/api/src/database/entities/Delegation.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import {
Column,
CreateDateColumn,
Entity,
JoinColumn,
ManyToOne,
PrimaryGeneratedColumn,
UpdateDateColumn,
} from "typeorm";
import { Poll } from "./Poll";
import { User } from "./User";

export type DelegationStatus = "pending" | "active" | "rejected" | "revoked" | "used";

@Entity("delegations")
export class Delegation {
@PrimaryGeneratedColumn("uuid")
id!: string;

@ManyToOne(() => Poll, { onDelete: "CASCADE" })
@JoinColumn({ name: "pollId" })
poll!: Poll;

@Column("uuid")
pollId!: string;

@ManyToOne(() => User, { onDelete: "CASCADE" })
@JoinColumn({ name: "delegatorId" })
delegator!: User;

@Column("uuid")
delegatorId!: string;

@ManyToOne(() => User, { onDelete: "CASCADE" })
@JoinColumn({ name: "delegateId" })
delegate!: User;

@Column("uuid")
delegateId!: string;

@Column("enum", {
enum: ["pending", "active", "rejected", "revoked", "used"],
default: "pending",
})
status!: DelegationStatus;

@CreateDateColumn()
createdAt!: Date;

@UpdateDateColumn()
updatedAt!: Date;
}
Comment thread
coodos marked this conversation as resolved.
7 changes: 7 additions & 0 deletions platforms/evoting/api/src/database/entities/Vote.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,13 @@ export class Vote {
@Column("uuid")
userId!: string;

@ManyToOne(() => User, { nullable: true })
@JoinColumn({ name: "castById" })
castBy!: User | null;

@Column("uuid", { nullable: true })
castById!: string | null;

// This can be user ID, session ID, or anonymous identifier
@Column("varchar", { length: 255 })
voterId!: string;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1771588337031 implements MigrationInterface {
name = 'Migration1771588337031'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`CREATE TYPE "public"."delegations_status_enum" AS ENUM('pending', 'active', 'rejected', 'revoked', 'used')`);
await queryRunner.query(`CREATE TABLE "delegations" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "pollId" uuid NOT NULL, "delegatorId" uuid NOT NULL, "delegateId" uuid NOT NULL, "status" "public"."delegations_status_enum" NOT NULL DEFAULT 'pending', "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_01f9fbbc9b3bf52236a4e951b19" PRIMARY KEY ("id"))`);
await queryRunner.query(`ALTER TABLE "votes" ADD "castById" uuid`);
await queryRunner.query(`ALTER TABLE "votes" ADD CONSTRAINT "FK_c3f766036bdc68567015a3f6f9b" FOREIGN KEY ("castById") REFERENCES "users"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
Comment thread
coodos marked this conversation as resolved.
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_32c81d839deb11bcfd8f83ba2f9" FOREIGN KEY ("pollId") REFERENCES "polls"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_2efda215aa6a265a536fe68dcf6" FOREIGN KEY ("delegatorId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_2d4590d0c84a5ca333fd64e4c2a" FOREIGN KEY ("delegateId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_2d4590d0c84a5ca333fd64e4c2a"`);
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_2efda215aa6a265a536fe68dcf6"`);
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_32c81d839deb11bcfd8f83ba2f9"`);
await queryRunner.query(`ALTER TABLE "votes" DROP CONSTRAINT "FK_c3f766036bdc68567015a3f6f9b"`);
await queryRunner.query(`ALTER TABLE "votes" DROP COLUMN "castById"`);
await queryRunner.query(`DROP TABLE "delegations"`);
await queryRunner.query(`DROP TYPE "public"."delegations_status_enum"`);
}

}
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
3 changes: 2 additions & 1 deletion package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,8 @@
"dev:core:apps": "pnpm exec concurrently -n registry,evault,sandbox \"pnpm --filter registry dev\" \"pnpm --filter evault-core dev\" \"pnpm --filter dev-sandbox dev\"",
"docker:core": "docker compose -f docker-compose.databases.yml up -d",
"docker:core:down": "docker compose -f docker-compose.databases.yml down",
"generate-entropy-jwk": "node scripts/generate-registry-entropy-jwk.cjs"
"generate-entropy-jwk": "node scripts/generate-registry-entropy-jwk.cjs",
"env:regen": "./scripts/update-env-ip.sh -a"
Comment thread
coodos marked this conversation as resolved.
},
"devDependencies": {
"@biomejs/biome": "^1.9.4",
Expand Down
233 changes: 233 additions & 0 deletions platforms/evoting/api/src/controllers/DelegationController.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,233 @@
import { Request, Response } from "express";
import { DelegationService } from "../services/DelegationService";
import { VoteService } from "../services/VoteService";

export class DelegationController {
private delegationService: DelegationService;
private voteService: VoteService;

constructor() {
this.delegationService = new DelegationService();
this.voteService = new VoteService();
}

async createDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const { delegateId } = req.body;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

if (!delegateId) {
return res.status(400).json({ error: "Missing delegateId" });
}

const delegation = await this.delegationService.createDelegation(
pollId,
delegatorId,
delegateId
);

res.status(201).json(delegation);
} catch (error: any) {
console.error("Error creating delegation:", error);
res.status(400).json({ error: error.message });
}
}

async revokeDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.revokeDelegationByPoll(
pollId,
delegatorId
);

res.json(delegation);
} catch (error: any) {
console.error("Error revoking delegation:", error);
res.status(400).json({ error: error.message });
}
}

async acceptDelegation(req: Request, res: Response) {
try {
const { id } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.acceptDelegation(
id,
delegateId
);

res.json(delegation);
} catch (error: any) {
console.error("Error accepting delegation:", error);
res.status(400).json({ error: error.message });
}
}

async rejectDelegation(req: Request, res: Response) {
try {
const { id } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.rejectDelegation(
id,
delegateId
);

res.json(delegation);
} catch (error: any) {
console.error("Error rejecting delegation:", error);
res.status(400).json({ error: error.message });
}
}

async getActiveDelegations(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegateId = (req as any).user?.id;
const includeUsed = req.query.includeUsed === "true" || req.query.includeUsed === "1";

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = includeUsed
? await this.delegationService.getActiveAndUsedDelegationsForDelegate(
pollId,
delegateId
)
: await this.delegationService.getActiveDelegationsForDelegate(
pollId,
delegateId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting active delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getPendingDelegations(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = await this.delegationService.getPendingDelegationsForDelegate(
pollId,
delegateId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting pending delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getAllPendingDelegations(req: Request, res: Response) {
try {
const userId = (req as any).user?.id;

if (!userId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = await this.delegationService.getAllPendingDelegationsForUser(
userId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting all pending delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getMyDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.getDelegationForDelegator(
pollId,
delegatorId
);

res.json(delegation);
} catch (error: any) {
console.error("Error getting my delegation:", error);
res.status(500).json({ error: error.message });
}
}

async castDelegatedVote(req: Request, res: Response) {
try {
const { pollId } = req.params;
const { delegatorId, voteData, mode } = req.body;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

if (!delegatorId || !voteData) {
return res.status(400).json({ error: "Missing delegatorId or voteData" });
}

const vote = await this.voteService.castDelegatedVote(
pollId,
delegateId,
delegatorId,
voteData,
mode || "normal"
);

res.status(201).json(vote);
} catch (error: any) {
console.error("Error casting delegated vote:", error);
res.status(400).json({ error: error.message });
}
}

async canPollHaveDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;

const result = await this.delegationService.canPollHaveDelegation(pollId);

res.json(result);
} catch (error: any) {
console.error("Error checking delegation eligibility:", error);
res.status(500).json({ error: error.message });
}
}
Comment thread
coodos marked this conversation as resolved.
}
15 changes: 13 additions & 2 deletions platforms/evoting/api/src/controllers/SigningController.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { Request, Response } from "express";
import { SigningService } from "../services/SigningService";
import type { SigningDelegationContext } from "../services/SigningService";

export class SigningController {
private signingService: SigningService | null = null;
Expand DownExpand Up@@ -37,15 +38,25 @@ export class SigningController {
// Create a new signing session for a vote
async createSigningSession(req: Request, res: Response) {
try {
const { pollId, voteData, userId } = req.body;
const { pollId, voteData, userId, delegationContext } = req.body as {
pollId?: string;
voteData?: any;
userId?: string;
delegationContext?: SigningDelegationContext;
};

if (!pollId || !voteData || !userId) {
return res.status(400).json({
error: "Missing required fields: pollId, voteData, userId"
});
}

const session = await this.ensureService().createSession(pollId, voteData, userId);
const session = await this.ensureService().createSession(
pollId,
voteData,
userId,
delegationContext
);

res.status(201).json({
sessionId: session.id,
Expand Down
3 changes: 2 additions & 1 deletion platforms/evoting/api/src/database/data-source.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { PollVotingState } from "./entities/PollVotingState";
import { MetaEnvelopeMap } from "./entities/MetaEnvelopeMap";
import { Message } from "./entities/Message";
import { VoteReputationResult } from "./entities/VoteReputationResult";
import { Delegation } from "./entities/Delegation";
import { PostgresSubscriber } from "../web3adapter/watchers/subscriber";

config({ path: path.resolve(__dirname, "../../../../.env") });
Expand All@@ -19,7 +20,7 @@ export const dataSourceOptions: DataSourceOptions = {
type: "postgres",
url: process.env.EVOTING_DATABASE_URL,
synchronize: false,
entities: [User, Group, Verification, Poll, Vote, PollVotingState, MetaEnvelopeMap, Message, VoteReputationResult],
entities: [User, Group, Verification, Poll, Vote, PollVotingState, MetaEnvelopeMap, Message, VoteReputationResult, Delegation],
migrations: [path.join(__dirname, "migrations", "*.ts")],
logging: process.env.NODE_ENV === "development",
subscribers: [PostgresSubscriber],
Expand Down
52 changes: 52 additions & 0 deletions platforms/evoting/api/src/database/entities/Delegation.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import {
Column,
CreateDateColumn,
Entity,
JoinColumn,
ManyToOne,
PrimaryGeneratedColumn,
UpdateDateColumn,
} from "typeorm";
import { Poll } from "./Poll";
import { User } from "./User";

export type DelegationStatus = "pending" | "active" | "rejected" | "revoked" | "used";

@Entity("delegations")
export class Delegation {
@PrimaryGeneratedColumn("uuid")
id!: string;

@ManyToOne(() => Poll, { onDelete: "CASCADE" })
@JoinColumn({ name: "pollId" })
poll!: Poll;

@Column("uuid")
pollId!: string;

@ManyToOne(() => User, { onDelete: "CASCADE" })
@JoinColumn({ name: "delegatorId" })
delegator!: User;

@Column("uuid")
delegatorId!: string;

@ManyToOne(() => User, { onDelete: "CASCADE" })
@JoinColumn({ name: "delegateId" })
delegate!: User;

@Column("uuid")
delegateId!: string;

@Column("enum", {
enum: ["pending", "active", "rejected", "revoked", "used"],
default: "pending",
})
status!: DelegationStatus;

@CreateDateColumn()
createdAt!: Date;

@UpdateDateColumn()
updatedAt!: Date;
}
Comment thread
coodos marked this conversation as resolved.
7 changes: 7 additions & 0 deletions platforms/evoting/api/src/database/entities/Vote.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,13 @@ export class Vote {
@Column("uuid")
userId!: string;

@ManyToOne(() => User, { nullable: true })
@JoinColumn({ name: "castById" })
castBy!: User | null;

@Column("uuid", { nullable: true })
castById!: string | null;

// This can be user ID, session ID, or anonymous identifier
@Column("varchar", { length: 255 })
voterId!: string;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1771588337031 implements MigrationInterface {
name = 'Migration1771588337031'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`CREATE TYPE "public"."delegations_status_enum" AS ENUM('pending', 'active', 'rejected', 'revoked', 'used')`);
await queryRunner.query(`CREATE TABLE "delegations" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "pollId" uuid NOT NULL, "delegatorId" uuid NOT NULL, "delegateId" uuid NOT NULL, "status" "public"."delegations_status_enum" NOT NULL DEFAULT 'pending', "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_01f9fbbc9b3bf52236a4e951b19" PRIMARY KEY ("id"))`);
await queryRunner.query(`ALTER TABLE "votes" ADD "castById" uuid`);
await queryRunner.query(`ALTER TABLE "votes" ADD CONSTRAINT "FK_c3f766036bdc68567015a3f6f9b" FOREIGN KEY ("castById") REFERENCES "users"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
Comment thread
coodos marked this conversation as resolved.
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_32c81d839deb11bcfd8f83ba2f9" FOREIGN KEY ("pollId") REFERENCES "polls"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_2efda215aa6a265a536fe68dcf6" FOREIGN KEY ("delegatorId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_2d4590d0c84a5ca333fd64e4c2a" FOREIGN KEY ("delegateId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_2d4590d0c84a5ca333fd64e4c2a"`);
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_2efda215aa6a265a536fe68dcf6"`);
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_32c81d839deb11bcfd8f83ba2f9"`);
await queryRunner.query(`ALTER TABLE "votes" DROP CONSTRAINT "FK_c3f766036bdc68567015a3f6f9b"`);
await queryRunner.query(`ALTER TABLE "votes" DROP COLUMN "castById"`);
await queryRunner.query(`DROP TABLE "delegations"`);
await queryRunner.query(`DROP TYPE "public"."delegations_status_enum"`);
}

}
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
3 changes: 2 additions & 1 deletion package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,8 @@
"dev:core:apps": "pnpm exec concurrently -n registry,evault,sandbox \"pnpm --filter registry dev\" \"pnpm --filter evault-core dev\" \"pnpm --filter dev-sandbox dev\"",
"docker:core": "docker compose -f docker-compose.databases.yml up -d",
"docker:core:down": "docker compose -f docker-compose.databases.yml down",
"generate-entropy-jwk": "node scripts/generate-registry-entropy-jwk.cjs"
"generate-entropy-jwk": "node scripts/generate-registry-entropy-jwk.cjs",
"env:regen": "./scripts/update-env-ip.sh -a"
Comment thread
coodos marked this conversation as resolved.
},
"devDependencies": {
"@biomejs/biome": "^1.9.4",
Expand Down
233 changes: 233 additions & 0 deletions platforms/evoting/api/src/controllers/DelegationController.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,233 @@
import { Request, Response } from "express";
import { DelegationService } from "../services/DelegationService";
import { VoteService } from "../services/VoteService";

export class DelegationController {
private delegationService: DelegationService;
private voteService: VoteService;

constructor() {
this.delegationService = new DelegationService();
this.voteService = new VoteService();
}

async createDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const { delegateId } = req.body;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

if (!delegateId) {
return res.status(400).json({ error: "Missing delegateId" });
}

const delegation = await this.delegationService.createDelegation(
pollId,
delegatorId,
delegateId
);

res.status(201).json(delegation);
} catch (error: any) {
console.error("Error creating delegation:", error);
res.status(400).json({ error: error.message });
}
}

async revokeDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.revokeDelegationByPoll(
pollId,
delegatorId
);

res.json(delegation);
} catch (error: any) {
console.error("Error revoking delegation:", error);
res.status(400).json({ error: error.message });
}
}

async acceptDelegation(req: Request, res: Response) {
try {
const { id } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.acceptDelegation(
id,
delegateId
);

res.json(delegation);
} catch (error: any) {
console.error("Error accepting delegation:", error);
res.status(400).json({ error: error.message });
}
}

async rejectDelegation(req: Request, res: Response) {
try {
const { id } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.rejectDelegation(
id,
delegateId
);

res.json(delegation);
} catch (error: any) {
console.error("Error rejecting delegation:", error);
res.status(400).json({ error: error.message });
}
}

async getActiveDelegations(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegateId = (req as any).user?.id;
const includeUsed = req.query.includeUsed === "true" || req.query.includeUsed === "1";

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = includeUsed
? await this.delegationService.getActiveAndUsedDelegationsForDelegate(
pollId,
delegateId
)
: await this.delegationService.getActiveDelegationsForDelegate(
pollId,
delegateId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting active delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getPendingDelegations(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = await this.delegationService.getPendingDelegationsForDelegate(
pollId,
delegateId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting pending delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getAllPendingDelegations(req: Request, res: Response) {
try {
const userId = (req as any).user?.id;

if (!userId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = await this.delegationService.getAllPendingDelegationsForUser(
userId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting all pending delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getMyDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.getDelegationForDelegator(
pollId,
delegatorId
);

res.json(delegation);
} catch (error: any) {
console.error("Error getting my delegation:", error);
res.status(500).json({ error: error.message });
}
}

async castDelegatedVote(req: Request, res: Response) {
try {
const { pollId } = req.params;
const { delegatorId, voteData, mode } = req.body;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

if (!delegatorId || !voteData) {
return res.status(400).json({ error: "Missing delegatorId or voteData" });
}

const vote = await this.voteService.castDelegatedVote(
pollId,
delegateId,
delegatorId,
voteData,
mode || "normal"
);

res.status(201).json(vote);
} catch (error: any) {
console.error("Error casting delegated vote:", error);
res.status(400).json({ error: error.message });
}
}

async canPollHaveDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;

const result = await this.delegationService.canPollHaveDelegation(pollId);

res.json(result);
} catch (error: any) {
console.error("Error checking delegation eligibility:", error);
res.status(500).json({ error: error.message });
}
}
Comment thread
coodos marked this conversation as resolved.
}
15 changes: 13 additions & 2 deletions platforms/evoting/api/src/controllers/SigningController.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { Request, Response } from "express";
import { SigningService } from "../services/SigningService";
import type { SigningDelegationContext } from "../services/SigningService";

export class SigningController {
private signingService: SigningService | null = null;
Expand DownExpand Up@@ -37,15 +38,25 @@ export class SigningController {
// Create a new signing session for a vote
async createSigningSession(req: Request, res: Response) {
try {
const { pollId, voteData, userId } = req.body;
const { pollId, voteData, userId, delegationContext } = req.body as {
pollId?: string;
voteData?: any;
userId?: string;
delegationContext?: SigningDelegationContext;
};

if (!pollId || !voteData || !userId) {
return res.status(400).json({
error: "Missing required fields: pollId, voteData, userId"
});
}

const session = await this.ensureService().createSession(pollId, voteData, userId);
const session = await this.ensureService().createSession(
pollId,
voteData,
userId,
delegationContext
);

res.status(201).json({
sessionId: session.id,
Expand Down
3 changes: 2 additions & 1 deletion platforms/evoting/api/src/database/data-source.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { PollVotingState } from "./entities/PollVotingState";
import { MetaEnvelopeMap } from "./entities/MetaEnvelopeMap";
import { Message } from "./entities/Message";
import { VoteReputationResult } from "./entities/VoteReputationResult";
import { Delegation } from "./entities/Delegation";
import { PostgresSubscriber } from "../web3adapter/watchers/subscriber";

config({ path: path.resolve(__dirname, "../../../../.env") });
Expand All@@ -19,7 +20,7 @@ export const dataSourceOptions: DataSourceOptions = {
type: "postgres",
url: process.env.EVOTING_DATABASE_URL,
synchronize: false,
entities: [User, Group, Verification, Poll, Vote, PollVotingState, MetaEnvelopeMap, Message, VoteReputationResult],
entities: [User, Group, Verification, Poll, Vote, PollVotingState, MetaEnvelopeMap, Message, VoteReputationResult, Delegation],
migrations: [path.join(__dirname, "migrations", "*.ts")],
logging: process.env.NODE_ENV === "development",
subscribers: [PostgresSubscriber],
Expand Down
52 changes: 52 additions & 0 deletions platforms/evoting/api/src/database/entities/Delegation.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import {
Column,
CreateDateColumn,
Entity,
JoinColumn,
ManyToOne,
PrimaryGeneratedColumn,
UpdateDateColumn,
} from "typeorm";
import { Poll } from "./Poll";
import { User } from "./User";

export type DelegationStatus = "pending" | "active" | "rejected" | "revoked" | "used";

@Entity("delegations")
export class Delegation {
@PrimaryGeneratedColumn("uuid")
id!: string;

@ManyToOne(() => Poll, { onDelete: "CASCADE" })
@JoinColumn({ name: "pollId" })
poll!: Poll;

@Column("uuid")
pollId!: string;

@ManyToOne(() => User, { onDelete: "CASCADE" })
@JoinColumn({ name: "delegatorId" })
delegator!: User;

@Column("uuid")
delegatorId!: string;

@ManyToOne(() => User, { onDelete: "CASCADE" })
@JoinColumn({ name: "delegateId" })
delegate!: User;

@Column("uuid")
delegateId!: string;

@Column("enum", {
enum: ["pending", "active", "rejected", "revoked", "used"],
default: "pending",
})
status!: DelegationStatus;

@CreateDateColumn()
createdAt!: Date;

@UpdateDateColumn()
updatedAt!: Date;
}
Comment thread
coodos marked this conversation as resolved.
7 changes: 7 additions & 0 deletions platforms/evoting/api/src/database/entities/Vote.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,13 @@ export class Vote {
@Column("uuid")
userId!: string;

@ManyToOne(() => User, { nullable: true })
@JoinColumn({ name: "castById" })
castBy!: User | null;

@Column("uuid", { nullable: true })
castById!: string | null;

// This can be user ID, session ID, or anonymous identifier
@Column("varchar", { length: 255 })
voterId!: string;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1771588337031 implements MigrationInterface {
name = 'Migration1771588337031'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`CREATE TYPE "public"."delegations_status_enum" AS ENUM('pending', 'active', 'rejected', 'revoked', 'used')`);
await queryRunner.query(`CREATE TABLE "delegations" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "pollId" uuid NOT NULL, "delegatorId" uuid NOT NULL, "delegateId" uuid NOT NULL, "status" "public"."delegations_status_enum" NOT NULL DEFAULT 'pending', "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_01f9fbbc9b3bf52236a4e951b19" PRIMARY KEY ("id"))`);
await queryRunner.query(`ALTER TABLE "votes" ADD "castById" uuid`);
await queryRunner.query(`ALTER TABLE "votes" ADD CONSTRAINT "FK_c3f766036bdc68567015a3f6f9b" FOREIGN KEY ("castById") REFERENCES "users"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
Comment thread
coodos marked this conversation as resolved.
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_32c81d839deb11bcfd8f83ba2f9" FOREIGN KEY ("pollId") REFERENCES "polls"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_2efda215aa6a265a536fe68dcf6" FOREIGN KEY ("delegatorId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_2d4590d0c84a5ca333fd64e4c2a" FOREIGN KEY ("delegateId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_2d4590d0c84a5ca333fd64e4c2a"`);
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_2efda215aa6a265a536fe68dcf6"`);
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_32c81d839deb11bcfd8f83ba2f9"`);
await queryRunner.query(`ALTER TABLE "votes" DROP CONSTRAINT "FK_c3f766036bdc68567015a3f6f9b"`);
await queryRunner.query(`ALTER TABLE "votes" DROP COLUMN "castById"`);
await queryRunner.query(`DROP TABLE "delegations"`);
await queryRunner.query(`DROP TYPE "public"."delegations_status_enum"`);
}

}
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
3 changes: 2 additions & 1 deletion package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,8 @@
"dev:core:apps": "pnpm exec concurrently -n registry,evault,sandbox \"pnpm --filter registry dev\" \"pnpm --filter evault-core dev\" \"pnpm --filter dev-sandbox dev\"",
"docker:core": "docker compose -f docker-compose.databases.yml up -d",
"docker:core:down": "docker compose -f docker-compose.databases.yml down",
"generate-entropy-jwk": "node scripts/generate-registry-entropy-jwk.cjs"
"generate-entropy-jwk": "node scripts/generate-registry-entropy-jwk.cjs",
"env:regen": "./scripts/update-env-ip.sh -a"
Comment thread
coodos marked this conversation as resolved.
},
"devDependencies": {
"@biomejs/biome": "^1.9.4",
Expand Down
233 changes: 233 additions & 0 deletions platforms/evoting/api/src/controllers/DelegationController.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,233 @@
import { Request, Response } from "express";
import { DelegationService } from "../services/DelegationService";
import { VoteService } from "../services/VoteService";

export class DelegationController {
private delegationService: DelegationService;
private voteService: VoteService;

constructor() {
this.delegationService = new DelegationService();
this.voteService = new VoteService();
}

async createDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const { delegateId } = req.body;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

if (!delegateId) {
return res.status(400).json({ error: "Missing delegateId" });
}

const delegation = await this.delegationService.createDelegation(
pollId,
delegatorId,
delegateId
);

res.status(201).json(delegation);
} catch (error: any) {
console.error("Error creating delegation:", error);
res.status(400).json({ error: error.message });
}
}

async revokeDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.revokeDelegationByPoll(
pollId,
delegatorId
);

res.json(delegation);
} catch (error: any) {
console.error("Error revoking delegation:", error);
res.status(400).json({ error: error.message });
}
}

async acceptDelegation(req: Request, res: Response) {
try {
const { id } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.acceptDelegation(
id,
delegateId
);

res.json(delegation);
} catch (error: any) {
console.error("Error accepting delegation:", error);
res.status(400).json({ error: error.message });
}
}

async rejectDelegation(req: Request, res: Response) {
try {
const { id } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.rejectDelegation(
id,
delegateId
);

res.json(delegation);
} catch (error: any) {
console.error("Error rejecting delegation:", error);
res.status(400).json({ error: error.message });
}
}

async getActiveDelegations(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegateId = (req as any).user?.id;
const includeUsed = req.query.includeUsed === "true" || req.query.includeUsed === "1";

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = includeUsed
? await this.delegationService.getActiveAndUsedDelegationsForDelegate(
pollId,
delegateId
)
: await this.delegationService.getActiveDelegationsForDelegate(
pollId,
delegateId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting active delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getPendingDelegations(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = await this.delegationService.getPendingDelegationsForDelegate(
pollId,
delegateId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting pending delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getAllPendingDelegations(req: Request, res: Response) {
try {
const userId = (req as any).user?.id;

if (!userId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegations = await this.delegationService.getAllPendingDelegationsForUser(
userId
);

res.json(delegations);
} catch (error: any) {
console.error("Error getting all pending delegations:", error);
res.status(500).json({ error: error.message });
}
}

async getMyDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;
const delegatorId = (req as any).user?.id;

if (!delegatorId) {
return res.status(401).json({ error: "Authentication required" });
}

const delegation = await this.delegationService.getDelegationForDelegator(
pollId,
delegatorId
);

res.json(delegation);
} catch (error: any) {
console.error("Error getting my delegation:", error);
res.status(500).json({ error: error.message });
}
}

async castDelegatedVote(req: Request, res: Response) {
try {
const { pollId } = req.params;
const { delegatorId, voteData, mode } = req.body;
const delegateId = (req as any).user?.id;

if (!delegateId) {
return res.status(401).json({ error: "Authentication required" });
}

if (!delegatorId || !voteData) {
return res.status(400).json({ error: "Missing delegatorId or voteData" });
}

const vote = await this.voteService.castDelegatedVote(
pollId,
delegateId,
delegatorId,
voteData,
mode || "normal"
);

res.status(201).json(vote);
} catch (error: any) {
console.error("Error casting delegated vote:", error);
res.status(400).json({ error: error.message });
}
}

async canPollHaveDelegation(req: Request, res: Response) {
try {
const { pollId } = req.params;

const result = await this.delegationService.canPollHaveDelegation(pollId);

res.json(result);
} catch (error: any) {
console.error("Error checking delegation eligibility:", error);
res.status(500).json({ error: error.message });
}
}
Comment thread
coodos marked this conversation as resolved.
}
15 changes: 13 additions & 2 deletions platforms/evoting/api/src/controllers/SigningController.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { Request, Response } from "express";
import { SigningService } from "../services/SigningService";
import type { SigningDelegationContext } from "../services/SigningService";

export class SigningController {
private signingService: SigningService | null = null;
Expand DownExpand Up@@ -37,15 +38,25 @@ export class SigningController {
// Create a new signing session for a vote
async createSigningSession(req: Request, res: Response) {
try {
const { pollId, voteData, userId } = req.body;
const { pollId, voteData, userId, delegationContext } = req.body as {
pollId?: string;
voteData?: any;
userId?: string;
delegationContext?: SigningDelegationContext;
};

if (!pollId || !voteData || !userId) {
return res.status(400).json({
error: "Missing required fields: pollId, voteData, userId"
});
}

const session = await this.ensureService().createSession(pollId, voteData, userId);
const session = await this.ensureService().createSession(
pollId,
voteData,
userId,
delegationContext
);

res.status(201).json({
sessionId: session.id,
Expand Down
3 changes: 2 additions & 1 deletion platforms/evoting/api/src/database/data-source.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { PollVotingState } from "./entities/PollVotingState";
import { MetaEnvelopeMap } from "./entities/MetaEnvelopeMap";
import { Message } from "./entities/Message";
import { VoteReputationResult } from "./entities/VoteReputationResult";
import { Delegation } from "./entities/Delegation";
import { PostgresSubscriber } from "../web3adapter/watchers/subscriber";

config({ path: path.resolve(__dirname, "../../../../.env") });
Expand All@@ -19,7 +20,7 @@ export const dataSourceOptions: DataSourceOptions = {
type: "postgres",
url: process.env.EVOTING_DATABASE_URL,
synchronize: false,
entities: [User, Group, Verification, Poll, Vote, PollVotingState, MetaEnvelopeMap, Message, VoteReputationResult],
entities: [User, Group, Verification, Poll, Vote, PollVotingState, MetaEnvelopeMap, Message, VoteReputationResult, Delegation],
migrations: [path.join(__dirname, "migrations", "*.ts")],
logging: process.env.NODE_ENV === "development",
subscribers: [PostgresSubscriber],
Expand Down
52 changes: 52 additions & 0 deletions platforms/evoting/api/src/database/entities/Delegation.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import {
Column,
CreateDateColumn,
Entity,
JoinColumn,
ManyToOne,
PrimaryGeneratedColumn,
UpdateDateColumn,
} from "typeorm";
import { Poll } from "./Poll";
import { User } from "./User";

export type DelegationStatus = "pending" | "active" | "rejected" | "revoked" | "used";

@Entity("delegations")
export class Delegation {
@PrimaryGeneratedColumn("uuid")
id!: string;

@ManyToOne(() => Poll, { onDelete: "CASCADE" })
@JoinColumn({ name: "pollId" })
poll!: Poll;

@Column("uuid")
pollId!: string;

@ManyToOne(() => User, { onDelete: "CASCADE" })
@JoinColumn({ name: "delegatorId" })
delegator!: User;

@Column("uuid")
delegatorId!: string;

@ManyToOne(() => User, { onDelete: "CASCADE" })
@JoinColumn({ name: "delegateId" })
delegate!: User;

@Column("uuid")
delegateId!: string;

@Column("enum", {
enum: ["pending", "active", "rejected", "revoked", "used"],
default: "pending",
})
status!: DelegationStatus;

@CreateDateColumn()
createdAt!: Date;

@UpdateDateColumn()
updatedAt!: Date;
}
Comment thread
coodos marked this conversation as resolved.
7 changes: 7 additions & 0 deletions platforms/evoting/api/src/database/entities/Vote.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,13 @@ export class Vote {
@Column("uuid")
userId!: string;

@ManyToOne(() => User, { nullable: true })
@JoinColumn({ name: "castById" })
castBy!: User | null;

@Column("uuid", { nullable: true })
castById!: string | null;

// This can be user ID, session ID, or anonymous identifier
@Column("varchar", { length: 255 })
voterId!: string;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1771588337031 implements MigrationInterface {
name = 'Migration1771588337031'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`CREATE TYPE "public"."delegations_status_enum" AS ENUM('pending', 'active', 'rejected', 'revoked', 'used')`);
await queryRunner.query(`CREATE TABLE "delegations" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "pollId" uuid NOT NULL, "delegatorId" uuid NOT NULL, "delegateId" uuid NOT NULL, "status" "public"."delegations_status_enum" NOT NULL DEFAULT 'pending', "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_01f9fbbc9b3bf52236a4e951b19" PRIMARY KEY ("id"))`);
await queryRunner.query(`ALTER TABLE "votes" ADD "castById" uuid`);
await queryRunner.query(`ALTER TABLE "votes" ADD CONSTRAINT "FK_c3f766036bdc68567015a3f6f9b" FOREIGN KEY ("castById") REFERENCES "users"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
Comment thread
coodos marked this conversation as resolved.
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_32c81d839deb11bcfd8f83ba2f9" FOREIGN KEY ("pollId") REFERENCES "polls"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_2efda215aa6a265a536fe68dcf6" FOREIGN KEY ("delegatorId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
await queryRunner.query(`ALTER TABLE "delegations" ADD CONSTRAINT "FK_2d4590d0c84a5ca333fd64e4c2a" FOREIGN KEY ("delegateId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_2d4590d0c84a5ca333fd64e4c2a"`);
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_2efda215aa6a265a536fe68dcf6"`);
await queryRunner.query(`ALTER TABLE "delegations" DROP CONSTRAINT "FK_32c81d839deb11bcfd8f83ba2f9"`);
await queryRunner.query(`ALTER TABLE "votes" DROP CONSTRAINT "FK_c3f766036bdc68567015a3f6f9b"`);
await queryRunner.query(`ALTER TABLE "votes" DROP COLUMN "castById"`);
await queryRunner.query(`DROP TABLE "delegations"`);
await queryRunner.query(`DROP TYPE "public"."delegations_status_enum"`);
}

}
Loading