From 71b77c8b5bb6cf402f507731a0dc158ff6dbaa03 Mon Sep 17 00:00:00 2001
From: PAN Lei <panleicim@gmail.com>
Date: Mon, 5 Sep 2022 12:34:20 +0200
Subject: [PATCH] add OXYLABS proxy

---
 src/mail/mail_reader.py |  2 +-
 src/params.py           | 10 ++++++++++
 src/proxy/proxy_type.py |  1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/mail/mail_reader.py b/src/mail/mail_reader.py
index 7e84efd..f86834d 100644
--- a/src/mail/mail_reader.py
+++ b/src/mail/mail_reader.py
@@ -165,7 +165,7 @@ def read_mails():
                 if need_to_valid_url(url, successful_items):
                     url_validator = LinkValidator(url)
                     print("need to validate url: " + url)
-                    executor.submit(url_validator.start_page, params.get_proxy(ProxyType.RESIDENTIAL), False)
+                    executor.submit(url_validator.start_page, params.get_proxy(ProxyType.RESIDENTIAL), True)
                 else:
                     print("do not need to click url --> {}".format(mail.mail_address))
 
diff --git a/src/params.py b/src/params.py
index 593735e..dc9463d 100644
--- a/src/params.py
+++ b/src/params.py
@@ -11,9 +11,12 @@ PROXY_SERVER = "http://gw.ntnt.io:5959"
 PROXY_PASSWORD = "94sY7zwBG13i"
 
 BRIGHT_DATA_PROXY_SERVER = "http://zproxy.lum-superproxy.io:22225"
+OXYLABS_PROXY_SERVER = "pr.oxylabs.io:7777"
+OXYLABS_DATA_PROXY_USERNAME = "customer-appointment-cc-FR"
 BRIGHT_DATA_PROXY_USERNAME = "lum-customer-c_daabba94-zone-residential-country-fr"
 BRIGHT_DATA_MOBILE_PROXY_USERNAME = "lum-customer-c_daabba94-zone-mobile-country-fr-mobile"
 BRIGHT_DATA_PROXY_PASSWORD = "9dwmh54u3bbh"
+OXYLABS_DATA_PROXY_PASSWORD = "Rdv@20222021"
 BRIGHT_DATA_MOBILE_PROXY_PASSWORD = "fk5f7c2z2c19"
 PROXY_NAME_PREFIX_RES = "panleicim-res-fr-"
 PROXY_NAME_PREFIX_CC = "panleicim-cc-fr-"
@@ -32,6 +35,12 @@ def get_proxy(proxy_type: ProxyType):
             "username": BRIGHT_DATA_PROXY_USERNAME,
             "password": BRIGHT_DATA_PROXY_PASSWORD
         }
+    elif proxy_type == ProxyType.OXYLABS:
+        proxy = {
+            "server": OXYLABS_PROXY_SERVER,
+            "username": OXYLABS_DATA_PROXY_USERNAME,
+            "password": OXYLABS_DATA_PROXY_PASSWORD
+        }
     else:
         proxy = {
             "server": BRIGHT_DATA_PROXY_SERVER,
@@ -48,6 +57,7 @@ def get_random_id_number_for_proxy() -> str:
     print("The randomly generated string is : " + str(ran))  # print the random data
     return id_number
 
+
 def get_random_wait_time() -> float:
     wait_time = random.randint(0, 10) / 10.0 * 1
     return wait_time
diff --git a/src/proxy/proxy_type.py b/src/proxy/proxy_type.py
index fccfb6f..4ef3d46 100644
--- a/src/proxy/proxy_type.py
+++ b/src/proxy/proxy_type.py
@@ -4,3 +4,4 @@ from enum import Enum
 class ProxyType(Enum):
     RESIDENTIAL = "RESIENTIAL"
     MOBILE = "MOBILE"
+    OXYLABS = "OXYLABS"