Push to docker

Add logging
Remove integrations from public repo and sync changes (#369 )
2026-09-23 00:30:43 -07:00 · 2024-04-03 13:35:39 +02:00 · 2024-04-03 13:33:58 +02:00 · 2024-04-02 14:06:38 +02:00 · 2024-04-02 12:26:45 +02:00 · 2024-03-28 11:27:00 +01:00
105 changed files with 2115 additions and 3769 deletions
@@ -2,7 +2,9 @@ name: build and push
 on:
  push:
    branches:
+      - "feature/**"
      - main
+      - debug
    tags:
      - "**"
  pull_request:
@@ -54,7 +56,7 @@ jobs:
        with:
          context: .
          file: docker/Dockerfile
-          push: ${{ github.event_name != 'pull_request' }}
+          push: true
          platforms: linux/amd64,linux/arm64,linux/arm
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
@@ -1,4 +1,3 @@
-# simple server configuration to replace nginx's default
 server {
 	listen 80 default_server;
 	listen [::]:80 default_server;
@@ -7,10 +6,14 @@ server {

    location / {
      try_files $uri $uri.html $uri/ =404;
+      add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0";
+      expires off;
   }

   error_page 404 /404.html;
   location = /404.html {
      internal;
+      add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0";
+      expires off;
   }
 }
@@ -27,6 +27,7 @@
        "@tabler/icons-react": "^2.39.0",
        "@tanstack/match-sorter-utils": "^8.8.4",
        "@tanstack/react-table": "^8.10.7",
+        "@types/crypto-js": "^4.2.2",
        "@types/lodash": "^4.14.200",
        "@types/node": "20.10.6",
        "@types/react": "^18",
@@ -35,6 +36,7 @@
        "class-variance-authority": "^0.7.0",
        "clsx": "^2.0.0",
        "cmdk": "^0.2.0",
+        "crypto-js": "^4.2.0",
        "date-fns": "^2.30.0",
        "dayjs": "^1.11.10",
        "eslint": "^8",
@@ -1661,6 +1663,11 @@
      "resolved": "https://registry.npmjs.org/@types/base64-js/-/base64-js-1.3.2.tgz",
      "integrity": "sha512-Q2Xn2/vQHRGLRXhQ5+BSLwhHkR3JVflxVKywH0Q6fVoAiUE8fFYL2pE5/l2ZiOiBDfA8qUqRnSxln4G/NFz1Sg=="
    },
+    "node_modules/@types/crypto-js": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@types/crypto-js/-/crypto-js-4.2.2.tgz",
+      "integrity": "sha512-sDOLlVbHhXpAUAL0YHDUUwDZf3iN4Bwi4W6a0W0b+QcAezUbRtH4FVb+9J4h+XFPW7l/gQ9F8qC7P+Ec4k8QVQ=="
+    },
    "node_modules/@types/jquery": {
      "version": "3.5.29",
      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.29.tgz",
@@ -2974,6 +2981,11 @@
        "node": ">= 8"
      }
    },
