replace with custom superagent based on fetch API

This commit is contained in:
Girish Ramakrishnan
2025-02-14 17:26:54 +01:00
parent 68a08b1f62
commit 8e58349bfa
66 changed files with 1086 additions and 1031 deletions

View File

@@ -100,7 +100,7 @@ const appPasswords = require('./apppasswords.js'),
uaParser = require('ua-parser-js'),
userDirectory = require('./user-directory.js'),
uuid = require('uuid'),
superagent = require('superagent'),
superagent = require('./superagent.js'),
util = require('util'),
validator = require('validator'),
_ = require('./underscore.js');
@@ -755,7 +755,7 @@ async function notifyLoginLocation(user, ip, userAgent, auditSource) {
if (user.ghost || user.source) return; // for external users, rely on the external source to send login notification to avoid dup login emails
const response = await superagent.get('https://geolocation.cloudron.io/json').query({ ip }).ok(() => true);
if (response.statusCode !== 200) return debug(`Failed to get geoip info. statusCode: ${response.statusCode}`);
if (response.status !== 200) return debug(`Failed to get geoip info. status: ${response.status}`);
const country = safe.query(response.body, 'country.names.en', '');
const city = safe.query(response.body, 'city.names.en', '');