Beautiful Open-Source Form Builder
Enhance OAuth data verification and user data normalization
JhumanJ40d0c2120200
diff --git a/api/app/Integrations/OAuth/Drivers/OAuthTelegramDriver.php b/api/app/Integrations/OAuth/Drivers/OAuthTelegramDriver.phpindex 2d0d0cee5..d34554937 100644--- a/api/app/Integrations/OAuth/Drivers/OAuthTelegramDriver.php+++ b/api/app/Integrations/OAuth/Drivers/OAuthTelegramDriver.php@@ -55,11 +55,33 @@ class OAuthTelegramDriver implements WidgetOAuthDriverpublic function verifyWidgetData(array $data): bool{- $checkHash = $data['hash'];- unset($data['hash']);+ // As per Telegram docs, the hash must be computed from exactly the fields provided by Telegram.+ // Ignore any extra fields we might add client-side (e.g. intent, utm, invite_token, etc.).+ $checkHash = $data['hash'] ?? null;+ if (!$checkHash) {+ return false;+ }++ // Whitelist allowed keys from Telegram Login Widget+ $allowedKeys = [+ 'id',+ 'first_name',+ 'last_name',+ 'username',+ 'photo_url',+ 'auth_date',+ ];++ // Build data-check-string from allowed fields only+ $filtered = [];+ foreach ($allowedKeys as $key) {+ if (array_key_exists($key, $data)) {+ $filtered[$key] = $data[$key];+ }+ }$dataCheckArr = [];- foreach ($data as $key => $value) {+ foreach ($filtered as $key => $value) {$dataCheckArr[] = $key . '=' . $value;}diff --git a/api/app/Service/OAuth/OAuthUserDataService.php b/api/app/Service/OAuth/OAuthUserDataService.phpindex d86564609..aec83dfc7 100644--- a/api/app/Service/OAuth/OAuthUserDataService.php+++ b/api/app/Service/OAuth/OAuthUserDataService.php@@ -54,15 +54,18 @@ class OAuthUserDataServiceprivate function normalizeUserData(array $userData): array{// Ensure required fields exist- $required = ['email', 'name', 'provider_user_id'];+ $required = ['name', 'provider_user_id'];foreach ($required as $field) {if (empty($userData[$field])) {abort(400, "Missing required field: {$field}");}}- // Normalize email to lowercase- $userData['email'] = strtolower($userData['email']);+ // Email is optional (e.g., Telegram widget doesn't provide it)+ if (isset($userData['email']) && !empty($userData['email'])) {+ // Normalize email to lowercase+ $userData['email'] = strtolower($userData['email']);+ }// Set defaults for optional fields$userData['avatar'] = $userData['avatar'] ?? null;