From 70c1c416a208371402ff64da7a2a063f2573c86c Mon Sep 17 00:00:00 2001
From: eglehelms <e.helms@cognigy.com>
Date: Wed, 30 Nov 2022 19:42:39 +0100
Subject: [PATCH] check reroute when logging in

---
 src/containers/internal/views/users/form.tsx |  2 +-
 src/containers/login/login.tsx               | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/containers/internal/views/users/form.tsx b/src/containers/internal/views/users/form.tsx
index d4d4333..5eeca99 100644
--- a/src/containers/internal/views/users/form.tsx
+++ b/src/containers/internal/views/users/form.tsx
@@ -203,7 +203,7 @@ export const UserForm = ({ user }: UserFormProps) => {
                   />
                 </>
               )}
-              {scope !== USER_ACCOUNT && !hasLength(accounts) && (
+              {scope === USER_ACCOUNT && !hasLength(accounts) && (
                 <>
                   <label htmlFor="account">
                     Account:<span>*</span>
diff --git a/src/containers/login/login.tsx b/src/containers/login/login.tsx
index 7aaa341..8c53377 100644
--- a/src/containers/login/login.tsx
+++ b/src/containers/login/login.tsx
@@ -2,18 +2,21 @@ import React, { useEffect, useState } from "react";
 import { Button, H1 } from "jambonz-ui";
 import { useLocation, Navigate } from "react-router-dom";
 
-import { toastError } from "src/store";
+import { toastError, useSelectState } from "src/store";
 import { useAuth } from "src/router/auth";
 import { SESS_UNAUTHORIZED, SESS_OLD_PASSWORD } from "src/constants";
 import { Passwd, Message } from "src/components/forms";
 import {
   ROUTE_INTERNAL_ACCOUNTS,
   ROUTE_CREATE_PASSWORD,
+  ROUTE_INTERNAL_APPLICATIONS,
 } from "src/router/routes";
+import { USER_ACCOUNT } from "src/api/constants";
 
 export const Login = () => {
   const { signin, authorized } = useAuth();
   const location = useLocation();
+  const user = useSelectState("user");
   const [username, setUsername] = useState("");
   const [password, setPassword] = useState("");
   const [message, setMessage] = useState("");
@@ -49,7 +52,11 @@ export const Login = () => {
 
     return (
       <Navigate
-        to={ROUTE_INTERNAL_ACCOUNTS}
+        to={
+          user?.scope !== USER_ACCOUNT
+            ? ROUTE_INTERNAL_ACCOUNTS
+            : ROUTE_INTERNAL_APPLICATIONS
+        }
         state={{ from: location }}
         replace
       />