fix(GRA-1387): remove join by sso/basic auth

go.mod

@@ -36,20 +36,14 @@ require (
 )
 
 require (
-	cloud.google.com/go/compute v1.14.0 // indirect
-	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	filippo.io/edwards25519 v1.0.0 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
 	github.com/Microsoft/go-winio v0.5.2 // indirect
 	github.com/bep/debounce v1.2.1 // indirect
-	github.com/coreos/go-oidc/v3 v3.5.0 // indirect
 	github.com/docker/distribution v2.8.1+incompatible // indirect
 	github.com/docker/docker v20.10.17+incompatible // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.4.0 // indirect
-	github.com/felixge/httpsnoop v1.0.3 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-jose/go-jose/v3 v3.0.0 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
@@ -60,7 +54,6 @@ require (
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/go-github/v30 v30.1.0 // indirect
 	github.com/google/go-querystring v1.0.0 // indirect
-	github.com/gorilla/handlers v1.5.1 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
@@ -94,7 +87,6 @@ require (
 	github.com/rqlite/gorqlite v0.0.0-20210514125552-08ff1e76b22f // indirect
 	github.com/samber/lo v1.27.1 // indirect
 	github.com/sirupsen/logrus v1.9.0 // indirect
-	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
 	github.com/spf13/afero v1.9.3 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect

gui/frontend/package.json.md5

@@ -1 +1 @@
-f9fab56505f0bd193d1cb41789de0ea3
+ce83f2292be5a3be258bc8da96ba9236

gui/frontend/src/pages/LoginOption.tsx

@@ -24,18 +24,7 @@ function LoginOption() {
           to={AppRoutes.TOKEN_LOGIN_ROUTE}
           data-testid="login-by-token-btn"
         >
-          By Token/Enrollment Key
-        </Button>
-      </Grid>
-
-      <Grid item xs={12}>
-        <Button
-          variant="contained"
-          component={Link}
-          to={AppRoutes.USERNAME_LOGIN_ROUTE}
-          data-testid="login-by-cred-btn"
-        >
-          Username/Password/SSO
+          By Enrollment Key
         </Button>
       </Grid>
     </Grid>

gui/frontend/src/pages/Networks.tsx

@@ -121,7 +121,7 @@ function Networks() {
                 component={Link}
                 size="medium"
                 style={{ marginLeft: "2rem" }}
-                to={AppRoutes.LOGIN_OPTIONS_ROUTE}
+                to={AppRoutes.TOKEN_LOGIN_ROUTE}
                 data-testid="add-network-btn"
               >
                 Add New

gui/frontend/src/pages/TokenLogin.tsx

@@ -30,7 +30,7 @@ function TokenLogin() {
   const [enrollmentKey, setEnrollmentKey] = useState("");
   const [isConnecting, setIsConnecting] = useState(false);
   const [type, setType] = useState<"access-key" | "enrollment-key">(
-    "access-key"
+    "enrollment-key"
   );
   const navigate = useNavigate();
   const { networksDispatch } = useNetworksContext();
@@ -102,13 +102,8 @@ function TokenLogin() {
           <FormLabel>Token type</FormLabel>
           <RadioGroup
             onChange={(ev, type) => setType(type as any)}
-            defaultValue="access-key"
+            defaultValue="enrollment-key"
           >
-            <FormControlLabel
-              label="Access Key"
-              value="access-key"
-              control={<Radio />}
-            />
             <FormControlLabel
               value="enrollment-key"
               control={<Radio />}
@@ -118,24 +113,6 @@ function TokenLogin() {
         </FormControl>
       </Grid>
 
-      {type === "access-key" && (
-        <Grid item xs={12}>
-          <TextField
-            key="token-inp"
-            label="Token"
-            placeholder="Enter network token"
-            value={token}
-            onChange={(e) => setToken(e.target.value)}
-            error={!isFormValid}
-            helperText={isFormValid ? "" : "Token cannot be empty"}
-            inputProps={{ "data-testid": "token-inp" }}
-          />
-          <br />
-          <Typography variant="caption">
-            *Token can be acquired from Netmaker server
-          </Typography>
-        </Grid>
-      )}
       {type === "enrollment-key" && (
         <Grid item xs={12}>
           <TextField

gui/frontend/tests/pages/LoginOptions.test.tsx

@@ -32,13 +32,10 @@ describe("LoginOptionsPage", () => {
     });
   });
 
-  it("provides login/join options", () => {
+  it("provides login options", () => {
     act(() => {
       expect(screen.getByTestId("login-by-token-btn")).toBeInTheDocument()
-      expect(screen.getByTestId("login-by-token-btn")).toHaveTextContent('By Token/Enrollment Key')
-
-      expect(screen.getByTestId("login-by-cred-btn")).toBeInTheDocument()
-      expect(screen.getByTestId("login-by-cred-btn")).toHaveTextContent('Username/Password/SSO')
+      expect(screen.getByTestId("login-by-token-btn")).toHaveTextContent('By Enrollment Key')
     });
   });
 

gui/frontend/tests/pages/TokenLogin.test.tsx

@@ -43,21 +43,21 @@ describe("TokenLoginPage", () => {
 
   it("provides provides an input to enter token", () => {
     act(() => {
-      expect(screen.getByTestId("token-inp")).toBeInTheDocument()
+      expect(screen.getByTestId("enrollment-key-inp")).toBeInTheDocument()
     });
   });
 
   it("validates token", () => {
     act(() => {
       fireEvent.click(screen.getByTestId("connect-btn"))
     });
-    expect(screen.getByText('Token cannot be empty')).toBeInTheDocument()
+    expect(screen.getByText('Enrollment key cannot be empty')).toBeInTheDocument()
 
     act(() => {
-      fireEvent.change(screen.getByTestId("token-inp"), { target: { value: 'random-token' } })
+      fireEvent.change(screen.getByTestId("enrollment-key-inp"), { target: { value: 'random-token' } })
       fireEvent.click(screen.getByTestId("connect-btn"))
     });
-    expect(screen.queryByText('Token cannot be empty')).toBeNull()
+    expect(screen.queryByText('Enrollment key cannot be empty')).toBeNull()
   });
 
 });