UI preferences: #153 #155

ui/src/App.tsx

@@ -97,9 +97,11 @@ function App() {
         case "success":
           setError(null);
           setLoginState(
-            resp.response.session === undefined ? "not-logged-in" : "logged-in"
+            resp.response.user?.session === undefined
+              ? "not-logged-in"
+              : "logged-in"
           );
-          setSession(resp.response.session || null);
+          setSession(resp.response.user?.session || null);
           setCameras(resp.response.cameras);
           setTimeZoneName(resp.response.timeZoneName);
       }

ui/src/api.ts

@@ -145,6 +145,12 @@ async function json<T>(
 export interface ToplevelResponse {
   timeZoneName: string;
   cameras: Camera[];
+  user: ToplevelUser | undefined;
+}
+
+export interface ToplevelUser {
+  name: string;
+  id: number;
   session: Session | undefined;
 }
 

ui/src/types.ts

@@ -10,7 +10,6 @@
 export type StreamType = "main" | "sub";
 
 export interface Session {
-  username: string;
   csrf: string;
 }