From b6ab8c381f085d1373d0948ca69947c0813165d5 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Sun, 21 Nov 2021 09:39:22 -0800
Subject: [PATCH] Change env variable to CLIENT_IP_HEADER.

---
 lib/request.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/request.js b/lib/request.js
index 4f8fa8a7..725dc383 100644
--- a/lib/request.js
+++ b/lib/request.js
@@ -15,8 +15,12 @@ import {
 let lookup;
 
 export function getIpAddress(req) {
+  // Custom header
+  if (req.headers[process.env.CLIENT_IP_HEADER]) {
+    return req.headers[process.env.CLIENT_IP_HEADER];
+  }
   // Cloudflare
-  if (req.headers['cf-connecting-ip']) {
+  else if (req.headers['cf-connecting-ip']) {
     return req.headers['cf-connecting-ip'];
   }
 
@@ -52,11 +56,6 @@ export function getDevice(screen, browser, os) {
 }
 
 export async function getCountry(req, ip) {
-  // Custom header
-  if (req.headers[process.env.COUNTRY_IP_HEADER]) {
-    return req.headers[process.env.COUNTRY_IP_HEADER];
-  }
-
   // Cloudflare
   if (req.headers['cf-ipcountry']) {
     return req.headers['cf-ipcountry'];