refactor: improve type safety and cookie handling in authentication - Updated cookie handling to use await for asynchronous operations - Enhanced type safety in user object properties in getServerUser function - Refactored stellar network conversion functions for clarity and consistency

Author: 0xdevcollins

lib/auth/server-auth.ts

@@ -18,7 +18,7 @@ export interface ServerUser {
 
 export async function getServerUser(): Promise<ServerUser | null> {
   try {
-    const cookieStore = cookies();
+    const cookieStore = await cookies();
     const accessToken = cookieStore.get('accessToken')?.value;
 
     if (!accessToken) {
@@ -28,10 +28,10 @@ export async function getServerUser(): Promise<ServerUser | null> {
     const user = await getMe(accessToken);
 
     return {
-      id: user._id || user.id,
-      email: user.email,
-      name: user.profile?.firstName || user.name,
-      image: user.profile?.avatar || user.image,
+      id: (user._id || user.id) as string,
+      email: user.email as string,
+      name: (user.profile?.firstName || user.name) as string | null,
+      image: (user.profile?.avatar || user.image) as string | null,
       role: user.roles?.[0] === 'ADMIN' ? 'ADMIN' : 'USER',
       isVerified: user.isVerified,
       profile: user.profile,
@@ -53,7 +53,7 @@ export async function requireServerAuth(): Promise<ServerUser> {
 }
 
 export async function getServerAuthHeaders(): Promise<Record<string, string>> {
-  const cookieStore = cookies();
+  const cookieStore = await cookies();
   const accessToken = cookieStore.get('accessToken')?.value;
 
   return accessToken ? { Authorization: `Bearer ${accessToken}` } : {};

lib/wallet-utils.ts

@@ -347,19 +347,19 @@ export function parseNetwork(network: string): NetworkType | null {
 }
 
 /**
- * Convert StellarNetwork enum to NetworkType
- * @param network - StellarNetwork enum value
+ * Convert StellarNetwork type to NetworkType
+ * @param network - StellarNetwork type value
  * @returns NetworkType
  */
 export function stellarNetworkToType(network: StellarNetwork): NetworkType {
-  return network === StellarNetwork.TESTNET ? 'testnet' : 'public';
+  return network === 'testnet' ? 'testnet' : 'public';
 }
 
 /**
- * Convert NetworkType to StellarNetwork enum
+ * Convert NetworkType to StellarNetwork type
  * @param network - NetworkType
- * @returns StellarNetwork enum value
+ * @returns StellarNetwork type value
  */
 export function networkTypeToStellar(network: NetworkType): StellarNetwork {
-  return network === 'testnet' ? StellarNetwork.TESTNET : StellarNetwork.PUBLIC;
+  return network === 'testnet' ? 'testnet' : 'public';
 }