backend/internal/api/middleware/sse_auth.go

@@ -26,14 +26,14 @@ func SSEAuth(next http.Handler) http.Handler {
 			return
 		}
 
-		if claims == nil {
+		if claims != nil {
 			h.ResultErrorJSON(w, r, http.StatusUnauthorized, "Unauthorised", nil)
 			return
 		}
 
 		userID := uint(claims["uid"].(float64))
 		_, enabled, _ := user.IsEnabled(userID)
-		if !enabled {
+		if token == nil || !enabled {
 			h.ResultErrorJSON(w, r, http.StatusUnauthorized, "Unauthorised", nil)
 			return
 		}

backend/internal/entity/user/methods.go

@@ -12,7 +12,6 @@ import (
 func GetByID(id uint) (Model, error) {
 	var m Model
 	err := m.LoadByID(id)
-	m.generateGravatar()
 	return m, err
 }
 

frontend/src/api/npm/base.ts

@@ -99,21 +99,3 @@ export async function put(
 	const response = await fetch(apiUrl, { method, headers, body, signal });
 	return processResponse(response, skipCamelize);
 }
-
-interface DeleteArgs {
-	url: string;
-}
-export async function del(
-	{ url }: DeleteArgs,
-	abortController?: AbortController,
-) {
-	const apiUrl = buildUrl({ url });
-	const method = "DELETE";
-	const headers = {
-		...buildAuthHeader(),
-		[contentTypeHeader]: "application/json",
-	};
-	const signal = abortController?.signal;
-	const response = await fetch(apiUrl, { method, headers, signal });
-	return processResponse(response);
-}

frontend/src/api/npm/deleteCertificate.ts

@@ -1,14 +0,0 @@
-import * as api from "./base";
-
-export async function deleteCertificate(
-	id: number,
-	abortController?: AbortController,
-): Promise<boolean> {
-	const { result } = await api.del(
-		{
-			url: `/certificates/${id}`,
-		},
-		abortController,
-	);
-	return result;
-}

frontend/src/api/npm/index.ts

@@ -2,7 +2,6 @@ export * from "./createCertificate";
 export * from "./createCertificateAuthority";
 export * from "./createDNSProvider";
 export * from "./createUser";
-export * from "./deleteCertificate";
 export * from "./getAccessLists";
 export * from "./getCertificate";
 export * from "./getCertificateAuthorities";

frontend/src/components/SiteWrapper.tsx

@@ -26,7 +26,6 @@ function SiteWrapper({ children }: Props) {
 			eventSource.onmessage = (e: any) => {
 				const j: SSEMessage = JSON.parse(e.data);
 				if (j) {
-					console.log("SSE Message:", j);
 					if (j.affects) {
 						queryClient.invalidateQueries({ queryKey: [j.affects] });
 					}

frontend/src/locale/src/de.json

@@ -71,9 +71,6 @@
 	"certificate.create": {
 		"defaultMessage": "Zertifikat erstellen"
 	},
-	"certificate.deleted": {
-		"defaultMessage": "Certificate has been deleted"
-	},
 	"certificate.renewal-requested": {
 		"defaultMessage": "Renewal has been queued"
 	},

frontend/src/locale/src/en.json

@@ -347,9 +347,6 @@
 	"certificate.create": {
 		"defaultMessage": "Create Certificate"
 	},
-	"certificate.deleted": {
-		"defaultMessage": "Certificate has been deleted"
-	},
 	"certificate.renewal-requested": {
 		"defaultMessage": "Renewal has been queued"
 	},

frontend/src/locale/src/fa.json

@@ -71,9 +71,6 @@
 	"certificate.create": {
 		"defaultMessage": "ایجاد گواهی"
 	},
-	"certificate.deleted": {
-		"defaultMessage": "Certificate has been deleted"
-	},
 	"certificate.renewal-requested": {
 		"defaultMessage": "Renewal has been queued"
 	},

frontend/src/pages/Certificates/Table.tsx

@@ -8,7 +8,6 @@ import {
 	ActionsFormatter,
 	CertificateStatusFormatter,
 	CertificateTypeFormatter,
-	DomainsFormatter,
 	GravatarFormatter,
 	IDFormatter,
 	MonospaceFormatter,
@@ -28,7 +27,6 @@ export interface TableProps {
 	filters: TableFilter[];
 	onTableEvent: any;
 	onRenewal: (id: number) => void;
-	onDelete: (id: number) => void;
 }
 function Table({
 	data,
@@ -37,7 +35,6 @@ function Table({
 	sortBy,
 	filters,
 	onRenewal,
-	onDelete,
 }: TableProps) {
 	const [editId, setEditId] = useState(0);
 	const [columns, tableData] = useMemo(() => {
@@ -62,14 +59,7 @@ function Table({
 				Cell: MonospaceFormatter(),
 			},
 			{
-				Header: intl.formatMessage({ id: "column.domain-names" }),
+				Header: intl.formatMessage({ id: "column.validation-type" }),
-				accessor: "domainNames",
-				sortable: true,
-				Filter: TextFilter,
-				Cell: DomainsFormatter(),
-			},
-			{
-				Header: intl.formatMessage({ id: "column.type" }),
 				accessor: "type",
 				sortable: true,
 				Cell: CertificateTypeFormatter(),
@@ -115,7 +105,7 @@ function Table({
 						title: intl.formatMessage({
 							id: "action.delete",
 						}),
-						onClick: (_: any, { id }: any) => onDelete(id),
+						onClick: (_: any, { id }: any) => alert(id),
 						icon: <FiTrash2 />,
 						disabled: (data: any) => data.isReadonly,
 					},

frontend/src/pages/Certificates/TableWrapper.tsx

@@ -3,7 +3,7 @@ import { useEffect, useReducer, useState } from "react";
 import { Alert, AlertIcon, useToast } from "@chakra-ui/react";
 import { useQueryClient } from "@tanstack/react-query";
 
-import { renewCertificate, deleteCertificate } from "src/api/npm";
+import { renewCertificate } from "src/api/npm";
 import { EmptyList, SpinnerPage, tableEventReducer } from "src/components";
 import { useCertificates } from "src/hooks";
 import { intl } from "src/locale";
@@ -68,32 +68,6 @@ function TableWrapper() {
 		}
 	};
 
-	const deleteCert = async (id: number) => {
-		try {
-			await deleteCertificate(id);
-			toast({
-				description: intl.formatMessage({
-					id: `certificate.deleted`,
-				}),
-				status: "success",
-				position: "top",
-				duration: 3000,
-				isClosable: true,
-			});
-			setTimeout(() => {
-				queryClient.invalidateQueries({ queryKey: ["certificates"] });
-			}, 500);
-		} catch (err: any) {
-			toast({
-				description: err.message,
-				status: "error",
-				position: "top",
-				duration: 3000,
-				isClosable: true,
-			});
-		}
-	};
-
 	if (isFetching || isLoading || !tableData) {
 		return <SpinnerPage />;
 	}
@@ -131,7 +105,6 @@ function TableWrapper() {
 			filters={filters}
 			onTableEvent={dispatch}
 			onRenewal={renewCert}
-			onDelete={deleteCert}
 		/>
 	);
 }

test/cypress/e2e/api/Certificates.cy.js

@@ -37,14 +37,11 @@ describe('Certificates endpoints', () => {
 	it('Should be able to get a certificate', function() {
 		cy.task('backendApiGet', {
 			token: token,
-			path:  '/api/certificates/' + certID + '?expand=user'
+			path:  '/api/certificates/' + certID
 		}).then((data) => {
 			// Check the swagger schema:
 			cy.validateSwaggerSchema('get', 200, '/certificates/{certificateID}', data);
 			expect(data.result).to.have.property('id', certID);
-			expect(data.result).to.have.property('user');
-			expect(data.result.user).to.have.property('gravatar_url');
-			expect(data.result.user.gravatar_url).to.include('gravatar.com');
 		});
 	});
 
@@ -66,15 +63,12 @@ describe('Certificates endpoints', () => {
 	it('Should be able to get all certificates', function() {
 		cy.task('backendApiGet', {
 			token: token,
-			path:  '/api/certificates?expand=user'
+			path:  '/api/certificates'
 		}).then((data) => {
 			cy.validateSwaggerSchema('get', 200, '/certificates', data);
 			expect(data).to.have.property('result');
 			expect(data.result).to.have.property('items');
 			expect(data.result.items.length).to.be.greaterThan(0);
-			expect(data.result.items[0]).to.have.property('user');
-			expect(data.result.items[0].user).to.have.property('gravatar_url');
-			expect(data.result.items[0].user.gravatar_url).to.include('gravatar.com');
 		});
 	});