+    "node_modules/crypto-js": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
+      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
+    },
    "node_modules/css-mediaquery": {
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/css-mediaquery/-/css-mediaquery-0.1.2.tgz",
@@ -32,6 +32,7 @@
    "@tabler/icons-react": "^2.39.0",
    "@tanstack/match-sorter-utils": "^8.8.4",
    "@tanstack/react-table": "^8.10.7",
+    "@types/crypto-js": "^4.2.2",
    "@types/lodash": "^4.14.200",
    "@types/node": "20.10.6",
    "@types/react": "^18",
@@ -40,6 +41,7 @@
    "class-variance-authority": "^0.7.0",
    "clsx": "^2.0.0",
    "cmdk": "^0.2.0",
+    "crypto-js": "^4.2.0",
    "date-fns": "^2.30.0",
    "dayjs": "^1.11.10",
    "eslint": "^8",
@@ -5,14 +5,12 @@ import InlineLink from "@components/InlineLink";
 import Paragraph from "@components/Paragraph";
 import { RestrictedAccess } from "@components/ui/RestrictedAccess";
 import useFetchApi from "@utils/api";
-import { isLocalDev, isNetBirdHosted } from "@utils/netbird";
 import { ExternalLinkIcon } from "lucide-react";
 import React from "react";
 import ActivityIcon from "@/assets/icons/ActivityIcon";
 import { ActivityEvent } from "@/interfaces/ActivityEvent";
 import PageContainer from "@/layouts/PageContainer";
 import ActivityTable from "@/modules/activity/ActivityTable";
-import { EventStreamingCard } from "@/modules/integrations/event-streaming/EventStreamingCard";

 export default function Activity() {
  const { data: events, isLoading } = useFetchApi<ActivityEvent[]>("/events");
@@ -50,7 +48,6 @@ export default function Activity() {
        </Paragraph>
      </div>
      <RestrictedAccess page={"Activity"}>
-        {(isLocalDev() || isNetBirdHosted()) && <EventStreamingCard />}
        <ActivityTable events={events} isLoading={isLoading} />
      </RestrictedAccess>
    </PageContainer>
@@ -1,8 +0,0 @@
-import { globalMetaTitle } from "@utils/meta";
-import type { Metadata } from "next";
-import BlankLayout from "@/layouts/BlankLayout";
-
-export const metadata: Metadata = {
-  title: `Integrations - ${globalMetaTitle}`,
-};
-export default BlankLayout;
@@ -1,39 +0,0 @@
-"use client";
-
-import { RestrictedAccess } from "@components/ui/RestrictedAccess";
-import { VerticalTabs } from "@components/VerticalTabs";
-import { FileText, FingerprintIcon } from "lucide-react";
-import { useSearchParams } from "next/navigation";
-import React, { useState } from "react";
-import PageContainer from "@/layouts/PageContainer";
-import EventStreamingTab from "@/modules/integrations/event-streaming/EventStreamingTab";
-import IdentityProviderTab from "@/modules/integrations/idp-sync/IdentityProviderTab";
-
-export default function Integrations() {
-  const searchParams = useSearchParams();
-  const currentTab = searchParams.get("tab");
-  const [tab, setTab] = useState(currentTab || "event-streaming");
-
-  return (
-    <PageContainer>
-      <VerticalTabs value={tab} onChange={setTab}>
-        <VerticalTabs.List>
-          <VerticalTabs.Trigger value="event-streaming">
-            <FileText size={14} />
-            Event Streaming
-          </VerticalTabs.Trigger>
-          <VerticalTabs.Trigger value="identity-provider">
-            <FingerprintIcon size={14} />
-            Identity Provider
-          </VerticalTabs.Trigger>
-        </VerticalTabs.List>
-        <RestrictedAccess page={"Integrations"}>
-          <div className={"border-l border-nb-gray-930 w-full"}>
-            <EventStreamingTab />
-            <IdentityProviderTab />
-          </div>
-        </RestrictedAccess>
-      </VerticalTabs>
-    </PageContainer>
-  );
-}
@@ -26,25 +26,32 @@ import TextWithTooltip from "@components/ui/TextWithTooltip";
 import { IconCloudLock, IconInfoCircle } from "@tabler/icons-react";
 import useFetchApi from "@utils/api";
 import dayjs from "dayjs";
-import { trim } from "lodash";
+import { isEmpty, trim } from "lodash";
 import {
  Cpu,
+  FlagIcon,
  Globe,
  History,
+  LockIcon,
  MapPin,
  MonitorSmartphoneIcon,
+  NetworkIcon,
  PencilIcon,
  TerminalSquare,
 } from "lucide-react";
 import { useRouter, useSearchParams } from "next/navigation";
 import { toASCII } from "punycode";
 import React, { useMemo, useState } from "react";
+import Skeleton from "react-loading-skeleton";
 import { useSWRConfig } from "swr";
+import RoundedFlag from "@/assets/countries/RoundedFlag";
 import CircleIcon from "@/assets/icons/CircleIcon";
 import NetBirdIcon from "@/assets/icons/NetBirdIcon";
 import PeerIcon from "@/assets/icons/PeerIcon";
+import { useCountries } from "@/contexts/CountryProvider";
 import PeerProvider, { usePeer } from "@/contexts/PeerProvider";
 import RoutesProvider from "@/contexts/RoutesProvider";
+import { useLoggedInUser } from "@/contexts/UsersProvider";
 import { useHasChanges } from "@/hooks/useHasChanges";
 import { getOperatingSystem } from "@/hooks/useOperatingSystem";
 import { OperatingSystem } from "@/interfaces/OperatingSystem";
@@ -119,6 +126,8 @@ function PeerOverview() {
    });
  };

+  const { isUser } = useLoggedInUser();
+
  return (
    <PageContainer>
      <RoutesProvider>
@@ -139,33 +148,35 @@ function PeerOverview() {
                  <CircleIcon
                    active={peer.connected}
                    size={12}
-                    className={"mb-[3px]"}
+                    className={"mb-[3px] shrink-0"}
                  />
                  <TextWithTooltip text={name} maxChars={30} />

-                  <Modal
-                    open={showEditNameModal}
-                    onOpenChange={setShowEditNameModal}
-                  >
-                    <ModalTrigger>
-                      <div
-                        className={
-                          "flex items-center gap-2 dark:text-neutral-300 text-neutral-500 hover:text-neutral-100 transition-all hover:bg-nb-gray-800/60 py-2 px-3 rounded-md cursor-pointer"
-                        }
-                      >
-                        <PencilIcon size={16} />
-                      </div>
-                    </ModalTrigger>
-                    <EditNameModal
-                      onSuccess={(newName) => {
-                        setName(newName);
-                        setShowEditNameModal(false);
-                      }}
-                      peer={peer}
-                      initialName={name}
-                      key={showEditNameModal ? 1 : 0}
-                    />
-                  </Modal>
+                  {!isUser && (
+                    <Modal
+                      open={showEditNameModal}
+                      onOpenChange={setShowEditNameModal}
+                    >
+                      <ModalTrigger>
+                        <div
+                          className={
+                            "flex items-center gap-2 dark:text-neutral-300 text-neutral-500 hover:text-neutral-100 transition-all hover:bg-nb-gray-800/60 py-2 px-3 rounded-md cursor-pointer"
+                          }
+                        >
+                          <PencilIcon size={16} />
+                        </div>
+                      </ModalTrigger>
+                      <EditNameModal
+                        onSuccess={(newName) => {
+                          setName(newName);
+                          setShowEditNameModal(false);
+                        }}
+                        peer={peer}
+                        initialName={name}
+                        key={showEditNameModal ? 1 : 0}
+                      />
+                    </Modal>
+                  )}
                </h1>
                <LoginExpiredBadge loginExpired={peer.login_expired} />
              </div>
@@ -187,7 +198,7 @@ function PeerOverview() {
                variant={"primary"}
                className={"w-full"}
                onClick={() => updatePeer()}
-                disabled={!hasChanges}
+                disabled={!hasChanges || isUser}
              >
                Save Changes
              </Button>
@@ -205,18 +216,32 @@ function PeerOverview() {
                      "flex gap-2 items-center !text-nb-gray-300 text-xs"
                    }
                  >
-                    <IconInfoCircle size={14} />
-                    <span>
-                      Login expiration is disabled for all peers added with an
-                      setup-key.
-                    </span>
+                    {!peer.user_id ? (
+                      <>
+                        <>
+                          <IconInfoCircle size={14} />
+                          <span>
+                            Login expiration is disabled for all peers added
+                            with an setup-key.
+                          </span>
+                        </>
+                      </>
+                    ) : (
+                      <>
+                        <LockIcon size={14} />
+                        <span>
+                          {`You don't have the required permissions to update this
+                          setting.`}
+                        </span>
+                      </>
+                    )}
                  </div>
                }
                className={"w-full block"}
-                disabled={!!peer.user_id}
+                disabled={!!peer.user_id && !isUser}
              >
                <FancyToggleSwitch
-                  disabled={!peer.user_id}
+                  disabled={!peer.user_id || isUser}
                  value={loginExpiration}
                  onChange={setLoginExpiration}
                  label={
@@ -230,33 +255,74 @@ function PeerOverview() {
                  }
                />
              </FullTooltip>
-              <FancyToggleSwitch
-                value={ssh}
-                onChange={(set) =>
-                  !set
-                    ? setSsh(false)
-                    : openSSHDialog().then((confirm) => setSsh(confirm))
+              <FullTooltip
+                content={
+                  <div
+                    className={
+                      "flex gap-2 items-center !text-nb-gray-300 text-xs"
+                    }
+                  >
+                    <LockIcon size={14} />
+                    <span>
+                      {`You don't have the required permissions to update this
+                          setting.`}
+                    </span>
+                  </div>
                }
-                label={
-                  <>
-                    <TerminalSquare size={16} />
-                    SSH Access
-                  </>
-                }
-                helpText={
-                  "Enable the SSH server on this peer to access the machine via an secure shell."
-                }
-              />
+                interactive={false}
+                className={"w-full block"}
+                disabled={!isUser}
+              >
+                <FancyToggleSwitch
+                  value={ssh}
+                  disabled={isUser}
+                  onChange={(set) =>
+                    !set
+                      ? setSsh(false)
+                      : openSSHDialog().then((confirm) => setSsh(confirm))
+                  }
+                  label={
+                    <>
+                      <TerminalSquare size={16} />
+                      SSH Access
+                    </>
+                  }
+                  helpText={
+                    "Enable the SSH server on this peer to access the machine via an secure shell."
+                  }
+                />
+              </FullTooltip>
+
              <div>
                <Label>Assigned Groups</Label>
                <HelpText>
                  Use groups to control what this peer can access.
                </HelpText>
-                <PeerGroupSelector
-                  onChange={setSelectedGroups}
-                  values={selectedGroups}
-                  peer={peer}
-                />
+                <FullTooltip
+                  content={
+                    <div
+                      className={
+                        "flex gap-2 items-center !text-nb-gray-300 text-xs"
+                      }
+                    >
+                      <LockIcon size={14} />
+                      <span>
+                        {`You don't have the required permissions to update this
+                          setting.`}
+                      </span>
+                    </div>
+                  }
+                  interactive={false}
+                  className={"w-full block"}
+                  disabled={!isUser}
+                >
+                  <PeerGroupSelector
+                    disabled={isUser}
+                    onChange={setSelectedGroups}
+                    values={selectedGroups}
+                    peer={peer}
+                  />
+                </FullTooltip>
              </div>
            </div>
          </div>
@@ -264,7 +330,7 @@ function PeerOverview() {

        <Separator />

-        {isLinux ? (
+        {isLinux && !isUser ? (
          <div className={"px-8 py-6"}>
            <div className={"max-w-6xl"}>
              <div className={"flex justify-between items-center"}>
@@ -291,10 +357,18 @@ function PeerOverview() {
 }

 function PeerInformationCard({ peer }: { peer: Peer }) {
+  const { isLoading, getRegionByPeer } = useCountries();
+
+  const countryText = useMemo(() => {
+    return getRegionByPeer(peer);
+  }, [getRegionByPeer, peer]);
+
  return (
    <Card>
      <Card.List>
        <Card.ListItem
+          copy
+          copyText={"NetBird IP-Address"}
          label={
            <>
              <MapPin size={16} />
@@ -305,6 +379,20 @@ function PeerInformationCard({ peer }: { peer: Peer }) {
        />

        <Card.ListItem
+          copy
+          copyText={"Public IP-Address"}
+          label={
+            <>
+              <NetworkIcon size={16} />
+              Public IP-Address
+            </>
+          }
+          value={peer.connection_ip}
+        />
+
+        <Card.ListItem
+          copy
+          copyText={"Domain name"}
          label={
            <>
              <Globe size={16} />
@@ -313,7 +401,10 @@ function PeerInformationCard({ peer }: { peer: Peer }) {
          }
          value={peer.dns_label}
        />
+
        <Card.ListItem
+          copy
+          copyText={"Hostname"}
          label={
            <>
              <MonitorSmartphoneIcon size={16} />
@@ -322,6 +413,35 @@ function PeerInformationCard({ peer }: { peer: Peer }) {
          }
          value={peer.hostname}
        />
+
+        <Card.ListItem
+          label={
+            <>
+              <FlagIcon size={16} />
+              Region
+            </>
+          }
+          tooltip={false}
+          value={
+            isEmpty(peer.country_code) ? (
+              "Unknown"
+            ) : (
+              <>
+                {isLoading ? (
+                  <Skeleton width={140} />
+                ) : (
+                  <div className={"flex gap-2 items-center"}>
+                    <div className={"border-0 border-nb-gray-800 rounded-full"}>
+                      <RoundedFlag country={peer.country_code} size={12} />
+                    </div>
+                    {countryText}
+                  </div>
+                )}
+              </>
+            )
+          }
+        />
+
        <Card.ListItem
          label={
            <>
@@ -347,6 +467,7 @@ function PeerInformationCard({ peer }: { peer: Peer }) {
                ")"
          }
        />
+
        <Card.ListItem
          label={
            <>
@@ -6,17 +6,39 @@ import Paragraph from "@components/Paragraph";
 import SkeletonTable from "@components/skeletons/SkeletonTable";
 import useFetchApi from "@utils/api";
 import { ExternalLinkIcon } from "lucide-react";
-import React, { lazy, Suspense } from "react";
+import React, { lazy, Suspense, useEffect } from "react";
 import PeerIcon from "@/assets/icons/PeerIcon";
-import { useUsers } from "@/contexts/UsersProvider";
+import { useGroups } from "@/contexts/GroupsProvider";
+import { useLoggedInUser, useUsers } from "@/contexts/UsersProvider";
 import { Peer } from "@/interfaces/Peer";
 import PageContainer from "@/layouts/PageContainer";
+import { SetupModalContent } from "@/modules/setup-netbird-modal/SetupModal";

 const PeersTable = lazy(() => import("@/modules/peers/PeersTable"));

 export default function Peers() {
+  const { permission } = useLoggedInUser();
+
+  return (
+    <PageContainer>
+      {permission?.dashboard_view === "blocked" ? (
+        <PeersBlockedView />
+      ) : (
+        <PeersView />
+      )}
+    </PageContainer>
+  );
+}
+
+function PeersView() {
  const { data: peers, isLoading } = useFetchApi<Peer[]>("/peers");
  const { users } = useUsers();
+  const { refresh } = useGroups();
+
+  useEffect(() => {
+    refresh();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);

  const peersWithUser = peers?.map((peer) => {
    if (!users) return peer;
@@ -27,7 +49,7 @@ export default function Peers() {
  });

  return (
-    <PageContainer>
+    <>
      <div className={"p-default py-6"}>
        <Breadcrumbs>
          <Breadcrumbs.Item
@@ -56,6 +78,37 @@ export default function Peers() {
      <Suspense fallback={<SkeletonTable />}>
        <PeersTable isLoading={isLoading} peers={peersWithUser} />
      </Suspense>
-    </PageContainer>
+    </>
+  );
+}
+
+function PeersBlockedView() {
+  return (
+    <div className={"flex items-center justify-center flex-col"}>
+      <div className={"p-default py-6 max-w-3xl text-center"}>
+        <h1>Add new device to your network</h1>
+        <Paragraph className={"inline"}>
+          To get started, install NetBird and log in using your email account.
+          After that you should be connected. If you have further questions
+          check out our{" "}
+          <InlineLink
+            href={"https://docs.netbird.io/how-to/getting-started#installation"}
+            target={"_blank"}
+          >
+            Installation Guide
+            <ExternalLinkIcon size={12} />
+          </InlineLink>
+        </Paragraph>
+      </div>
+      <div className={"px-3 pt-1 pb-8 max-w-3xl w-full"}>
+        <div
+          className={
+            "rounded-md border border-nb-gray-900/70 grid w-full bg-nb-gray-930/40 stepper-bg-variant"
+          }
+        >
+          <SetupModalContent header={false} footer={false} />
+        </div>
+      </div>
+    </div>
  );
 }
@@ -2,20 +2,35 @@

 import { RestrictedAccess } from "@components/ui/RestrictedAccess";
 import { VerticalTabs } from "@components/VerticalTabs";
-import { AlertOctagonIcon, FolderGit2Icon, ShieldIcon } from "lucide-react";
-import React, { useState } from "react";
+import {
+  AlertOctagonIcon,
+  FolderGit2Icon,
+  LockIcon,
+  ShieldIcon,
+} from "lucide-react";
+import { useSearchParams } from "next/navigation";
+import React, { useEffect, useState } from "react";
 import { useLoggedInUser } from "@/contexts/UsersProvider";
 import PageContainer from "@/layouts/PageContainer";
 import { useAccount } from "@/modules/account/useAccount";
 import AuthenticationTab from "@/modules/settings/AuthenticationTab";
 import DangerZoneTab from "@/modules/settings/DangerZoneTab";
 import GroupsTab from "@/modules/settings/GroupsTab";
+import PermissionsTab from "@/modules/settings/PermissionsTab";

 export default function NetBirdSettings() {
-  const [tab, setTab] = useState("authentication");
+  const queryParams = useSearchParams();
+  const queryTab = queryParams.get("tab");
+  const [tab, setTab] = useState(queryTab || "authentication");
  const { isOwner } = useLoggedInUser();
  const account = useAccount();

+  useEffect(() => {
+    if (queryTab) {
+      setTab(queryTab);
+    }
+  }, [queryTab]);
+
  return (
    <PageContainer>
      <VerticalTabs value={tab} onChange={setTab}>
@@ -28,6 +43,10 @@ export default function NetBirdSettings() {
            <FolderGit2Icon size={14} />
            Groups
          </VerticalTabs.Trigger>
+          <VerticalTabs.Trigger value="permissions">
+            <LockIcon size={14} />
+            Permissions
+          </VerticalTabs.Trigger>
          <VerticalTabs.Trigger value="danger-zone" disabled={!isOwner}>
            <AlertOctagonIcon size={14} />
            Danger zone
@@ -36,6 +55,7 @@ export default function NetBirdSettings() {
        <RestrictedAccess page={"Settings"}>
          <div className={"border-l border-nb-gray-930 w-full"}>
            {account && <AuthenticationTab account={account} />}
+            {account && <PermissionsTab account={account} />}
            {account && <GroupsTab account={account} />}
            {account && <DangerZoneTab account={account} />}
          </div>
@@ -57,7 +57,7 @@ function UserOverview({ user }: Props) {
  const router = useRouter();
  const userRequest = useApiCall<User>("/users");
  const { mutate } = useSWRConfig();
-  const { loggedInUser, isOwnerOrAdmin } = useLoggedInUser();
+  const { loggedInUser, isOwnerOrAdmin, isUser } = useLoggedInUser();
  const isLoggedInUser = loggedInUser ? loggedInUser?.id === user.id : false;

  const initialGroups = user.auto_groups;
@@ -104,6 +104,7 @@ function UserOverview({ user }: Props) {
          <Breadcrumbs.Item
            href={"/team"}
            label={"Team"}
+            disabled={isUser}
            icon={<TeamIcon size={13} />}
          />

@@ -117,6 +118,7 @@ function UserOverview({ user }: Props) {
            <Breadcrumbs.Item
              href={"/team/users"}
              label={"Users"}
+              disabled={isUser}
              icon={<User2 size={16} />}
            />
          )}
@@ -156,28 +158,30 @@ function UserOverview({ user }: Props) {
              </h1>
            </div>
          </div>
-          <div className={"flex gap-4"}>
-            <Button
-              variant={"default"}
-              className={"w-full"}
-              onClick={() => {
-                user.is_service_user
-                  ? router.push("/team/service-users")
-                  : router.push("/team/users");
-              }}
-            >
-              Cancel
-            </Button>
+          {!isUser && (
+            <div className={"flex gap-4"}>
+              <Button
+                variant={"default"}
+                className={"w-full"}
+                onClick={() => {
+                  user.is_service_user
+                    ? router.push("/team/service-users")
+                    : router.push("/team/users");
+                }}
+              >
+                Cancel
+              </Button>

-            <Button
-              variant={"primary"}
-              className={"w-full"}
-              disabled={!hasChanges}
-              onClick={save}
-            >
-              Save Changes
-            </Button>
-          </div>
+              <Button
+                variant={"primary"}
+                className={"w-full"}
+                disabled={!hasChanges}
+                onClick={save}
+              >
+                Save Changes
+              </Button>
+            </div>
+          )}
        </div>

        <div className={"flex gap-10 w-full mt-8 max-w-6xl"}>
@@ -190,6 +194,7 @@ function UserOverview({ user }: Props) {
                  Groups will be assigned to peers added by this user.
                </HelpText>
                <PeerGroupSelector
+                  disabled={isUser}
                  onChange={setSelectedGroups}
                  values={selectedGroups}
                />
@@ -64,4 +64,8 @@ p {
    display: table;
    position: relative;
    width: 100%;
+}
+
+.stepper-bg-variant .step-circle {
+    @apply !border-[#1d2024];
 }
@@ -5,7 +5,7 @@ export type IconProps = {
 };

 export const defaultIconProps: IconProps = {
-  size: 16,
+  size: 15,
  className:
    "dark:fill-nb-gray-400 fill-gray-500 peer-data-[active=true]/icon:dark:fill-white peer-data-[active=true]/icon:fill-gray-900 shrink-0",
  autoHeight: false,
@@ -0,0 +1,19 @@
+<svg width="133" height="23" viewBox="0 0 133 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_0_3)">
+<path d="M46.9438 7.5013C48.1229 8.64688 48.7082 10.3025 48.7082 12.4683V21.6663H46.1411V12.8362C46.1411 11.2809 45.7481 10.0851 44.9704 9.26566C44.1928 8.43783 43.1308 8.0281 41.7846 8.0281C40.4383 8.0281 39.3345 8.45455 38.5234 9.30747C37.7123 10.1604 37.3109 11.4063 37.3109 13.0369V21.6663H34.7188V6.06305H37.3109V8.28732C37.821 7.49294 38.5234 6.87416 39.4014 6.43934C40.2878 6.00452 41.2578 5.78711 42.3197 5.78711C44.2179 5.78711 45.7565 6.36408 46.9355 7.50966L46.9438 7.5013Z" fill="#F2F2F2"/>
+<path d="M67.1048 14.8344H54.6288C54.7208 16.373 55.2476 17.5771 56.2092 18.4384C57.1708 19.2997 58.3331 19.7345 59.6961 19.7345C60.8166 19.7345 61.7531 19.4753 62.4973 18.9485C63.2499 18.4301 63.7767 17.7277 64.0777 16.858H66.8706C66.4525 18.3548 65.6163 19.5756 64.3621 20.5205C63.1078 21.4571 61.5525 21.9337 59.6878 21.9337C58.2077 21.9337 56.8865 21.5992 55.7159 20.9386C54.5452 20.278 53.6337 19.3331 52.9648 18.1039C52.2958 16.8831 51.9697 15.4616 51.9697 13.8477C51.9697 12.2339 52.2958 10.8207 52.9397 9.60825C53.5836 8.39578 54.495 7.45924 55.6573 6.80702C56.828 6.15479 58.1659 5.82031 59.6878 5.82031C61.2096 5.82031 62.4806 6.14643 63.6178 6.79029C64.7551 7.43416 65.6331 8.32052 66.2518 9.44938C66.8706 10.5782 67.18 11.8576 67.18 13.2791C67.18 13.7725 67.1549 14.2909 67.0964 14.8428L67.1048 14.8344ZM63.8603 10.1769C63.4255 9.4661 62.8318 8.92258 62.0793 8.55465C61.3267 8.18673 60.4989 8.00277 59.5874 8.00277C58.2746 8.00277 57.1625 8.42086 56.2427 9.25705C55.3228 10.0932 54.796 11.2472 54.6623 12.7356H64.5126C64.5126 11.7489 64.2952 10.896 63.8603 10.1852V10.1769Z" fill="#F2F2F2"/>
+<path d="M73.7695 8.20355V17.4016C73.7695 18.1626 73.9284 18.6977 74.2545 19.0071C74.5806 19.3165 75.1409 19.4754 75.9352 19.4754H77.8418V21.6662H75.5088C74.0622 21.6662 72.9835 21.3317 72.2644 20.6711C71.5452 20.0105 71.1857 18.9151 71.1857 17.3933V8.19519H69.1621V6.0629H71.1857V2.13281H73.7779V6.0629H77.8501V8.19519H73.7779L73.7695 8.20355Z" fill="#F2F2F2"/>
+<path d="M85.9022 6.68902C86.9307 6.10369 88.093 5.80266 89.4058 5.80266C90.8106 5.80266 92.0732 6.13714 93.1937 6.79773C94.3142 7.46668 95.2006 8.39485 95.8444 9.59896C96.4883 10.8031 96.8144 12.2079 96.8144 13.7966C96.8144 15.3854 96.4883 16.7818 95.8444 18.011C95.2006 19.2486 94.3142 20.2018 93.1854 20.8875C92.0565 21.5732 90.7939 21.916 89.4141 21.916C88.0344 21.916 86.8805 21.6234 85.8687 21.0297C84.8569 20.4443 84.0876 19.6918 83.5775 18.7803V21.6568H80.9854V0.601562H83.5775V8.97182C84.1127 8.04365 84.8904 7.28272 85.9105 6.69738L85.9022 6.68902ZM93.4529 10.7362C92.9763 9.86654 92.3408 9.19759 91.5297 8.74605C90.7186 8.29451 89.8322 8.06037 88.8706 8.06037C87.909 8.06037 87.0394 8.29451 86.2366 8.75441C85.4255 9.22268 84.7817 9.89163 84.2967 10.778C83.8117 11.6643 83.5692 12.6845 83.5692 13.8384C83.5692 14.9924 83.8117 16.046 84.2967 16.9323C84.7817 17.8187 85.4255 18.4877 86.2366 18.9559C87.0394 19.4242 87.9174 19.65 88.8706 19.65C89.8239 19.65 90.727 19.4158 91.5297 18.9559C92.3324 18.4877 92.9763 17.8187 93.4529 16.9323C93.9296 16.046 94.1637 15.0091 94.1637 13.8134C94.1637 12.6176 93.9296 11.6142 93.4529 10.7362Z" fill="#F2F2F2"/>
+<path d="M100.318 3.01864C99.9749 2.67581 99.8076 2.25771 99.8076 1.76436C99.8076 1.27101 99.9749 0.852913 100.318 0.510076C100.661 0.167238 101.079 0 101.572 0C102.065 0 102.45 0.167238 102.784 0.510076C103.119 0.852913 103.286 1.27101 103.286 1.76436C103.286 2.25771 103.119 2.67581 102.784 3.01864C102.45 3.36148 102.049 3.52872 101.572 3.52872C101.095 3.52872 100.661 3.36148 100.318 3.01864ZM102.826 6.06237V21.6657H100.234V6.06237H102.826Z" fill="#F2F2F2"/>
+<path d="M111.773 6.52155C112.617 6.0282 113.646 5.77734 114.867 5.77734V8.45315H114.181C111.28 8.45315 109.825 10.0252 109.825 13.1776V21.6649H107.232V6.06165H109.825V8.5953C110.276 7.70058 110.928 7.00654 111.773 6.51319V6.52155Z" fill="#F2F2F2"/>
+<path d="M117.861 9.60732C118.505 8.40321 119.391 7.46668 120.52 6.80609C121.649 6.1455 122.92 5.81102 124.325 5.81102C125.537 5.81102 126.666 6.09533 127.711 6.64721C128.757 7.20746 129.551 7.94331 130.103 8.85475V0.601562H132.72V21.6735H130.103V18.7385C129.593 19.6667 128.832 20.436 127.828 21.0297C126.825 21.6317 125.646 21.9244 124.3 21.9244C122.953 21.9244 121.657 21.5816 120.528 20.8959C119.4 20.2102 118.513 19.257 117.869 18.0194C117.226 16.7818 116.899 15.377 116.899 13.805C116.899 12.233 117.226 10.8114 117.869 9.60732H117.861ZM129.392 10.7613C128.915 9.89163 128.28 9.22268 127.469 8.75441C126.658 8.28614 125.771 8.06037 124.81 8.06037C123.848 8.06037 122.962 8.28614 122.159 8.74605C121.356 9.20595 120.729 9.86654 120.253 10.7362C119.776 11.6058 119.542 12.6343 119.542 13.8134C119.542 14.9924 119.776 16.046 120.253 16.9323C120.729 17.8187 121.365 18.4877 122.159 18.9559C122.953 19.4242 123.84 19.65 124.81 19.65C125.78 19.65 126.666 19.4158 127.469 18.9559C128.272 18.4877 128.915 17.8187 129.392 16.9323C129.869 16.046 130.103 15.0175 130.103 13.8384C130.103 12.6594 129.869 11.6393 129.392 10.7613Z" fill="#F2F2F2"/>
+<path d="M21.4651 0.568359C17.8193 0.902835 16.0047 3.00167 15.3191 4.06363L4.66602 22.5183H17.5182L30.1949 0.568359H21.4651Z" fill="#F68330"/>
+<path d="M17.5265 22.5187L0 3.9302C0 3.9302 19.8177 -1.39633 21.7493 15.2188L17.5265 22.5187Z" fill="#F68330"/>
+<path d="M14.9255 4.75055L9.54883 14.0657L17.5177 22.5196L21.7405 15.2029C21.0715 9.49174 18.287 6.37276 14.9255 4.74219" fill="#F35E32"/>
+</g>
+<defs>
+<clipPath id="clip0_0_3">
+<rect width="132.72" height="22.5186" fill="white"/>
+</clipPath>
+</defs>
+</svg>
@@ -34,7 +34,7 @@ const auth0AuthorityConfig: AuthorityConfiguration = {

 const onEvent = (configurationName: any, eventName: any, data: any) => {
  if (process.env.NODE_ENV !== "production") {
-    //console.info(`oidc:${configurationName}:${eventName}`, data);
+    console.info(`oidc:${configurationName}:${eventName}`, data);
  }
 };

@@ -1,4 +1,5 @@
 import { OidcSecure, useOidc } from "@axa-fr/react-oidc";
+import loadConfig from "@utils/config";
 import { usePathname } from "next/navigation";
 import * as React from "react";
 import { useEffect } from "react";
@@ -6,13 +7,18 @@ import { useEffect } from "react";
 type Props = {
  children: React.ReactNode;
 };
+
+const config = loadConfig();
+
 export const SecureProvider = ({ children }: Props) => {
  const { isAuthenticated, login } = useOidc();
  const currentPath = usePathname();

  useEffect(() => {
+    console.log("isAuthenticated", isAuthenticated);
    if (!isAuthenticated) {
-      login(currentPath);
+      console.info("Not authenticated, logging in...");
+      login(currentPath, { client_id: config.clientId });
    }
  }, [currentPath, isAuthenticated, login]);

@@ -15,13 +15,25 @@ type ItemProps = {
  label: string;
  icon?: React.ReactNode;
  active?: boolean;
+  disabled?: boolean;
 };

-export const Item = ({ href, label, icon, active }: ItemProps) => {
+export const Item = ({
+  href,
+  label,
+  icon,
+  active,
+  disabled = false,
+}: ItemProps) => {
  const router = useRouter();

  return (
-    <div className={"flex items-center gap-2 group"}>
+    <div
+      className={cn(
+        "flex items-center gap-2 group",
+        disabled && "pointer-events-none",
+      )}
+    >
      <ChevronRightIcon
        size={16}
        className={"text-nb-gray-400 group-first:hidden"}
@@ -30,6 +30,8 @@ type CardListItemProps = {
  value: React.ReactNode;
  className?: string;
  copy?: boolean;
+  copyText?: string;
+  tooltip?: boolean;
 };

 function CardListItem({
@@ -37,6 +39,8 @@ function CardListItem({
  value,
  className,
  copy = false,
+  copyText,
+  tooltip = true,
 }: CardListItemProps) {
  const [, copyToClipBoard] = useCopyToClipboard(value as string);

@@ -54,11 +58,18 @@ function CardListItem({
          copy && "cursor-pointer hover:text-nb-gray-300 transition-all",
        )}
        onClick={() =>
-          copy && copyToClipBoard(`${label} has been copied to clipboard.`)
+          copy &&
+          copyToClipBoard(
+            `${copyText ? copyText : label} has been copied to clipboard.`,
+          )
        }
      >
-        <TextWithTooltip text={value as string} maxChars={40} />
-        {copy && <Copy size={13} />}
+        {tooltip ? (
+          <TextWithTooltip text={value as string} maxChars={40} />
+        ) : (
+          value
+        )}
+        {copy && <Copy size={13} className={"shrink-0"} />}
      </div>
    </li>
  );
@@ -28,12 +28,16 @@ export default function CopyToClipboardText({ children, message }: Props) {

      {copied ? (
        <CheckIcon
-          className={"text-nb-gray-100 opacity-0 group-hover:opacity-100"}
+          className={
+            "text-nb-gray-100 opacity-0 group-hover:opacity-100 shrink-0"
+          }
          size={12}
        />
      ) : (
        <CopyIcon
-          className={"text-nb-gray-100 opacity-0 group-hover:opacity-100"}
+          className={
+            "text-nb-gray-100 opacity-0 group-hover:opacity-100 shrink-0"
+          }
          size={12}
        />
      )}
Author	SHA1	Message	Date
Eduard Gert	5e8048dd20	Push to docker	2024-04-03 13:35:39 +02:00
Eduard Gert	97255dd882	Add logging	2024-04-03 13:33:58 +02:00
Eduard Gert	6d4716cdad	Remove integrations from public repo and sync changes (#369 ) * Change icon size * Remove integrations * Add no cache header * Add analytics event tracking * Add small announcement improvements * Remove peer approval setting * Do not load countries when user has no permission * Add tab query params to settings * Decrease navigation font size * Change order of providers * Increase padding for modals * Show page only when user is fully loaded and found * Remove unused state * Remove integrations page	2024-04-02 14:06:38 +02:00
amplitudes	859916b1df	fix: user deletion notification (#367 )	2024-04-02 12:26:45 +02:00
Eduard Gert	80ce7d21b0	Fix issue where the first users cache is not populated (#366 )	2024-03-28 11:27:00 +01:00
Eduard Gert	06fdbd8ec4	Hide profile settings and announcements for blocked dashboard view (#365 )	2024-03-28 10:25:21 +01:00
Eduard Gert	973cceff79	Add setting to change dashboard view for regular users (#362 )	2024-03-27 16:09:58 +01:00
Eduard Gert	f4a2d6fae8	Add Okta SCIM integration (#361 ) * Add Okta integration (wip) * Update okta setup dialog * Add okta integration images * Add error handling for 500 status codes * Add okta integration * Fix lint warnings * Update azures last sync time * Remove 'on' from step, disable copy for HTTP Header * Update text for custom IDP	2024-03-27 15:55:56 +01:00
Eduard Gert	cb922b46b7	Add 'Offline' filter to peers table (#364 )	2024-03-26 20:03:24 +01:00
Eduard Gert	4c56ae704c	Show peers for regular users but hide / disable actions (delete, enable ssh etc.) (#360 ) * Show peers for regular users but hide / disable actions (delete, enable ssh etc.) * Do not load countries for regular users	2024-03-21 14:21:26 +01:00
Eduard Gert	fe6d8c9bd5	Add support for decimal expiration time and switch to days if interval exceeds 48h (#357 ) * Add helper function to check for integer * Add support for decimal expiration time and switch to days if interval exceeds 48h	2024-03-15 15:54:06 +01:00
Eduard Gert	121976d101	Add option to copy peer details (ip, public ip, hostname, domain name) in detailed peer view (#356 )	2024-03-15 13:46:27 +01:00
Eduard Gert	f7071e00b6	Add reset filter button (#355 )	2024-03-15 13:43:00 +01:00
Eduard Gert	6b73ccf102	Fix search resetting when selecting a group (#354 )	2024-03-15 13:35:25 +01:00
Eduard GertandMaycon Santos	87dcd00264	Fix peer groups occasionally not refreshing (#351 ) * Trigger groups refresh when visiting peers page * Disable exhaustive-deps linter --------- Co-authored-by: Maycon Santos <mlsmaycon@gmail.com>	2024-03-15 13:34:47 +01:00
Eduard Gert	99f1bcc375	Reduce information visible to regular users (non-adminstrators) (#353 ) reducing visibility to display only add peer information	2024-03-15 13:25:40 +01:00
Eduard Gert	bf34c55110	Fix JWT group sync checkbox using wrong variable (#352 )	2024-03-12 17:23:42 +01:00
Eduard Gert	1dfc6e2d75	Add announcement banner to show updates or important information (#350 ) * Add contrast color * Add crypto-js for md5 hash * Add announcement banner	2024-03-11 15:31:52 +01:00
Eduard Gert	b7860a8786	Filter peers by id instead of name in peer dropdown selector (#347 )	2024-03-09 18:07:45 +01:00
Eduard Gert	c9172e3a5f	Show full netbird logo on desktop and netbird logomark on mobile (#348 )	2024-03-09 18:07:26 +01:00
Eduard Gert	78d75134f9	Add better description for posture check activity events (#349 )	2024-03-09 17:14:41 +01:00
Eduard Gert	071feb02f9	Fix SSO expiration dropdown to reflect the actual "Hours" or "Days" (#345 )	2024-03-01 17:01:26 +01:00
Eduard Gert	8e7bcc0c22	Extend posture checks with peer network range check (#344 ) add support to peer network checks	2024-02-27 16:15:47 +01:00
Eduard Gert	02a0b71e46	Fix setup key modal closing on first time creation (#342 )	2024-02-26 18:02:56 +01:00
Eduard Gert	a8b66d935f	Show loading indicator for peer detail view as groups are loading (#343 )	2024-02-26 18:02:28 +01:00
Eduard GertandMaycon Santos	f74f9cf812	Add region and public ip to peer table and detailed peer view (#340 ) * Fix group badge icon size * Fix copy icon size * Add region information to peer table and single peer view * Push to docker * Change login expired icon size * Fix country flag in single peer view * Change country flag size in peer table * Disable revalidation for countries * Fix icon size on peer detail view * Rollback workflow * Revert login expiration --------- Co-authored-by: Maycon Santos <mlsmaycon@gmail.com>	2024-02-23 15:52:33 +01:00