Merge pull request #5 from TLX-Protocol/fix-partner-codes

Fix Partner Invite Codes Showing as Used
TLX-Protocol · Jan 30, 2024 · d029709 · d029709
2 parents 36fc60d + f3ced9f
commit d029709
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/functions/src/constants.ts b/functions/src/constants.ts
@@ -31,3 +31,5 @@ export const messageToSign =
 export const codeValidChars = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
 export const codeLength = 4;
 export const invitesPerUser = 5;
+
+export const partnerCodes = ["kirbycrypto"];
diff --git a/functions/src/index.ts b/functions/src/index.ts
@@ -2,7 +2,7 @@ import { onRequest } from "firebase-functions/v2/https";
 import admin from "firebase-admin";
 
 import registrationHandler from "./registration";
-import wrapHandler, { getUserAddress, validateParams } from "./utils";
+import wrapHandler, { getUserAddress, isPartnerCode, validateParams } from "./utils";
 import { userExists } from "./db";
 import { APIError, SignedParams } from "./types";
 import { defineSecret } from "firebase-functions/params";
@@ -53,6 +53,10 @@ export const hasRegistered = onRequest(
 export const inviteCodeUsed = onRequest(
   wrapHandler(async (request) => {
     const { inviteCode } = validateParams<{ inviteCode: string }>(request.query, "inviteCode");
+
+    const isPartner = isPartnerCode(inviteCode);
+    if (isPartner) return false;
+
     const db = admin.database();
     const codeSnapshot = await db.ref("invites").child(inviteCode).get();
     if (!codeSnapshot.exists()) {

diff --git a/functions/src/registration.ts b/functions/src/registration.ts
@@ -6,10 +6,9 @@ import { DiscordService, TwitterService } from "./services";
 import { APIError, RegistrationParams, Guild } from "./types";
 import { Secrets, invitesPerUser, tlxGuidID } from "./constants";
 import { generateAndSaveInviteCodes, useCode, userExists, usernameExists } from "./db";
-import { getUserAddress, validateParams } from "./utils";
+import { getUserAddress, isPartnerCode, validateParams } from "./utils";
 
 const requiredKeys = ["twitterCode", "discordCode", "signature", "inviteCode"];
-const partnerCodes = ["kirbycrypto"];
 
 async function getTwitterUsername(code: string, secrets: Secrets): Promise<string> {
   try {
@@ -50,7 +49,7 @@ export default async function registrationHandler(request: Request, secrets: Sec
   }
 
   // Validating invite code
-  const isPartner = partnerCodes.includes(params.inviteCode);
+  const isPartner = isPartnerCode(params.inviteCode);
   if (!isPartner) {
     const codeSnapshot = await db.ref("invites").child(params.inviteCode).get();
     if (!codeSnapshot.exists()) {

diff --git a/functions/src/utils.ts b/functions/src/utils.ts
@@ -1,5 +1,5 @@
 import { ethers } from "ethers";
-import { codeValidChars, messageToSign } from "./constants";
+import { codeValidChars, messageToSign, partnerCodes } from "./constants";
 import { APIError, FunctionHandler, HTTPHandler } from "./types";
 import * as cors from "cors";
 
@@ -45,3 +45,7 @@ export default function wrapHandler<T>(handler: FunctionHandler<T>): HTTPHandler
     });
   };
 }
+
+export function isPartnerCode(code: string): boolean {
+  return partnerCodes.includes(code.toLowerCase());
+}