dependency updates and small ui fixes

in4it · Jan 15, 2025 · 4efff09 · 4efff09
1 parent 2802b7f
commit 4efff09
Show file tree

Hide file tree

Showing 9 changed files with 119 additions and 245 deletions.
diff --git a/go.mod b/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/go-jose/go-jose/v4 v4.0.4 // indirect
 	github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/in4it/go-devops-platform v0.1.1
+	github.com/in4it/go-devops-platform v0.1.2
 	github.com/russellhaering/gosaml2 v0.9.1 // indirect
 	github.com/russellhaering/goxmldsig v1.4.0 // indirect
 )

diff --git a/go.sum b/go.sum
@@ -21,6 +21,12 @@ github.com/in4it/go-devops-platform v0.1.1-0.20250115193241-b564ec1b674a h1:h1ra
 github.com/in4it/go-devops-platform v0.1.1-0.20250115193241-b564ec1b674a/go.mod h1:uSlFttQ27jkCi49e+yQGyAHTKzNE/S0/Y2odk20xax0=
 github.com/in4it/go-devops-platform v0.1.1 h1:6fAlKe5rmXPzJiEt+Qs3kbJHG8svxEA5ciOaZkrkl/I=
 github.com/in4it/go-devops-platform v0.1.1/go.mod h1:oORoWkGLwJN7ekBkOFMx0UULKLk5gRSzlg2vw0kygtI=
+github.com/in4it/go-devops-platform v0.1.2-0.20250115201601-98063b422db4 h1:Fak0Jb42NekaaRG48EC7SabiffueWVYr6Jcf++GAGTQ=
+github.com/in4it/go-devops-platform v0.1.2-0.20250115201601-98063b422db4/go.mod h1:oORoWkGLwJN7ekBkOFMx0UULKLk5gRSzlg2vw0kygtI=
+github.com/in4it/go-devops-platform v0.1.2-0.20250115203120-aab149ca8139 h1:6A5siej1whHDd1HrphnzAeCjShZHw6ZRFWqiANAJYA4=
+github.com/in4it/go-devops-platform v0.1.2-0.20250115203120-aab149ca8139/go.mod h1:oORoWkGLwJN7ekBkOFMx0UULKLk5gRSzlg2vw0kygtI=
+github.com/in4it/go-devops-platform v0.1.2 h1:zP38Onvc9226uK9utZn+873Mb5jzkYc7Ig5jjGn8D1o=
+github.com/in4it/go-devops-platform v0.1.2/go.mod h1:oORoWkGLwJN7ekBkOFMx0UULKLk5gRSzlg2vw0kygtI=
 github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
 github.com/jonboulle/clockwork v0.3.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
 github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4=

diff --git a/pkg/vpn/router_test.go b/pkg/vpn/router_test.go
@@ -0,0 +1,28 @@
+package vpn
+
+import (
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/in4it/go-devops-platform/rest"
+)
+
+func TestIsAdmin(t *testing.T) {
+	handler := func(w http.ResponseWriter, r *http.Request) {
+		io.WriteString(w, "<html><body>Hello World!</body></html>")
+	}
+
+	req := httptest.NewRequest("GET", "http://example.com/foo", nil)
+	w := httptest.NewRecorder()
+
+	rest.IsAdminMiddleware(http.HandlerFunc(handler)).ServeHTTP(w, req)
+
+	resp := w.Result()
+
+	if resp.StatusCode != 403 {
+		t.Fatalf("expected permission denied")
+	}
+
+}
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
diff --git a/webapp/package.json b/webapp/package.json
@@ -23,7 +23,7 @@
     "date-fns": "^3.6.0",
     "react": "^18.2.0",
     "react-chartjs-2": "^5.2.0",
-    "react-cookie": "^7.1.4",
+    "react-cookie": "^7.2.2",
     "react-dom": "^18.2.0",
     "react-hook-qrcode-svg": "^1.5.1",
     "react-icons": "^5.3.0",

diff --git a/webapp/src/NavBar/Version.tsx b/webapp/src/NavBar/Version.tsx
@@ -7,7 +7,7 @@ export function Version() {
     const { isPending, error, data } = useQuery({
       queryKey: ['version'],
       queryFn: () =>
-        fetch(AppSettings.url + '/version', {
+        fetch(AppSettings.url + '/vpn/version', {
           headers: {
             "Content-Type": "application/json",
             "Authorization": "Bearer " + authInfo.token

diff --git a/webapp/src/Routes/Connection/NewConnection.tsx b/webapp/src/Routes/Connection/NewConnection.tsx
@@ -21,6 +21,7 @@ export function NewConnection() {
         },
         onSuccess: () => {
             queryClient.invalidateQueries({ queryKey: ['connections'] })
+            queryClient.invalidateQueries({ queryKey: ['connectionlicense'] })
         },
         onError: (error:AxiosError) => {
             const errorMessage = error.response?.data as GenericErrorResponse

diff --git a/webapp/src/Routes/Users/ListUsers.tsx b/webapp/src/Routes/Users/ListUsers.tsx
@@ -132,7 +132,7 @@ export function ListUsers({localAuthDisabled}:Props) {
                defaultValue={item.role}
                variant="unstyled"
                allowDeselect={false}
-               onChange={(event) => updateUser.mutate({...item, id: item.id, password: "", role: event === null ? "" : event})}
+               onChange={(event) => updateUser.mutate({...item, id: item.id, password: "", role: event === null ? "" : event, lastLogin: "0001-01-01T00:00:00Z"})}
             />
             </Table.Td>
             <Table.Td>