From 5bd652fe37a2587baa95f974a426b643f670ff84 Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Mon, 24 Feb 2025 11:22:42 +0100 Subject: [PATCH] Use default account profile picture in fake authentication mode. --- app/lib/account/models.dart | 2 +- app/lib/fake/backend/fake_auth_provider.dart | 14 +++----------- app/test/frontend/golden/my_activity_log_page.html | 6 +++--- app/test/frontend/golden/my_liked_packages.html | 6 +++--- app/test/frontend/golden/my_packages.html | 6 +++--- app/test/frontend/golden/my_publishers.html | 6 +++--- .../frontend/golden/pkg_activity_log_page.html | 4 ++-- app/test/frontend/golden/pkg_admin_page.html | 4 ++-- 8 files changed, 20 insertions(+), 28 deletions(-) diff --git a/app/lib/account/models.dart b/app/lib/account/models.dart index 5fa232822a..1318b1eeba 100644 --- a/app/lib/account/models.dart +++ b/app/lib/account/models.dart @@ -301,7 +301,7 @@ class SessionData { /// Set image size to NxN pixels for faster loading, see: /// https://developers.google.com/people/image-sizing String imageUrlOfSize(int layoutSize) { - if (imageUrl == null) { + if (imageUrl == null || imageUrl == staticUrls.defaultProfilePng) { return staticUrls.defaultProfilePng; } // Double the layout size, for better quality on higher dpi displays. diff --git a/app/lib/fake/backend/fake_auth_provider.dart b/app/lib/fake/backend/fake_auth_provider.dart index 62c746e71a..c2dfa495a4 100644 --- a/app/lib/fake/backend/fake_auth_provider.dart +++ b/app/lib/fake/backend/fake_auth_provider.dart @@ -7,7 +7,6 @@ import 'dart:convert'; import 'package:clock/clock.dart'; -import 'package:crypto/crypto.dart'; import 'package:gcloud/service_scope.dart' as ss; import 'package:googleapis/oauth2/v2.dart' as oauth2_v2; import 'package:http/http.dart' as http; @@ -20,6 +19,7 @@ import '../../account/auth_provider.dart'; import '../../account/default_auth_provider.dart'; import '../../account/session_cookie.dart'; import '../../frontend/handlers/pubapi.client.dart'; +import '../../frontend/static_files.dart'; import '../../service/openid/gcp_openid.dart'; import '../../service/openid/github_openid.dart'; import '../../service/openid/jwt.dart'; @@ -144,13 +144,9 @@ class FakeAuthProvider extends BaseAuthProvider { final name = email.split('@').first.replaceAll('-', ' ').replaceAll('.', ' '); - // gravatar image with retro face - final emailMd5 = md5.convert(utf8.encode(email.trim())).toString(); - final imageUrl = 'https://www.gravatar.com/avatar/$emailMd5?d=retro&s=200'; - return AccountProfile( name: name, - imageUrl: imageUrl, + imageUrl: staticUrls.defaultProfilePng, ); } @@ -201,16 +197,12 @@ class FakeAuthProvider extends BaseAuthProvider { final name = email.split('@').first.replaceAll('-', ' ').replaceAll('.', ' '); - // gravatar image with retro face - final emailMd5 = md5.convert(utf8.encode(email.trim())).toString(); - final imageUrl = 'https://www.gravatar.com/avatar/$emailMd5?d=retro&s=200'; - return AuthResult( oauthUserId: token.payload['sub'] as String, email: email, audience: token.payload['aud'] as String, name: name, - imageUrl: imageUrl, + imageUrl: staticUrls.defaultProfilePng, accessToken: _createGcpToken( email: email, audience: activeConfiguration.pubServerAudience!, diff --git a/app/test/frontend/golden/my_activity_log_page.html b/app/test/frontend/golden/my_activity_log_page.html index 60dd3598c9..0d8db6300f 100644 --- a/app/test/frontend/golden/my_activity_log_page.html +++ b/app/test/frontend/golden/my_activity_log_page.html @@ -113,11 +113,11 @@

- +