Update the redirect URL payload format (#21)

* Updated the redirectURI payload format

* Updated the tests

Author: AbhayVAshokan

js/src/constants.ts

@@ -5,6 +5,7 @@ export const TLD: Record<string, string> = {
 };
 
 export const NEETO_URL_COMPONENT_REGEX = /neeto(\w+)/;
+export const NEETO_URL_PREFIX_REGEX = /^(https?:\/\/)?(www\.)?[\w-]+\./;
 
 export const CLIENT_APPS = {
   cal: "Cal",

js/src/index.ts

@@ -1,5 +1,10 @@
 import jwt from "jsonwebtoken";
-import { getClientAppName, getLoginUri, SearchParams } from "./utils.js";
+import {
+  getClientAppName,
+  getLoginUri,
+  getRedirectUri,
+  SearchParams,
+} from "./utils.js";
 
 interface Options {
   email: string;
@@ -48,7 +53,7 @@ class NeetoJWT {
 
     const searchParams: SearchParams = {
       jwt: this.generateJWT(),
-      redirect_uri: encodeURI(redirectUri),
+      redirect_uri: getRedirectUri(redirectUri),
       client_app_name: getClientAppName(redirectUri),
     };
 

js/src/utils.ts

@@ -1,4 +1,9 @@
-import { CLIENT_APPS, NEETO_URL_COMPONENT_REGEX, TLD } from "./constants.js";
+import {
+  CLIENT_APPS,
+  NEETO_URL_COMPONENT_REGEX,
+  NEETO_URL_PREFIX_REGEX,
+  TLD,
+} from "./constants.js";
 
 export type SearchParams = {
   jwt: string;
@@ -29,3 +34,13 @@ export const getClientAppName = (redirectUri: string) => {
 
   return "Cal";
 };
+
+export const getRedirectUri = (redirectUri: string) => {
+  const match = redirectUri.match(NEETO_URL_PREFIX_REGEX);
+
+  if (match) {
+    return encodeURI(redirectUri.replace(NEETO_URL_PREFIX_REGEX, ""));
+  }
+
+  return encodeURI(getTopLevelDomain());
+};

js/test/index.test.ts

@@ -53,7 +53,7 @@ describe("NeetoJWT", () => {
     expect(loginUrl).toContain("https://spinkart.neetoauth.com/users/auth/jwt");
     expect(loginUrl).toContain(`jwt=`);
     expect(loginUrl).toContain(
-      `redirect_uri=${encodeURIComponent(redirectUri)}`
+      `redirect_uri=${encodeURIComponent("neetocal.com/admin")}`
     );
     expect(loginUrl).toContain(`client_app_name=Cal`);
   });