Merge branch 'main' into Fix-CI

jabme/users/decorators.py

@@ -3,6 +3,7 @@
 from django.http import HttpResponse
 
 allowed_ips = os.environ.get("ALLOWED_IPS", "localhost 127.0.0.1").split()
+super_secret_header = os.environ.get("SECRET_HEADER")
 
 
 def login_by_ip(view_func):
@@ -14,3 +15,15 @@ def authorize(request, *args, **kwargs):
         return HttpResponse("Forbidden. F Off.")
 
     return authorize
+
+
+def validate_header(view_func):
+    def authorize(request, *args, **kwargs):
+        if (
+            "only-fan-secret-key" in request.headers
+            and super_secret_header == request.headers["only-fan-secret-key"]
+        ):
+            return view_func(request, *args, **kwargs)
+        return HttpResponse("Forbidden. F Off.")
+
+    return authorize

jabme/users/views.py

@@ -21,7 +21,7 @@
 from fake_useragent import UserAgent
 from rest_framework.response import Response
 from rest_framework.views import APIView
-from users.decorators import login_by_ip
+from users.decorators import validate_header
 from users.models import District
 
 PINCODE_REGEX = "^[1-9][0-9]{5}$"
@@ -74,7 +74,7 @@ def post(self, request):
         return Response("Registered Successfully")
 
 
-@method_decorator(login_by_ip, name="get")
+@method_decorator(validate_header, name="get")
 class FindSlotView(APIView):
     def get(self, request):
         time_threshold = datetime.now(timezone.utc) - timedelta(
@@ -206,7 +206,7 @@ def get(self, request):
         return Response(result)
 
 
-@method_decorator(login_by_ip, name="post")
+@method_decorator(validate_header, name="post")
 class UpdateEmailSentTime(APIView):
     def post(self, request):
         now = Now()

mailer/src/axios.ts

@@ -0,0 +1,15 @@
+import axios from "axios";
+import { Agent } from "https";
+import keys from "./config";
+
+const agent = new Agent({ rejectUnauthorized: false });
+
+const headers: { [k: string]: string } = {};
+headers[keys.SECRET_HEADER_KEY] = keys.SECRET_HEADER_VALUE;
+
+const axiosConfig = axios.create({
+  httpsAgent: agent,
+  headers,
+});
+
+export default axiosConfig;

mailer/src/publisher/publisher.ts

@@ -1,6 +1,6 @@
 import * as amqp from "amqplib";
 import keys from "../config";
-import fetch from "./fetch";
+import fetch from "./utils/fetch";
 
 const main = async () => {
   console.log("Trying to connect...");

mailer/src/publisher/fetch.ts → mailer/src/publisher/utils/fetch.ts

@@ -1,14 +1,12 @@
-import * as axios from "axios";
+import axios from "../../axios";
+
 import ResponseData from "./fetch.types";
-import { Agent } from "https";
 
 const requestPromise = () => {
   console.log("Trying to fetch...");
 
-  const agent = new Agent({ rejectUnauthorized: false });
-
-  return axios.default
-    .get("https://covaccinate.tech/api/users/slots/", { httpsAgent: agent })
+  return axios
+    .get("https://covaccinate.tech/api/users/slots/")
     .then((res) => res.data as ResponseData[])
     .catch((err: Error) => {
       console.error(err.message);

mailer/src/subscriber/subscriber.ts

@@ -1,9 +1,9 @@
 import * as amqp from "amqplib";
 import keys from "../config";
-import sendEmails from "./mailgun";
-import setLastSent from "./setLastSent";
+import sendEmails from "./utils/mailgun";
+import setLastSent from "./utils/setLastSent";
 
-import ResponseData from "../publisher/fetch.types";
+import ResponseData from "../publisher/utils/fetch.types";
 
 const main = async () => {
   console.log("Trying to connect...");

mailer/src/subscriber/mailgun.ts → mailer/src/subscriber/utils/mailgun.ts

@@ -1,9 +1,9 @@
 import mailgun from "mailgun-js";
-import keys from "../config";
+import keys from "../../config";
 import makeEmail from "./makeEmail";
 
 import { ConsumeMessage } from "amqplib";
-import ResponseData from "../publisher/fetch.types";
+import ResponseData from "../../publisher/utils/fetch.types";
 import { SendEmailItem } from "./mailgun.types";
 
 const who = process.env.WHO?.trim().toUpperCase() || "ARYAMAN";

mailer/src/subscriber/makeEmail.ts → mailer/src/subscriber/utils/makeEmail.ts

@@ -1,4 +1,4 @@
-import ResponseData from "../publisher/fetch.types";
+import ResponseData from "../../publisher/utils/fetch.types";
 import ejsTemplate from "./emailTemplate";
 import ejs from "ejs";
 

mailer/src/subscriber/utils/setLastSent.ts

@@ -0,0 +1,9 @@
+import axios from "../../axios";
+
+const setLastSent = (district_id: string) => {
+  return axios.post("https://covaccinate.tech/api/users/update-lastsent/", {
+    district_ids: [district_id],
+  });
+};
+
+export default setLastSent;