mirror of
https://github.com/h44z/wg-portal.git
synced 2026-04-09 08:56:20 +00:00
Compare commits
6 Commits
fix/confir
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
401642701a | ||
|
72f9123592 | ||
|
|
0e9e9d697f | ||
|
|
87bfd5b23a | ||
|
|
920806b231 | ||
|
ec08e31eb7 |
8
Makefile
8
Makefile
@@ -1,7 +1,8 @@
|
|||||||
# Go parameters
|
# Go parameters
|
||||||
GOCMD=go
|
GOCMD=go
|
||||||
|
GOVERSION=1.25
|
||||||
MODULENAME=github.com/h44z/wg-portal
|
MODULENAME=github.com/h44z/wg-portal
|
||||||
GOFILES:=$(shell go list ./... | grep -v /vendor/)
|
GOFILES=$(shell go list ./... | grep -v /vendor/)
|
||||||
BUILDDIR=dist
|
BUILDDIR=dist
|
||||||
BINARIES=$(subst cmd/,,$(wildcard cmd/*))
|
BINARIES=$(subst cmd/,,$(wildcard cmd/*))
|
||||||
IMAGE=h44z/wg-portal
|
IMAGE=h44z/wg-portal
|
||||||
@@ -51,6 +52,11 @@ format:
|
|||||||
.PHONY: test
|
.PHONY: test
|
||||||
test: test-vet test-race
|
test: test-vet test-race
|
||||||
|
|
||||||
|
#> test-in-docker: Run tests in Docker (for non-Linux environments e.g. MacOS)
|
||||||
|
.PHONY: test-in-docker
|
||||||
|
test-in-docker:
|
||||||
|
docker run --rm -u $(shell id -u):$(shell id -g) -e HOME=/tmp -v $(PWD):/app -w /app golang:$(GOVERSION) make test
|
||||||
|
|
||||||
#< test-vet: Static code analysis
|
#< test-vet: Static code analysis
|
||||||
.PHONY: test-vet
|
.PHONY: test-vet
|
||||||
test-vet: build-dependencies
|
test-vet: build-dependencies
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
let WGPORTAL_SITE_TITLE="WireGuard Portal";
|
let WGPORTAL_SITE_TITLE="WireGuard Portal";
|
||||||
let WGPORTAL_SITE_COMPANY_NAME="WireGuard Portal";
|
let WGPORTAL_SITE_COMPANY_NAME="WireGuard Portal";
|
||||||
</script>
|
</script>
|
||||||
<script src="/api/v0/config/frontend.js"></script>
|
<script src="/api/v0/config/frontend.js" vite-ignore></script>
|
||||||
</head>
|
</head>
|
||||||
<body class="d-flex flex-column min-vh-100">
|
<body class="d-flex flex-column min-vh-100">
|
||||||
<noscript>
|
<noscript>
|
||||||
|
|||||||
2459
frontend/package-lock.json
generated
2459
frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -9,28 +9,28 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@fontsource/nunito-sans": "^5.2.7",
|
"@fontsource/nunito-sans": "^5.2.7",
|
||||||
"@fortawesome/fontawesome-free": "^7.1.0",
|
"@fortawesome/fontawesome-free": "^7.2.0",
|
||||||
"@kyvg/vue3-notification": "^3.4.2",
|
"@kyvg/vue3-notification": "^3.4.2",
|
||||||
"@popperjs/core": "^2.11.8",
|
"@popperjs/core": "^2.11.8",
|
||||||
"@simplewebauthn/browser": "^13.2.2",
|
"@simplewebauthn/browser": "^13.3.0",
|
||||||
"@vojtechlanka/vue-tags-input": "^3.1.1",
|
"@vojtechlanka/vue-tags-input": "^3.1.2",
|
||||||
"bootstrap": "^5.3.8",
|
"bootstrap": "^5.3.8",
|
||||||
"bootswatch": "^5.3.8",
|
"bootswatch": "^5.3.8",
|
||||||
"cidr-tools": "^11.0.3",
|
"cidr-tools": "^11.3.2",
|
||||||
"flag-icons": "^7.5.0",
|
"flag-icons": "^7.5.0",
|
||||||
"ip-address": "^10.1.0",
|
"ip-address": "^10.1.0",
|
||||||
"is-cidr": "^6.0.1",
|
"is-cidr": "^6.0.3",
|
||||||
"is-ip": "^5.0.1",
|
"is-ip": "^5.0.1",
|
||||||
"pinia": "^3.0.4",
|
"pinia": "^3.0.4",
|
||||||
"prismjs": "^1.30.0",
|
"prismjs": "^1.30.0",
|
||||||
"vue": "^3.5.25",
|
"vue": "^3.5.31",
|
||||||
"vue-i18n": "^11.2.2",
|
"vue-i18n": "^11.3.0",
|
||||||
"vue-prism-component": "github:h44z/vue-prism-component",
|
"vue-prism-component": "github:h44z/vue-prism-component",
|
||||||
"vue-router": "^4.6.3"
|
"vue-router": "^5.0.4"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@vitejs/plugin-vue": "^6.0.2",
|
"@vitejs/plugin-vue": "^6.0.5",
|
||||||
"sass-embedded": "^1.93.3",
|
"sass-embedded": "^1.98.0",
|
||||||
"vite": "^7.2.7"
|
"vite": "^8.0.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -315,6 +315,7 @@ async function applyPeerDefaults() {
|
|||||||
|
|
||||||
async function del() {
|
async function del() {
|
||||||
if (isDeleting.value) return
|
if (isDeleting.value) return
|
||||||
|
if (!confirm(t('modals.interface-edit.confirm-delete', {id: selectedInterface.value.Identifier}))) return
|
||||||
isDeleting.value = true
|
isDeleting.value = true
|
||||||
try {
|
try {
|
||||||
await interfaces.DeleteInterface(selectedInterface.value.Identifier)
|
await interfaces.DeleteInterface(selectedInterface.value.Identifier)
|
||||||
|
|||||||
@@ -26,13 +26,13 @@
|
|||||||
display:block;
|
display:block;
|
||||||
}
|
}
|
||||||
.modal.show {
|
.modal.show {
|
||||||
opacity: 1;
|
opacity: 1.0;
|
||||||
}
|
}
|
||||||
.modal-backdrop {
|
.modal-backdrop {
|
||||||
background-color: rgba(0,0,0,0.6) !important;
|
background-color: rgba(0,0,0,0.6) !important;
|
||||||
}
|
}
|
||||||
.modal-backdrop.show {
|
.modal-backdrop.show {
|
||||||
opacity: 1 !important;
|
opacity: 1.0 !important;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|||||||
121
frontend/src/components/Pagination.vue
Normal file
121
frontend/src/components/Pagination.vue
Normal file
@@ -0,0 +1,121 @@
|
|||||||
|
<script setup>
|
||||||
|
import { computed } from 'vue';
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
currentPage: {
|
||||||
|
type: Number,
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
totalCount: {
|
||||||
|
type: Number,
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
pageSize: {
|
||||||
|
type: Number,
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
onGotoPage: {
|
||||||
|
type: Function,
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
onNextPage: {
|
||||||
|
type: Function,
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
onPrevPage: {
|
||||||
|
type: Function,
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
hasNextPage: {
|
||||||
|
type: Boolean,
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
hasPrevPage: {
|
||||||
|
type: Boolean,
|
||||||
|
required: true
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const totalPages = computed(() => Math.ceil(props.totalCount / props.pageSize));
|
||||||
|
|
||||||
|
const pages = computed(() => {
|
||||||
|
const current = props.currentPage;
|
||||||
|
const last = totalPages.value;
|
||||||
|
const delta = 2; // Number of pages to show before and after current page
|
||||||
|
|
||||||
|
const range = [];
|
||||||
|
const rangeWithDots = [];
|
||||||
|
|
||||||
|
// If total pages is small, just show all pages
|
||||||
|
if (last <= 7) {
|
||||||
|
for (let i = 1; i <= last; i++) {
|
||||||
|
rangeWithDots.push({ type: 'page', value: i });
|
||||||
|
}
|
||||||
|
return rangeWithDots;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calculate the range around the current page
|
||||||
|
let start = Math.max(2, current - delta);
|
||||||
|
let end = Math.min(last - 1, current + delta);
|
||||||
|
|
||||||
|
// Adjust range to always show a consistent number of pages if possible
|
||||||
|
if (current <= delta + 2) {
|
||||||
|
end = 2 + delta * 2;
|
||||||
|
} else if (current >= last - delta - 1) {
|
||||||
|
start = last - delta * 2 - 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add dots before the range if needed
|
||||||
|
if (start > 2) {
|
||||||
|
rangeWithDots.push({ type: 'page', value: 1 });
|
||||||
|
rangeWithDots.push({ type: 'dots', value: 'dots-start' });
|
||||||
|
} else {
|
||||||
|
for (let i = 1; i < start; i++) {
|
||||||
|
rangeWithDots.push({ type: 'page', value: i });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add the central range
|
||||||
|
for (let i = start; i <= end; i++) {
|
||||||
|
rangeWithDots.push({ type: 'page', value: i });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add dots after the range if needed
|
||||||
|
if (end < last - 1) {
|
||||||
|
rangeWithDots.push({ type: 'dots', value: 'dots-end' });
|
||||||
|
rangeWithDots.push({ type: 'page', value: last });
|
||||||
|
} else {
|
||||||
|
for (let i = end + 1; i <= last; i++) {
|
||||||
|
rangeWithDots.push({ type: 'page', value: i });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return rangeWithDots;
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<ul class="pagination pagination-sm mb-0" v-if="totalPages > 1">
|
||||||
|
<li :class="{ disabled: !hasPrevPage }" class="page-item">
|
||||||
|
<a class="page-link" href="#" @click.prevent="hasPrevPage && onPrevPage()">«</a>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li v-for="item in pages" :key="item.type === 'page' ? item.value : item.value" :class="{ active: currentPage === item.value, disabled: item.type === 'dots' }" class="page-item">
|
||||||
|
<a v-if="item.type === 'page'" class="page-link" href="#" @click.prevent="onGotoPage(item.value)">{{ item.value }}</a>
|
||||||
|
<span v-else class="page-link">...</span>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li :class="{ disabled: !hasNextPage }" class="page-item">
|
||||||
|
<a class="page-link" href="#" @click.prevent="hasNextPage && onNextPage()">»</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.page-link {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
.page-item.disabled .page-link {
|
||||||
|
cursor: default;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -294,6 +294,7 @@ async function save() {
|
|||||||
|
|
||||||
async function del() {
|
async function del() {
|
||||||
if (isDeleting.value) return
|
if (isDeleting.value) return
|
||||||
|
if (!confirm(t('modals.peer-edit.confirm-delete', {id: selectedPeer.value.Identifier}))) return
|
||||||
isDeleting.value = true
|
isDeleting.value = true
|
||||||
try {
|
try {
|
||||||
await peers.DeletePeer(selectedPeer.value.Identifier)
|
await peers.DeletePeer(selectedPeer.value.Identifier)
|
||||||
|
|||||||
@@ -114,6 +114,7 @@ async function save() {
|
|||||||
|
|
||||||
async function del() {
|
async function del() {
|
||||||
if (isDeleting.value) return
|
if (isDeleting.value) return
|
||||||
|
if (!confirm(t('modals.user-edit.confirm-delete', {id: selectedUser.value.Identifier}))) return
|
||||||
isDeleting.value = true
|
isDeleting.value = true
|
||||||
try {
|
try {
|
||||||
await users.DeleteUser(selectedUser.value.Identifier)
|
await users.DeleteUser(selectedUser.value.Identifier)
|
||||||
|
|||||||
@@ -382,7 +382,8 @@
|
|||||||
"persist-local-changes": {
|
"persist-local-changes": {
|
||||||
"label": "Lokale Änderungen speichern"
|
"label": "Lokale Änderungen speichern"
|
||||||
},
|
},
|
||||||
"sync-warning": "Um diesen synchronisierten Benutzer zu bearbeiten, aktivieren Sie die lokale Änderungsspeicherung. Andernfalls werden Ihre Änderungen bei der nächsten Synchronisierung überschrieben."
|
"sync-warning": "Um diesen synchronisierten Benutzer zu bearbeiten, aktivieren Sie die lokale Änderungsspeicherung. Andernfalls werden Ihre Änderungen bei der nächsten Synchronisierung überschrieben.",
|
||||||
|
"confirm-delete": "Benutzer '{id}' wirklich löschen?"
|
||||||
},
|
},
|
||||||
"interface-view": {
|
"interface-view": {
|
||||||
"headline": "Konfiguration für Schnittstelle:"
|
"headline": "Konfiguration für Schnittstelle:"
|
||||||
@@ -503,7 +504,8 @@
|
|||||||
"placeholder": "Persistentes Keepalive (0 = Standard)"
|
"placeholder": "Persistentes Keepalive (0 = Standard)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"button-apply-defaults": "Peer-Standardeinstellungen anwenden"
|
"button-apply-defaults": "Peer-Standardeinstellungen anwenden",
|
||||||
|
"confirm-delete": "Interface '{id}' wirklich löschen?"
|
||||||
},
|
},
|
||||||
"peer-view": {
|
"peer-view": {
|
||||||
"headline-peer": "Peer:",
|
"headline-peer": "Peer:",
|
||||||
@@ -625,7 +627,8 @@
|
|||||||
},
|
},
|
||||||
"expires-at": {
|
"expires-at": {
|
||||||
"label": "Ablaufdatum"
|
"label": "Ablaufdatum"
|
||||||
}
|
},
|
||||||
|
"confirm-delete": "Peer '{id}' wirklich löschen?"
|
||||||
},
|
},
|
||||||
"peer-multi-create": {
|
"peer-multi-create": {
|
||||||
"headline-peer": "Mehrere Peers erstellen",
|
"headline-peer": "Mehrere Peers erstellen",
|
||||||
|
|||||||
@@ -382,7 +382,8 @@
|
|||||||
"persist-local-changes": {
|
"persist-local-changes": {
|
||||||
"label": "Persist local changes"
|
"label": "Persist local changes"
|
||||||
},
|
},
|
||||||
"sync-warning": "To modify this synchronized user, enable local change persistence. Otherwise, your changes will be overwritten during the next synchronization."
|
"sync-warning": "To modify this synchronized user, enable local change persistence. Otherwise, your changes will be overwritten during the next synchronization.",
|
||||||
|
"confirm-delete": "Are you sure you want to delete user '{id}'?"
|
||||||
},
|
},
|
||||||
"interface-view": {
|
"interface-view": {
|
||||||
"headline": "Config for Interface:"
|
"headline": "Config for Interface:"
|
||||||
@@ -503,8 +504,8 @@
|
|||||||
"placeholder": "Persistent Keepalive (0 = default)"
|
"placeholder": "Persistent Keepalive (0 = default)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"button-apply-defaults": "Apply Peer Defaults",
|
||||||
"button-apply-defaults": "Apply Peer Defaults"
|
"confirm-delete": "Are you sure you want to delete interface '{id}'?"
|
||||||
},
|
},
|
||||||
"peer-view": {
|
"peer-view": {
|
||||||
"headline-peer": "Peer:",
|
"headline-peer": "Peer:",
|
||||||
@@ -626,7 +627,8 @@
|
|||||||
},
|
},
|
||||||
"expires-at": {
|
"expires-at": {
|
||||||
"label": "Expiry date"
|
"label": "Expiry date"
|
||||||
}
|
},
|
||||||
|
"confirm-delete": "Are you sure you want to delete peer '{id}'?"
|
||||||
},
|
},
|
||||||
"peer-multi-create": {
|
"peer-multi-create": {
|
||||||
"headline-peer": "Create multiple peers",
|
"headline-peer": "Create multiple peers",
|
||||||
|
|||||||
@@ -365,7 +365,8 @@
|
|||||||
},
|
},
|
||||||
"admin": {
|
"admin": {
|
||||||
"label": "Es administrador"
|
"label": "Es administrador"
|
||||||
}
|
},
|
||||||
|
"confirm-delete": "Seguro que desea eliminar el usuario '{id}'?"
|
||||||
},
|
},
|
||||||
"interface-view": {
|
"interface-view": {
|
||||||
"headline": "Configuración de la interfaz:"
|
"headline": "Configuración de la interfaz:"
|
||||||
@@ -493,7 +494,8 @@
|
|||||||
"placeholder": "Keepalive Persistente (0 = por defecto)"
|
"placeholder": "Keepalive Persistente (0 = por defecto)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"button-apply-defaults": "Aplicar Valores Predeterminados de peers"
|
"button-apply-defaults": "Aplicar Valores Predeterminados de peers",
|
||||||
|
"confirm-delete": "Seguro que desea eliminar la interfaz '{id}'?"
|
||||||
},
|
},
|
||||||
"peer-view": {
|
"peer-view": {
|
||||||
"headline-peer": "Peer:",
|
"headline-peer": "Peer:",
|
||||||
@@ -613,7 +615,8 @@
|
|||||||
},
|
},
|
||||||
"expires-at": {
|
"expires-at": {
|
||||||
"label": "Fecha de expiración"
|
"label": "Fecha de expiración"
|
||||||
}
|
},
|
||||||
|
"confirm-delete": "Seguro que desea eliminar el par '{id}'?"
|
||||||
},
|
},
|
||||||
"peer-multi-create": {
|
"peer-multi-create": {
|
||||||
"headline-peer": "Crear múltiples peers",
|
"headline-peer": "Crear múltiples peers",
|
||||||
|
|||||||
@@ -126,9 +126,7 @@
|
|||||||
"peer-expiring": "Le pair expire le",
|
"peer-expiring": "Le pair expire le",
|
||||||
"peer-connected": "Connecté",
|
"peer-connected": "Connecté",
|
||||||
"peer-not-connected": "Non connecté",
|
"peer-not-connected": "Non connecté",
|
||||||
"peer-handshake": "Dernière négociation :",
|
"peer-handshake": "Dernière négociation :"
|
||||||
"button-show-peer": "Afficher le pair",
|
|
||||||
"button-edit-peer": "Modifier le pair"
|
|
||||||
},
|
},
|
||||||
"users": {
|
"users": {
|
||||||
"headline": "Administration des utilisateurs",
|
"headline": "Administration des utilisateurs",
|
||||||
@@ -264,7 +262,8 @@
|
|||||||
},
|
},
|
||||||
"admin": {
|
"admin": {
|
||||||
"label": "Est Admin"
|
"label": "Est Admin"
|
||||||
}
|
},
|
||||||
|
"confirm-delete": "Voulez-vous vraiment supprimer l'utilisateur \"{id}\" ?"
|
||||||
},
|
},
|
||||||
"interface-view": {
|
"interface-view": {
|
||||||
"headline": "Configuration pour l'interface :"
|
"headline": "Configuration pour l'interface :"
|
||||||
@@ -377,7 +376,8 @@
|
|||||||
"placeholder": "Persistent Keepalive (0 = par défaut)"
|
"placeholder": "Persistent Keepalive (0 = par défaut)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"button-apply-defaults": "Appliquer les valeurs par défaut des pairs"
|
"button-apply-defaults": "Appliquer les valeurs par défaut des pairs",
|
||||||
|
"confirm-delete": "Voulez-vous vraiment supprimer l'interface \"{id}\" ?"
|
||||||
},
|
},
|
||||||
"peer-view": {
|
"peer-view": {
|
||||||
"headline-peer": "Pair :",
|
"headline-peer": "Pair :",
|
||||||
@@ -493,7 +493,8 @@
|
|||||||
},
|
},
|
||||||
"expires-at": {
|
"expires-at": {
|
||||||
"label": "Date d'expiration"
|
"label": "Date d'expiration"
|
||||||
}
|
},
|
||||||
|
"confirm-delete": "Voulez-vous vraiment supprimer le pair \"{id}\" ?"
|
||||||
},
|
},
|
||||||
"peer-multi-create": {
|
"peer-multi-create": {
|
||||||
"headline-peer": "Créer plusieurs pairs",
|
"headline-peer": "Créer plusieurs pairs",
|
||||||
|
|||||||
@@ -282,6 +282,7 @@
|
|||||||
"label": "관리자 여부"
|
"label": "관리자 여부"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"confirm-delete": "사용자 '{id}'를 삭제하시겠습니까?",
|
||||||
"interface-view": {
|
"interface-view": {
|
||||||
"headline": "인터페이스 구성:"
|
"headline": "인터페이스 구성:"
|
||||||
},
|
},
|
||||||
@@ -393,7 +394,8 @@
|
|||||||
"placeholder": "영구 Keepalive (0 = 기본값)"
|
"placeholder": "영구 Keepalive (0 = 기본값)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"button-apply-defaults": "피어 기본값 적용"
|
"button-apply-defaults": "피어 기본값 적용",
|
||||||
|
"confirm-delete": "인터페이스 '{id}'를 삭제하시겠습니까?"
|
||||||
},
|
},
|
||||||
"peer-view": {
|
"peer-view": {
|
||||||
"headline-peer": "피어:",
|
"headline-peer": "피어:",
|
||||||
@@ -509,7 +511,8 @@
|
|||||||
},
|
},
|
||||||
"expires-at": {
|
"expires-at": {
|
||||||
"label": "만료 날짜"
|
"label": "만료 날짜"
|
||||||
}
|
},
|
||||||
|
"confirm-delete": "피어 '{id}'를 삭제하시겠습니까?"
|
||||||
},
|
},
|
||||||
"peer-multi-create": {
|
"peer-multi-create": {
|
||||||
"headline-peer": "여러 피어 생성",
|
"headline-peer": "여러 피어 생성",
|
||||||
|
|||||||
@@ -300,7 +300,8 @@
|
|||||||
},
|
},
|
||||||
"admin": {
|
"admin": {
|
||||||
"label": "É Administrador"
|
"label": "É Administrador"
|
||||||
}
|
},
|
||||||
|
"confirm-delete": "Tem certeza que deseja excluir o utilizador '{id}'?"
|
||||||
},
|
},
|
||||||
"interface-view": {
|
"interface-view": {
|
||||||
"headline": "Configuração para a Interface:"
|
"headline": "Configuração para a Interface:"
|
||||||
@@ -413,7 +414,8 @@
|
|||||||
"placeholder": "Keepalive persistente (0 = padrão)"
|
"placeholder": "Keepalive persistente (0 = padrão)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"button-apply-defaults": "Aplicar Padrões de Peer"
|
"button-apply-defaults": "Aplicar Padrões de Peer",
|
||||||
|
"confirm-delete": "Tem certeza que deseja excluir a interface '{id}'?"
|
||||||
},
|
},
|
||||||
"peer-view": {
|
"peer-view": {
|
||||||
"headline-peer": "Peer:",
|
"headline-peer": "Peer:",
|
||||||
@@ -530,7 +532,8 @@
|
|||||||
},
|
},
|
||||||
"expires-at": {
|
"expires-at": {
|
||||||
"label": "Data de expiração"
|
"label": "Data de expiração"
|
||||||
}
|
},
|
||||||
|
"confirm-delete": "Tem certeza que deseja excluir o par '{id}'?"
|
||||||
},
|
},
|
||||||
"peer-multi-create": {
|
"peer-multi-create": {
|
||||||
"headline-peer": "Criar múltiplos peers",
|
"headline-peer": "Criar múltiplos peers",
|
||||||
|
|||||||
@@ -366,7 +366,8 @@
|
|||||||
},
|
},
|
||||||
"admin": {
|
"admin": {
|
||||||
"label": "Является администратором"
|
"label": "Является администратором"
|
||||||
}
|
},
|
||||||
|
"confirm-delete": "Вы уверены, что хотите удалить пользователя «{id}»?"
|
||||||
},
|
},
|
||||||
"interface-view": {
|
"interface-view": {
|
||||||
"headline": "Конфигурация интерфейса:"
|
"headline": "Конфигурация интерфейса:"
|
||||||
@@ -484,7 +485,8 @@
|
|||||||
"placeholder": "Постоянное поддержание активности (0 = значение по умолчанию)"
|
"placeholder": "Постоянное поддержание активности (0 = значение по умолчанию)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"button-apply-defaults": "Применить настройки пира по умолчанию"
|
"button-apply-defaults": "Применить настройки пира по умолчанию",
|
||||||
|
"confirm-delete": "Вы уверены, что хотите удалить интерфейс «{id}»?"
|
||||||
},
|
},
|
||||||
"peer-view": {
|
"peer-view": {
|
||||||
"headline-peer": "Пир:",
|
"headline-peer": "Пир:",
|
||||||
@@ -605,7 +607,8 @@
|
|||||||
},
|
},
|
||||||
"expires-at": {
|
"expires-at": {
|
||||||
"label": "Дата истечения срока действия"
|
"label": "Дата истечения срока действия"
|
||||||
}
|
},
|
||||||
|
"confirm-delete": "Вы уверены, что хотите удалить пир «{id}»?"
|
||||||
},
|
},
|
||||||
"peer-multi-create": {
|
"peer-multi-create": {
|
||||||
"headline-peer": "Создать несколько узлов",
|
"headline-peer": "Создать несколько узлов",
|
||||||
|
|||||||
@@ -151,7 +151,6 @@
|
|||||||
"admin": "Користувач має адміністративні привілеї",
|
"admin": "Користувач має адміністративні привілеї",
|
||||||
"no-admin": "Користувач не має адміністративних привілеїв"
|
"no-admin": "Користувач не має адміністративних привілеїв"
|
||||||
},
|
},
|
||||||
|
|
||||||
"profile": {
|
"profile": {
|
||||||
"headline": "Мої VPN-піри",
|
"headline": "Мої VPN-піри",
|
||||||
"table-heading": {
|
"table-heading": {
|
||||||
@@ -189,7 +188,6 @@
|
|||||||
"api-link": "Документація API"
|
"api-link": "Документація API"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
"modals": {
|
"modals": {
|
||||||
"user-view": {
|
"user-view": {
|
||||||
"headline": "Обліковий запис користувача:",
|
"headline": "Обліковий запис користувача:",
|
||||||
@@ -264,7 +262,8 @@
|
|||||||
},
|
},
|
||||||
"admin": {
|
"admin": {
|
||||||
"label": "Адміністратор"
|
"label": "Адміністратор"
|
||||||
}
|
},
|
||||||
|
"confirm-delete": "Ви впевнені, що хочете видалити користувача «{id}»?"
|
||||||
},
|
},
|
||||||
"interface-view": {
|
"interface-view": {
|
||||||
"headline": "Конфігурація для інтерфейсу:"
|
"headline": "Конфігурація для інтерфейсу:"
|
||||||
@@ -377,7 +376,8 @@
|
|||||||
"placeholder": "Постійний Keepalive (0 = за замовчуванням)"
|
"placeholder": "Постійний Keepalive (0 = за замовчуванням)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"button-apply-defaults": "Застосувати значення за замовчуванням для пірів"
|
"button-apply-defaults": "Застосувати значення за замовчуванням для пірів",
|
||||||
|
"confirm-delete": "Ви впевнені, що хочете видалити інтерфейс «{id}»?"
|
||||||
},
|
},
|
||||||
"peer-view": {
|
"peer-view": {
|
||||||
"headline-peer": "Пір:",
|
"headline-peer": "Пір:",
|
||||||
@@ -493,7 +493,8 @@
|
|||||||
},
|
},
|
||||||
"expires-at": {
|
"expires-at": {
|
||||||
"label": "Дата закінчення терміну дії"
|
"label": "Дата закінчення терміну дії"
|
||||||
}
|
},
|
||||||
|
"confirm-delete": "Ви впевнені, що хочете видалити пір «{id}»?"
|
||||||
},
|
},
|
||||||
"peer-multi-create": {
|
"peer-multi-create": {
|
||||||
"headline-peer": "Створити декілька пір",
|
"headline-peer": "Створити декілька пір",
|
||||||
|
|||||||
@@ -240,7 +240,8 @@
|
|||||||
},
|
},
|
||||||
"admin": {
|
"admin": {
|
||||||
"label": "Là Quản trị viên"
|
"label": "Là Quản trị viên"
|
||||||
}
|
},
|
||||||
|
"confirm-delete": "Ban co chac muon xoa nguoi dung '{id}' khong?"
|
||||||
},
|
},
|
||||||
"interface-view": {
|
"interface-view": {
|
||||||
"headline": "Cấu hình cho Giao diện:"
|
"headline": "Cấu hình cho Giao diện:"
|
||||||
@@ -353,8 +354,8 @@
|
|||||||
"placeholder": "Giữ kết nối liên tục (0 = mặc định)"
|
"placeholder": "Giữ kết nối liên tục (0 = mặc định)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"button-apply-defaults": "Áp dụng Cài đặt Mặc định của Peer",
|
||||||
"button-apply-defaults": "Áp dụng Cài đặt Mặc định của Peer"
|
"confirm-delete": "Ban co chac muon xoa giao dien '{id}' khong?"
|
||||||
},
|
},
|
||||||
"peer-view": {
|
"peer-view": {
|
||||||
"headline-peer": "Peer:",
|
"headline-peer": "Peer:",
|
||||||
@@ -470,7 +471,8 @@
|
|||||||
},
|
},
|
||||||
"expires-at": {
|
"expires-at": {
|
||||||
"label": "Ngày hết hạn"
|
"label": "Ngày hết hạn"
|
||||||
}
|
},
|
||||||
|
"confirm-delete": "Ban co chac muon xoa peer '{id}' khong?"
|
||||||
},
|
},
|
||||||
"peer-multi-create": {
|
"peer-multi-create": {
|
||||||
"headline-peer": "Tạo nhiều peer",
|
"headline-peer": "Tạo nhiều peer",
|
||||||
|
|||||||
@@ -242,6 +242,7 @@
|
|||||||
"label": "管理员"
|
"label": "管理员"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"confirm-delete": "确定要删除用户“{id}”吗？",
|
||||||
"interface-view": {
|
"interface-view": {
|
||||||
"headline": "接口配置: "
|
"headline": "接口配置: "
|
||||||
},
|
},
|
||||||
@@ -353,7 +354,8 @@
|
|||||||
"placeholder": "持久保持连接 (0 = 默认)"
|
"placeholder": "持久保持连接 (0 = 默认)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"button-apply-defaults": "应用节点默认值"
|
"button-apply-defaults": "应用节点默认值",
|
||||||
|
"confirm-delete": "确定要删除接口“{id}”吗？"
|
||||||
},
|
},
|
||||||
"peer-view": {
|
"peer-view": {
|
||||||
"headline-peer": "节点: ",
|
"headline-peer": "节点: ",
|
||||||
@@ -469,7 +471,8 @@
|
|||||||
},
|
},
|
||||||
"expires-at": {
|
"expires-at": {
|
||||||
"label": "过期日期"
|
"label": "过期日期"
|
||||||
}
|
},
|
||||||
|
"confirm-delete": "确定要删除对等点“{id}”吗？"
|
||||||
},
|
},
|
||||||
"peer-multi-create": {
|
"peer-multi-create": {
|
||||||
"headline-peer": "创建多个节点",
|
"headline-peer": "创建多个节点",
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import {createRouter, createWebHashHistory} from 'vue-router'
|
import {createRouter, createWebHashHistory} from 'vue-router'
|
||||||
import HomeView from '../views/HomeView.vue'
|
import HomeView from '../views/HomeView.vue'
|
||||||
import LoginView from '../views/LoginView.vue'
|
import LoginView from '../views/LoginView.vue'
|
||||||
import InterfaceView from '../views/InterfaceView.vue'
|
|
||||||
|
|
||||||
import {authStore} from '@/stores/auth'
|
import {authStore} from '@/stores/auth'
|
||||||
import {securityStore} from '@/stores/security'
|
import {securityStore} from '@/stores/security'
|
||||||
@@ -20,11 +19,6 @@ const router = createRouter({
|
|||||||
name: 'login',
|
name: 'login',
|
||||||
component: LoginView
|
component: LoginView
|
||||||
},
|
},
|
||||||
{
|
|
||||||
path: '/interface',
|
|
||||||
name: 'interface',
|
|
||||||
component: InterfaceView
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
path: '/interfaces',
|
path: '/interfaces',
|
||||||
name: 'interfaces',
|
name: 'interfaces',
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ export const auditStore = defineStore('audit', {
|
|||||||
filter: "",
|
filter: "",
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
pageOffset: 0,
|
pageOffset: 0,
|
||||||
pages: [],
|
|
||||||
fetching: false,
|
fetching: false,
|
||||||
}),
|
}),
|
||||||
getters: {
|
getters: {
|
||||||
@@ -41,33 +40,22 @@ export const auditStore = defineStore('audit', {
|
|||||||
afterPageSizeChange() {
|
afterPageSizeChange() {
|
||||||
// reset pageOffset to avoid problems with new page sizes
|
// reset pageOffset to avoid problems with new page sizes
|
||||||
this.pageOffset = 0
|
this.pageOffset = 0
|
||||||
this.calculatePages()
|
|
||||||
},
|
|
||||||
calculatePages() {
|
|
||||||
let pageCounter = 1;
|
|
||||||
this.pages = []
|
|
||||||
for (let i = 0; i < this.FilteredCount; i+=this.pageSize) {
|
|
||||||
this.pages.push(pageCounter++)
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
gotoPage(page) {
|
gotoPage(page) {
|
||||||
this.pageOffset = (page-1) * this.pageSize
|
this.pageOffset = (page-1) * this.pageSize
|
||||||
|
|
||||||
this.calculatePages()
|
|
||||||
},
|
},
|
||||||
nextPage() {
|
nextPage() {
|
||||||
|
if (this.hasNextPage) {
|
||||||
this.pageOffset += this.pageSize
|
this.pageOffset += this.pageSize
|
||||||
|
}
|
||||||
this.calculatePages()
|
|
||||||
},
|
},
|
||||||
previousPage() {
|
previousPage() {
|
||||||
|
if (this.hasPrevPage) {
|
||||||
this.pageOffset -= this.pageSize
|
this.pageOffset -= this.pageSize
|
||||||
|
}
|
||||||
this.calculatePages()
|
|
||||||
},
|
},
|
||||||
setEntries(entries) {
|
setEntries(entries) {
|
||||||
this.entries = entries
|
this.entries = entries
|
||||||
this.calculatePages()
|
|
||||||
this.fetching = false
|
this.fetching = false
|
||||||
},
|
},
|
||||||
async LoadEntries() {
|
async LoadEntries() {
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ export const peerStore = defineStore('peers', {
|
|||||||
filter: "",
|
filter: "",
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
pageOffset: 0,
|
pageOffset: 0,
|
||||||
pages: [],
|
|
||||||
fetching: false,
|
fetching: false,
|
||||||
sortKey: 'IsConnected', // Default sort key
|
sortKey: 'IsConnected', // Default sort key
|
||||||
sortOrder: -1, // 1 for ascending, -1 for descending
|
sortOrder: -1, // 1 for ascending, -1 for descending
|
||||||
@@ -87,33 +86,22 @@ export const peerStore = defineStore('peers', {
|
|||||||
afterPageSizeChange() {
|
afterPageSizeChange() {
|
||||||
// reset pageOffset to avoid problems with new page sizes
|
// reset pageOffset to avoid problems with new page sizes
|
||||||
this.pageOffset = 0
|
this.pageOffset = 0
|
||||||
this.calculatePages()
|
|
||||||
},
|
|
||||||
calculatePages() {
|
|
||||||
let pageCounter = 1;
|
|
||||||
this.pages = []
|
|
||||||
for (let i = 0; i < this.FilteredCount; i+=this.pageSize) {
|
|
||||||
this.pages.push(pageCounter++)
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
gotoPage(page) {
|
gotoPage(page) {
|
||||||
this.pageOffset = (page-1) * this.pageSize
|
this.pageOffset = (page-1) * this.pageSize
|
||||||
|
|
||||||
this.calculatePages()
|
|
||||||
},
|
},
|
||||||
nextPage() {
|
nextPage() {
|
||||||
|
if (this.hasNextPage) {
|
||||||
this.pageOffset += this.pageSize
|
this.pageOffset += this.pageSize
|
||||||
|
}
|
||||||
this.calculatePages()
|
|
||||||
},
|
},
|
||||||
previousPage() {
|
previousPage() {
|
||||||
|
if (this.hasPrevPage) {
|
||||||
this.pageOffset -= this.pageSize
|
this.pageOffset -= this.pageSize
|
||||||
|
}
|
||||||
this.calculatePages()
|
|
||||||
},
|
},
|
||||||
setPeers(peers) {
|
setPeers(peers) {
|
||||||
this.peers = peers
|
this.peers = peers
|
||||||
this.calculatePages()
|
|
||||||
this.fetching = false
|
this.fetching = false
|
||||||
this.trafficStats = {}
|
this.trafficStats = {}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ export const profileStore = defineStore('profile', {
|
|||||||
filter: "",
|
filter: "",
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
pageOffset: 0,
|
pageOffset: 0,
|
||||||
pages: [],
|
|
||||||
fetching: false,
|
fetching: false,
|
||||||
sortKey: 'IsConnected', // Default sort key
|
sortKey: 'IsConnected', // Default sort key
|
||||||
sortOrder: -1, // 1 for ascending, -1 for descending
|
sortOrder: -1, // 1 for ascending, -1 for descending
|
||||||
@@ -80,29 +79,19 @@ export const profileStore = defineStore('profile', {
|
|||||||
afterPageSizeChange() {
|
afterPageSizeChange() {
|
||||||
// reset pageOffset to avoid problems with new page sizes
|
// reset pageOffset to avoid problems with new page sizes
|
||||||
this.pageOffset = 0
|
this.pageOffset = 0
|
||||||
this.calculatePages()
|
|
||||||
},
|
|
||||||
calculatePages() {
|
|
||||||
let pageCounter = 1;
|
|
||||||
this.pages = []
|
|
||||||
for (let i = 0; i < this.FilteredPeerCount; i+=this.pageSize) {
|
|
||||||
this.pages.push(pageCounter++)
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
gotoPage(page) {
|
gotoPage(page) {
|
||||||
this.pageOffset = (page-1) * this.pageSize
|
this.pageOffset = (page-1) * this.pageSize
|
||||||
|
|
||||||
this.calculatePages()
|
|
||||||
},
|
},
|
||||||
nextPage() {
|
nextPage() {
|
||||||
|
if (this.hasNextPage) {
|
||||||
this.pageOffset += this.pageSize
|
this.pageOffset += this.pageSize
|
||||||
|
}
|
||||||
this.calculatePages()
|
|
||||||
},
|
},
|
||||||
previousPage() {
|
previousPage() {
|
||||||
|
if (this.hasPrevPage) {
|
||||||
this.pageOffset -= this.pageSize
|
this.pageOffset -= this.pageSize
|
||||||
|
}
|
||||||
this.calculatePages()
|
|
||||||
},
|
},
|
||||||
setPeers(peers) {
|
setPeers(peers) {
|
||||||
this.peers = peers
|
this.peers = peers
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ export const userStore = defineStore('users', {
|
|||||||
filter: "",
|
filter: "",
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
pageOffset: 0,
|
pageOffset: 0,
|
||||||
pages: [],
|
|
||||||
fetching: false,
|
fetching: false,
|
||||||
}),
|
}),
|
||||||
getters: {
|
getters: {
|
||||||
@@ -43,33 +42,22 @@ export const userStore = defineStore('users', {
|
|||||||
afterPageSizeChange() {
|
afterPageSizeChange() {
|
||||||
// reset pageOffset to avoid problems with new page sizes
|
// reset pageOffset to avoid problems with new page sizes
|
||||||
this.pageOffset = 0
|
this.pageOffset = 0
|
||||||
this.calculatePages()
|
|
||||||
},
|
|
||||||
calculatePages() {
|
|
||||||
let pageCounter = 1;
|
|
||||||
this.pages = []
|
|
||||||
for (let i = 0; i < this.FilteredCount; i+=this.pageSize) {
|
|
||||||
this.pages.push(pageCounter++)
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
gotoPage(page) {
|
gotoPage(page) {
|
||||||
this.pageOffset = (page-1) * this.pageSize
|
this.pageOffset = (page-1) * this.pageSize
|
||||||
|
|
||||||
this.calculatePages()
|
|
||||||
},
|
},
|
||||||
nextPage() {
|
nextPage() {
|
||||||
|
if (this.hasNextPage) {
|
||||||
this.pageOffset += this.pageSize
|
this.pageOffset += this.pageSize
|
||||||
|
}
|
||||||
this.calculatePages()
|
|
||||||
},
|
},
|
||||||
previousPage() {
|
previousPage() {
|
||||||
|
if (this.hasPrevPage) {
|
||||||
this.pageOffset -= this.pageSize
|
this.pageOffset -= this.pageSize
|
||||||
|
}
|
||||||
this.calculatePages()
|
|
||||||
},
|
},
|
||||||
setUsers(users) {
|
setUsers(users) {
|
||||||
this.users = users
|
this.users = users
|
||||||
this.calculatePages()
|
|
||||||
this.fetching = false
|
this.fetching = false
|
||||||
},
|
},
|
||||||
setUserPeers(peers) {
|
setUserPeers(peers) {
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import { onMounted } from "vue";
|
import { onMounted } from "vue";
|
||||||
import {auditStore} from "@/stores/audit";
|
import {auditStore} from "@/stores/audit";
|
||||||
|
import Pagination from "@/components/Pagination.vue";
|
||||||
|
|
||||||
const audit = auditStore()
|
const audit = auditStore()
|
||||||
|
|
||||||
@@ -60,28 +61,24 @@ onMounted(async () => {
|
|||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
<hr>
|
<hr>
|
||||||
<div class="mt-3">
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-6">
|
<div class="col-12 col-md-6">
|
||||||
<ul class="pagination pagination-sm">
|
<Pagination
|
||||||
<li :class="{disabled:audit.pageOffset===0}" class="page-item">
|
:currentPage="audit.currentPage"
|
||||||
<a class="page-link" @click="audit.previousPage">«</a>
|
:totalCount="audit.FilteredCount"
|
||||||
</li>
|
:pageSize="audit.pageSize"
|
||||||
|
:hasNextPage="audit.hasNextPage"
|
||||||
<li v-for="page in audit.pages" :key="page" :class="{active:audit.currentPage===page}" class="page-item">
|
:hasPrevPage="audit.hasPrevPage"
|
||||||
<a class="page-link" @click="audit.gotoPage(page)">{{page}}</a>
|
:onGotoPage="audit.gotoPage"
|
||||||
</li>
|
:onNextPage="audit.nextPage"
|
||||||
|
:onPrevPage="audit.previousPage"
|
||||||
<li :class="{disabled:!audit.hasNextPage}" class="page-item">
|
/>
|
||||||
<a class="page-link" @click="audit.nextPage">»</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-6">
|
<div class="col-12 col-md-6">
|
||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
<label class="col-sm-6 col-form-label text-end" for="paginationSelector">{{ $t('general.pagination.size') }}:</label>
|
<label class="col-sm-6 col-form-label text-md-end" for="paginationSelector">{{ $t('general.pagination.size') }}:</label>
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-6">
|
||||||
<select id="paginationSelector" v-model.number="audit.pageSize" class="form-select" @click="audit.afterPageSizeChange()">
|
<select id="paginationSelector" v-model.number="audit.pageSize" class="form-select" @change="audit.afterPageSizeChange()">
|
||||||
<option value="10">10</option>
|
<option value="10">10</option>
|
||||||
<option value="25">25</option>
|
<option value="25">25</option>
|
||||||
<option value="50">50</option>
|
<option value="50">50</option>
|
||||||
@@ -92,5 +89,4 @@ onMounted(async () => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import PeerViewModal from "../components/PeerViewModal.vue";
|
import PeerViewModal from "@/components/PeerViewModal.vue";
|
||||||
import PeerEditModal from "../components/PeerEditModal.vue";
|
import PeerEditModal from "@/components/PeerEditModal.vue";
|
||||||
import PeerMultiCreateModal from "../components/PeerMultiCreateModal.vue";
|
import PeerMultiCreateModal from "@/components/PeerMultiCreateModal.vue";
|
||||||
import InterfaceEditModal from "../components/InterfaceEditModal.vue";
|
import InterfaceEditModal from "@/components/InterfaceEditModal.vue";
|
||||||
import InterfaceViewModal from "../components/InterfaceViewModal.vue";
|
import InterfaceViewModal from "@/components/InterfaceViewModal.vue";
|
||||||
|
import Pagination from "@/components/Pagination.vue";
|
||||||
|
|
||||||
import {computed, onMounted, ref} from "vue";
|
import {computed, onMounted, ref} from "vue";
|
||||||
import {peerStore} from "@/stores/peers";
|
import {peerStore} from "@/stores/peers";
|
||||||
@@ -482,26 +483,23 @@ onMounted(async () => {
|
|||||||
<hr v-if="interfaces.Count!==0">
|
<hr v-if="interfaces.Count!==0">
|
||||||
<div v-if="interfaces.Count!==0" class="mt-3">
|
<div v-if="interfaces.Count!==0" class="mt-3">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-6">
|
<div class="col-12 col-md-6">
|
||||||
<ul class="pagination pagination-sm">
|
<Pagination
|
||||||
<li :class="{disabled:peers.pageOffset===0}" class="page-item">
|
:currentPage="peers.currentPage"
|
||||||
<a class="page-link" @click="peers.previousPage">«</a>
|
:totalCount="peers.FilteredCount"
|
||||||
</li>
|
:pageSize="peers.pageSize"
|
||||||
|
:hasNextPage="peers.hasNextPage"
|
||||||
<li v-for="page in peers.pages" :key="page" :class="{active:peers.currentPage===page}" class="page-item">
|
:hasPrevPage="peers.hasPrevPage"
|
||||||
<a class="page-link" @click="peers.gotoPage(page)">{{page}}</a>
|
:onGotoPage="peers.gotoPage"
|
||||||
</li>
|
:onNextPage="peers.nextPage"
|
||||||
|
:onPrevPage="peers.previousPage"
|
||||||
<li :class="{disabled:!peers.hasNextPage}" class="page-item">
|
/>
|
||||||
<a class="page-link" @click="peers.nextPage">»</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-6">
|
<div class="col-12 col-md-6">
|
||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
<label class="col-sm-6 col-form-label text-end" for="paginationSelector">{{ $t('general.pagination.size') }}:</label>
|
<label class="col-sm-6 col-form-label text-md-end" for="paginationSelector">{{ $t('general.pagination.size') }}:</label>
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-6">
|
||||||
<select id="paginationSelector" v-model.number="peers.pageSize" class="form-select" @click="peers.afterPageSizeChange()">
|
<select id="paginationSelector" v-model.number="peers.pageSize" class="form-select" @change="peers.afterPageSizeChange()">
|
||||||
<option value="10">10</option>
|
<option value="10">10</option>
|
||||||
<option value="25">25</option>
|
<option value="25">25</option>
|
||||||
<option value="50">50</option>
|
<option value="50">50</option>
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import { useI18n } from "vue-i18n";
|
|||||||
import { profileStore } from "@/stores/profile";
|
import { profileStore } from "@/stores/profile";
|
||||||
import { peerStore } from "@/stores/peers";
|
import { peerStore } from "@/stores/peers";
|
||||||
import UserPeerEditModal from "@/components/UserPeerEditModal.vue";
|
import UserPeerEditModal from "@/components/UserPeerEditModal.vue";
|
||||||
|
import Pagination from "@/components/Pagination.vue";
|
||||||
import { settingsStore } from "@/stores/settings";
|
import { settingsStore } from "@/stores/settings";
|
||||||
import { humanFileSize } from "@/helpers/utils";
|
import { humanFileSize } from "@/helpers/utils";
|
||||||
|
|
||||||
@@ -66,7 +67,6 @@ onMounted(async () => {
|
|||||||
await profile.LoadPeers()
|
await profile.LoadPeers()
|
||||||
await profile.LoadStats()
|
await profile.LoadStats()
|
||||||
await profile.LoadInterfaces()
|
await profile.LoadInterfaces()
|
||||||
await profile.calculatePages(); // Forces to show initial page number
|
|
||||||
})
|
})
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
@@ -185,28 +185,25 @@ onMounted(async () => {
|
|||||||
<hr>
|
<hr>
|
||||||
<div class="mt-3">
|
<div class="mt-3">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-6">
|
<div class="col-12 col-md-6">
|
||||||
<ul class="pagination pagination-sm">
|
<Pagination
|
||||||
<li :class="{ disabled: profile.pageOffset === 0 }" class="page-item">
|
:currentPage="profile.currentPage"
|
||||||
<a class="page-link" @click="profile.previousPage">«</a>
|
:totalCount="profile.FilteredPeerCount"
|
||||||
</li>
|
:pageSize="profile.pageSize"
|
||||||
|
:hasNextPage="profile.hasNextPage"
|
||||||
<li v-for="page in profile.pages" :key="page" :class="{ active: profile.currentPage === page }" class="page-item">
|
:hasPrevPage="profile.hasPrevPage"
|
||||||
<a class="page-link" @click="profile.gotoPage(page)">{{ page }}</a>
|
:onGotoPage="profile.gotoPage"
|
||||||
</li>
|
:onNextPage="profile.nextPage"
|
||||||
|
:onPrevPage="profile.previousPage"
|
||||||
<li :class="{ disabled: !profile.hasNextPage }" class="page-item">
|
/>
|
||||||
<a class="page-link" @click="profile.nextPage">»</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-6">
|
<div class="col-12 col-md-6">
|
||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
<label class="col-sm-6 col-form-label text-end" for="paginationSelector">
|
<label class="col-sm-6 col-form-label text-md-end" for="paginationSelector">
|
||||||
{{ $t('general.pagination.size')}}:
|
{{ $t('general.pagination.size')}}:
|
||||||
</label>
|
</label>
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-6">
|
||||||
<select id="paginationSelector" v-model.number="profile.pageSize" class="form-select" @click="profile.afterPageSizeChange()">
|
<select id="paginationSelector" v-model.number="profile.pageSize" class="form-select" @change="profile.afterPageSizeChange()">
|
||||||
<option value="10">10</option>
|
<option value="10">10</option>
|
||||||
<option value="25">25</option>
|
<option value="25">25</option>
|
||||||
<option value="50">50</option>
|
<option value="50">50</option>
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import {userStore} from "@/stores/users";
|
import {userStore} from "@/stores/users";
|
||||||
import {ref, onMounted, computed} from "vue";
|
import {ref, onMounted, computed} from "vue";
|
||||||
import UserEditModal from "../components/UserEditModal.vue";
|
import UserEditModal from "@/components/UserEditModal.vue";
|
||||||
import UserViewModal from "../components/UserViewModal.vue";
|
import UserViewModal from "@/components/UserViewModal.vue";
|
||||||
|
import Pagination from "@/components/Pagination.vue";
|
||||||
import {useI18n} from "vue-i18n";
|
import {useI18n} from "vue-i18n";
|
||||||
|
|
||||||
const users = userStore()
|
const users = userStore()
|
||||||
@@ -165,28 +166,24 @@ onMounted(() => {
|
|||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
<hr>
|
<hr>
|
||||||
<div class="mt-3">
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-6">
|
<div class="col-12 col-md-6">
|
||||||
<ul class="pagination pagination-sm">
|
<Pagination
|
||||||
<li :class="{disabled:users.pageOffset===0}" class="page-item">
|
:currentPage="users.currentPage"
|
||||||
<a class="page-link" @click="users.previousPage">«</a>
|
:totalCount="users.FilteredCount"
|
||||||
</li>
|
:pageSize="users.pageSize"
|
||||||
|
:hasNextPage="users.hasNextPage"
|
||||||
<li v-for="page in users.pages" :key="page" :class="{active:users.currentPage===page}" class="page-item">
|
:hasPrevPage="users.hasPrevPage"
|
||||||
<a class="page-link" @click="users.gotoPage(page)">{{page}}</a>
|
:onGotoPage="users.gotoPage"
|
||||||
</li>
|
:onNextPage="users.nextPage"
|
||||||
|
:onPrevPage="users.previousPage"
|
||||||
<li :class="{disabled:!users.hasNextPage}" class="page-item">
|
/>
|
||||||
<a class="page-link" @click="users.nextPage">»</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-6">
|
<div class="col-12 col-md-6">
|
||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
<label class="col-sm-6 col-form-label text-end" for="paginationSelector">{{ $t('general.pagination.size') }}:</label>
|
<label class="col-sm-6 col-form-label text-md-end" for="paginationSelector">{{ $t('general.pagination.size') }}:</label>
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-6">
|
||||||
<select id="paginationSelector" v-model.number="users.pageSize" class="form-select" @click="users.afterPageSizeChange()">
|
<select id="paginationSelector" v-model.number="users.pageSize" class="form-select" @change="users.afterPageSizeChange()">
|
||||||
<option value="10">10</option>
|
<option value="10">10</option>
|
||||||
<option value="25">25</option>
|
<option value="25">25</option>
|
||||||
<option value="50">50</option>
|
<option value="50">50</option>
|
||||||
@@ -197,5 +194,4 @@ onMounted(() => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -232,21 +232,19 @@ func (r *SqlRepo) migrate() error {
|
|||||||
slog.Debug("running migration: interface status", "result", r.db.AutoMigrate(&domain.InterfaceStatus{}))
|
slog.Debug("running migration: interface status", "result", r.db.AutoMigrate(&domain.InterfaceStatus{}))
|
||||||
slog.Debug("running migration: audit data", "result", r.db.AutoMigrate(&domain.AuditEntry{}))
|
slog.Debug("running migration: audit data", "result", r.db.AutoMigrate(&domain.AuditEntry{}))
|
||||||
|
|
||||||
existingSysStat := SysStat{}
|
var existingSysStat SysStat
|
||||||
|
var err error
|
||||||
|
|
||||||
r.db.Order("schema_version desc").First(&existingSysStat) // get latest version
|
r.db.Order("schema_version desc").First(&existingSysStat) // get latest version
|
||||||
|
|
||||||
// Migration: 0 --> 1
|
// Migration: 0 --> 1
|
||||||
if existingSysStat.SchemaVersion == 0 {
|
if existingSysStat.SchemaVersion == 0 {
|
||||||
const schemaVersion = 1
|
const schemaVersion = 1
|
||||||
sysStat := SysStat{
|
existingSysStat, err = r.addMigration(schemaVersion) // ensure that follow-up checks test against the latest version
|
||||||
MigratedAt: time.Now(),
|
if err != nil {
|
||||||
SchemaVersion: schemaVersion,
|
return err
|
||||||
}
|
|
||||||
if err := r.db.Create(&sysStat).Error; err != nil {
|
|
||||||
return fmt.Errorf("failed to write sysstat entry for schema version %d: %w", schemaVersion, err)
|
|
||||||
}
|
}
|
||||||
slog.Debug("sys-stat entry written", "schema_version", schemaVersion)
|
slog.Debug("sys-stat entry written", "schema_version", schemaVersion)
|
||||||
existingSysStat = sysStat // ensure that follow-up checks test against the latest version
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Migration: 1 --> 2
|
// Migration: 1 --> 2
|
||||||
@@ -262,14 +260,10 @@ func (r *SqlRepo) migrate() error {
|
|||||||
}
|
}
|
||||||
slog.Debug("migrated interface create_default_peer flags", "schema_version", schemaVersion)
|
slog.Debug("migrated interface create_default_peer flags", "schema_version", schemaVersion)
|
||||||
}
|
}
|
||||||
sysStat := SysStat{
|
existingSysStat, err = r.addMigration(schemaVersion) // ensure that follow-up checks test against the latest version
|
||||||
MigratedAt: time.Now(),
|
if err != nil {
|
||||||
SchemaVersion: schemaVersion,
|
return err
|
||||||
}
|
}
|
||||||
if err := r.db.Create(&sysStat).Error; err != nil {
|
|
||||||
return fmt.Errorf("failed to write sysstat entry for schema version %d: %w", schemaVersion, err)
|
|
||||||
}
|
|
||||||
existingSysStat = sysStat // ensure that follow-up checks test against the latest version
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Migration: 2 --> 3
|
// Migration: 2 --> 3
|
||||||
@@ -307,17 +301,43 @@ func (r *SqlRepo) migrate() error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to migrate to multi-auth: %w", err)
|
return fmt.Errorf("failed to migrate to multi-auth: %w", err)
|
||||||
}
|
}
|
||||||
|
existingSysStat, err = r.addMigration(schemaVersion) // ensure that follow-up checks test against the latest version
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Migration: 3 --> 4
|
||||||
|
if existingSysStat.SchemaVersion == 3 {
|
||||||
|
const schemaVersion = 4
|
||||||
|
cutoff := time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC)
|
||||||
|
|
||||||
|
// Fix zero created_at timestamps for users. Set the to the last known update timestamp.
|
||||||
|
err := r.db.Model(&domain.User{}).Where("created_at < ?", cutoff).
|
||||||
|
Update("created_at", gorm.Expr("updated_at")).Error
|
||||||
|
if err != nil {
|
||||||
|
slog.Warn("failed to fix zero created_at for users", "error", err)
|
||||||
|
}
|
||||||
|
slog.Debug("fixed zero created_at timestamps for users", "schema_version", schemaVersion)
|
||||||
|
|
||||||
|
existingSysStat, err = r.addMigration(schemaVersion) // ensure that follow-up checks test against the latest version
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *SqlRepo) addMigration(schemaVersion uint64) (SysStat, error) {
|
||||||
sysStat := SysStat{
|
sysStat := SysStat{
|
||||||
MigratedAt: time.Now(),
|
MigratedAt: time.Now(),
|
||||||
SchemaVersion: schemaVersion,
|
SchemaVersion: schemaVersion,
|
||||||
}
|
}
|
||||||
if err := r.db.Create(&sysStat).Error; err != nil {
|
if err := r.db.Create(&sysStat).Error; err != nil {
|
||||||
return fmt.Errorf("failed to write sysstat entry for schema version %d: %w", schemaVersion, err)
|
return SysStat{}, fmt.Errorf("failed to write sysstat entry for schema version %d: %w", schemaVersion, err)
|
||||||
}
|
}
|
||||||
existingSysStat = sysStat // ensure that follow-up checks test against the latest version
|
return sysStat, nil
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// region interfaces
|
// region interfaces
|
||||||
|
|||||||
168
internal/adapters/database_created_at_test.go
Normal file
168
internal/adapters/database_created_at_test.go
Normal file
@@ -0,0 +1,168 @@
|
|||||||
|
package adapters
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/glebarez/sqlite"
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
|
||||||
|
"github.com/h44z/wg-portal/internal/config"
|
||||||
|
"github.com/h44z/wg-portal/internal/domain"
|
||||||
|
)
|
||||||
|
|
||||||
|
func newTestDB(t *testing.T) *gorm.DB {
|
||||||
|
t.Helper()
|
||||||
|
db, err := gorm.Open(sqlite.Open("file::memory:"), &gorm.Config{})
|
||||||
|
require.NoError(t, err)
|
||||||
|
return db
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestUpsertUser_SetsCreatedAtWhenZero(t *testing.T) {
|
||||||
|
db := newTestDB(t)
|
||||||
|
require.NoError(t, db.AutoMigrate(&domain.User{}, &domain.UserAuthentication{}, &domain.UserWebauthnCredential{}))
|
||||||
|
|
||||||
|
repo := &SqlRepo{db: db, cfg: &config.Config{}}
|
||||||
|
ui := domain.SystemAdminContextUserInfo()
|
||||||
|
|
||||||
|
user := &domain.User{
|
||||||
|
Identifier: "test-user",
|
||||||
|
Email: "test@example.com",
|
||||||
|
// CreatedAt is zero
|
||||||
|
}
|
||||||
|
|
||||||
|
err := repo.upsertUser(ui, db, user)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
assert.False(t, user.CreatedAt.IsZero(), "CreatedAt should be set when it was zero")
|
||||||
|
assert.Equal(t, ui.UserId(), user.UpdatedBy, "UpdatedBy should be set when it was empty")
|
||||||
|
assert.WithinDuration(t, user.UpdatedAt, user.CreatedAt, time.Second,
|
||||||
|
"CreatedAt should be close to UpdatedAt for new user")
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestUpsertUser_PreservesExistingCreatedAt(t *testing.T) {
|
||||||
|
db := newTestDB(t)
|
||||||
|
require.NoError(t, db.AutoMigrate(&domain.User{}, &domain.UserAuthentication{}, &domain.UserWebauthnCredential{}))
|
||||||
|
|
||||||
|
repo := &SqlRepo{db: db, cfg: &config.Config{}}
|
||||||
|
ui := domain.SystemAdminContextUserInfo()
|
||||||
|
|
||||||
|
originalTime := time.Date(2025, 1, 1, 12, 0, 0, 0, time.UTC)
|
||||||
|
user := &domain.User{
|
||||||
|
Identifier: "test-user",
|
||||||
|
Email: "test@example.com",
|
||||||
|
BaseModel: domain.BaseModel{
|
||||||
|
CreatedAt: originalTime,
|
||||||
|
CreatedBy: "original-creator",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
err := repo.upsertUser(ui, db, user)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
assert.Equal(t, originalTime, user.CreatedAt, "CreatedAt should not be overwritten")
|
||||||
|
assert.Equal(t, "original-creator", user.CreatedBy, "CreatedBy should not be overwritten")
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSaveUser_NewUserGetsCreatedAt(t *testing.T) {
|
||||||
|
db := newTestDB(t)
|
||||||
|
require.NoError(t, db.AutoMigrate(&domain.User{}, &domain.UserAuthentication{}, &domain.UserWebauthnCredential{}))
|
||||||
|
|
||||||
|
repo := &SqlRepo{db: db, cfg: &config.Config{}}
|
||||||
|
ctx := domain.SetUserInfo(context.Background(), domain.SystemAdminContextUserInfo())
|
||||||
|
|
||||||
|
before := time.Now().Add(-time.Second)
|
||||||
|
|
||||||
|
err := repo.SaveUser(ctx, "new-user", func(u *domain.User) (*domain.User, error) {
|
||||||
|
u.Email = "new@example.com"
|
||||||
|
return u, nil
|
||||||
|
})
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
var saved domain.User
|
||||||
|
require.NoError(t, db.First(&saved, "identifier = ?", "new-user").Error)
|
||||||
|
|
||||||
|
assert.False(t, saved.CreatedAt.IsZero(), "CreatedAt should not be zero")
|
||||||
|
assert.True(t, saved.CreatedAt.After(before), "CreatedAt should be recent")
|
||||||
|
assert.NotEmpty(t, saved.CreatedBy, "CreatedBy should be set")
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMigration_FixesZeroCreatedAt(t *testing.T) {
|
||||||
|
db := newTestDB(t)
|
||||||
|
|
||||||
|
// Manually create tables and seed schema version 3
|
||||||
|
require.NoError(t, db.AutoMigrate(
|
||||||
|
&SysStat{},
|
||||||
|
&domain.User{},
|
||||||
|
&domain.UserAuthentication{},
|
||||||
|
&domain.Interface{},
|
||||||
|
&domain.Cidr{},
|
||||||
|
&domain.Peer{},
|
||||||
|
&domain.AuditEntry{},
|
||||||
|
&domain.UserWebauthnCredential{},
|
||||||
|
))
|
||||||
|
|
||||||
|
// Insert schema versions 1, 2, 3 so migration starts at 3
|
||||||
|
for v := uint64(1); v <= 3; v++ {
|
||||||
|
require.NoError(t, db.Create(&SysStat{SchemaVersion: v, MigratedAt: time.Now()}).Error)
|
||||||
|
}
|
||||||
|
|
||||||
|
updatedAt := time.Date(2025, 6, 15, 10, 0, 0, 0, time.UTC)
|
||||||
|
|
||||||
|
// Insert a user with zero created_at but valid updated_at
|
||||||
|
require.NoError(t, db.Exec(
|
||||||
|
"INSERT INTO users (identifier, email, created_at, updated_at) VALUES (?, ?, ?, ?)",
|
||||||
|
"zero-user", "zero@example.com", time.Time{}, updatedAt,
|
||||||
|
).Error)
|
||||||
|
|
||||||
|
// Run migration
|
||||||
|
repo := &SqlRepo{db: db, cfg: &config.Config{}}
|
||||||
|
require.NoError(t, repo.migrate())
|
||||||
|
|
||||||
|
// Verify created_at was backfilled from updated_at
|
||||||
|
var user domain.User
|
||||||
|
require.NoError(t, db.First(&user, "identifier = ?", "zero-user").Error)
|
||||||
|
assert.Equal(t, updatedAt, user.CreatedAt, "created_at should be backfilled from updated_at")
|
||||||
|
|
||||||
|
// Verify schema version advanced to 4
|
||||||
|
var latest SysStat
|
||||||
|
require.NoError(t, db.Order("schema_version DESC").First(&latest).Error)
|
||||||
|
assert.Equal(t, uint64(4), latest.SchemaVersion)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMigration_DoesNotTouchValidCreatedAt(t *testing.T) {
|
||||||
|
db := newTestDB(t)
|
||||||
|
|
||||||
|
require.NoError(t, db.AutoMigrate(
|
||||||
|
&SysStat{},
|
||||||
|
&domain.User{},
|
||||||
|
&domain.UserAuthentication{},
|
||||||
|
&domain.Interface{},
|
||||||
|
&domain.Cidr{},
|
||||||
|
&domain.Peer{},
|
||||||
|
&domain.AuditEntry{},
|
||||||
|
&domain.UserWebauthnCredential{},
|
||||||
|
))
|
||||||
|
|
||||||
|
for v := uint64(1); v <= 3; v++ {
|
||||||
|
require.NoError(t, db.Create(&SysStat{SchemaVersion: v, MigratedAt: time.Now()}).Error)
|
||||||
|
}
|
||||||
|
|
||||||
|
createdAt := time.Date(2024, 3, 1, 8, 0, 0, 0, time.UTC)
|
||||||
|
updatedAt := time.Date(2025, 6, 15, 10, 0, 0, 0, time.UTC)
|
||||||
|
|
||||||
|
require.NoError(t, db.Exec(
|
||||||
|
"INSERT INTO users (identifier, email, created_at, updated_at) VALUES (?, ?, ?, ?)",
|
||||||
|
"valid-user", "valid@example.com", createdAt, updatedAt,
|
||||||
|
).Error)
|
||||||
|
|
||||||
|
repo := &SqlRepo{db: db, cfg: &config.Config{}}
|
||||||
|
require.NoError(t, repo.migrate())
|
||||||
|
|
||||||
|
var user domain.User
|
||||||
|
require.NoError(t, db.First(&user, "identifier = ?", "valid-user").Error)
|
||||||
|
assert.Equal(t, createdAt, user.CreatedAt, "valid created_at should not be modified")
|
||||||
|
}
|
||||||
@@ -533,6 +533,7 @@ func (m Manager) create(ctx context.Context, user *domain.User) (*domain.User, e
|
|||||||
}
|
}
|
||||||
|
|
||||||
err = m.users.SaveUser(ctx, user.Identifier, func(u *domain.User) (*domain.User, error) {
|
err = m.users.SaveUser(ctx, user.Identifier, func(u *domain.User) (*domain.User, error) {
|
||||||
|
user.CopyCalculatedAttributes(u, false)
|
||||||
return user, nil
|
return user, nil
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ type User struct {
|
|||||||
WebAuthnCredentialList []UserWebauthnCredential `gorm:"foreignKey:user_identifier"` // the webauthn credentials of the user, used for webauthn authentication
|
WebAuthnCredentialList []UserWebauthnCredential `gorm:"foreignKey:user_identifier"` // the webauthn credentials of the user, used for webauthn authentication
|
||||||
|
|
||||||
// API token for REST API access
|
// API token for REST API access
|
||||||
ApiToken string `form:"api_token" binding:"omitempty"`
|
ApiToken string `form:"api_token" binding:"omitempty" gorm:"serializer:encstr"`
|
||||||
ApiTokenCreated *time.Time
|
ApiTokenCreated *time.Time
|
||||||
|
|
||||||
LinkedPeerCount int `gorm:"-"`
|
LinkedPeerCount int `gorm:"-"`
|
||||||
|
|||||||
Reference in New Issue
Block a user