Controller Mode: Navigation Enhancements, Library UX Improvements, and Bitrate Controls

opennow-stable/src/main/gfn/auth.ts

@@ -369,6 +369,12 @@ function mergeTokenSnapshot(base: AuthTokens, refreshed: TokenResponse): AuthTok
   };
 }
 
+function gravatarUrl(email: string, size = 80): string {
+  const normalized = email.trim().toLowerCase();
+  const hash = createHash("md5").update(normalized).digest("hex");
+  return `https://www.gravatar.com/avatar/${hash}?s=${size}&d=identicon`;
+}
+
 async function fetchUserInfo(tokens: AuthTokens): Promise<AuthUser> {
   const jwtToken = tokens.idToken ?? tokens.accessToken;
   const parsed = parseJwtPayload<{
@@ -380,13 +386,18 @@ async function fetchUserInfo(tokens: AuthTokens): Promise<AuthUser> {
   }>(jwtToken);
 
   if (parsed?.sub) {
-    return {
-      userId: parsed.sub,
-      displayName: parsed.preferred_username ?? parsed.email?.split("@")[0] ?? "User",
-      email: parsed.email,
-      avatarUrl: parsed.picture,
-      membershipTier: parsed.gfn_tier ?? "FREE",
-    };
+    const emailFromToken = parsed.email;
+    const pictureFromToken = parsed.picture;
+    if (emailFromToken || pictureFromToken) {
+      const avatar = pictureFromToken ?? (emailFromToken ? gravatarUrl(emailFromToken) : undefined);
+      return {
+        userId: parsed.sub,
+        displayName: parsed.preferred_username ?? emailFromToken?.split("@")[0] ?? "User",
+        email: emailFromToken,
+        avatarUrl: avatar,
+        membershipTier: parsed.gfn_tier ?? "FREE",
+      };
+    }
   }
 
   const response = await fetch(USERINFO_ENDPOINT, {
@@ -409,11 +420,14 @@ async function fetchUserInfo(tokens: AuthTokens): Promise<AuthUser> {
     picture?: string;
   };
 
+  const email = payload.email;
+  const avatar = payload.picture ?? (email ? gravatarUrl(email) : undefined);
+
   return {
     userId: payload.sub,
-    displayName: payload.preferred_username ?? payload.email?.split("@")[0] ?? "User",
-    email: payload.email,
-    avatarUrl: payload.picture,
+    displayName: payload.preferred_username ?? email?.split("@")[0] ?? "User",
+    email,
+    avatarUrl: avatar,
     membershipTier: "FREE",
   };
 }
@@ -623,6 +637,7 @@ export class AuthService {
 
     const initialTokens = await exchangeAuthorizationCode(code, verifier, port);
     const user = await fetchUserInfo(initialTokens);
+    console.debug("auth: fetched user info during login", { userId: user.userId, email: user.email, avatarUrl: user.avatarUrl });
     let tokens = initialTokens;
     try {
       tokens = await this.ensureClientToken(initialTokens, user.userId);
@@ -851,6 +866,7 @@ export class AuthService {
       let user = this.session?.user;
       try {
         user = await fetchUserInfo(refreshedTokens);
+        console.debug("auth: fetched user info on token refresh", { userId: user.userId, email: user.email, avatarUrl: user.avatarUrl });
       } catch (error) {
         console.warn("Token refresh succeeded but user info refresh failed. Keeping cached user:", error);
       }