From f76ef3b5c75a936d97c28b994adf607a308cbf08 Mon Sep 17 00:00:00 2001
From: Prakhargarg-2010196 <23prakhargarg2002@gmail.com>
Date: Mon, 14 Oct 2024 15:33:06 +0530
Subject: [PATCH 1/4] feat(platform):Create ui link for resend otp

---
 apps/platform/src/app/auth/otp/page.tsx | 46 ++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/apps/platform/src/app/auth/otp/page.tsx b/apps/platform/src/app/auth/otp/page.tsx
index d6145e9a..b9c03d14 100644
--- a/apps/platform/src/app/auth/otp/page.tsx
+++ b/apps/platform/src/app/auth/otp/page.tsx
@@ -26,6 +26,7 @@ export default function AuthOTPPage(): React.JSX.Element {
   const [otp, setOtp] = useState<string>('')
   const [isLoading, setIsLoading] = useState<boolean>(false)
   const [isInvalidOtp, setIsInvalidOtp] = useState<boolean>(false)
+  const [isLoadingRefresh, setIsLoadingRefresh] = useState<boolean>(false)
 
   const router = useRouter()
 
@@ -88,7 +89,28 @@ export default function AuthOTPPage(): React.JSX.Element {
       }
     }
   }
-
+  const handleResendOtp = async (userEmail: string): Promise<void> => {
+    try {
+      setIsLoadingRefresh(true)
+      const response = await fetch(
+        `${process.env.NEXT_PUBLIC_BACKEND_URL}/api/auth/resend-otp/${encodeURIComponent(userEmail)}`,
+        {
+          method: 'POST'
+        }
+      )
+      if (response.status === 429) {
+        toast.error("Couldn't send OTP, too many requests")
+        setIsLoadingRefresh(false)
+      } else if (response.ok)
+        toast.success('OTP successfully sent to your email')
+      setIsLoadingRefresh(false)
+    } catch (error) {
+      // eslint-disable-next-line no-console -- we need to log the error
+      console.error(`Failed to send OTP: ${error}`)
+      toast.error("Couldn't send OTP .")
+      setIsLoadingRefresh(false)
+    }
+  }
   return (
     <main className="flex h-dvh items-center justify-center justify-items-center px-4">
       <div className="flex flex-col gap-6">
@@ -144,6 +166,28 @@ export default function AuthOTPPage(): React.JSX.Element {
             >
               {isLoading ? <LoadingSVG className="w-10" /> : 'Verify'}
             </Button>
+            <div className="space-x-reverse-2 flex items-center justify-center text-[#71717A]">
+              <span>Didn’t receive OTP?</span>
+              <span>
+                {isLoadingRefresh ? (
+                  <span>
+                    <LoadingSVG className="w-10 h-10" />
+                  </span>
+                ) : (
+                  <Button
+                    className="text-[#71717A]"
+                    disabled={isLoading}
+                    onClick={(e) => {
+                      e.preventDefault()
+                      void handleResendOtp(email)
+                    }}
+                    variant="link"
+                  >
+                    Resend OTP
+                  </Button>
+                )}
+              </span>
+            </div>
           </form>
         </div>
       </div>

From 61c25dd3bfc84a7a35c8069f039ca7b6c54dbd76 Mon Sep 17 00:00:00 2001
From: Prakhargarg-2010196 <23prakhargarg2002@gmail.com>
Date: Mon, 28 Oct 2024 16:20:45 +0530
Subject: [PATCH 2/4] refactor(auth): Refactor API client for otp resend

- Created new controller instance for better management of API interactions.
- Added authentication controller in API client for handling OTP-related requests.
- Introduced type definitions for authentication to improve type safety.
- Renamed index types definition for consistency.
---
 apps/platform/src/app/auth/otp/page.tsx       | 29 ++++++++++-------
 apps/platform/src/lib/controller-instance.ts  | 31 +++++++++++++++++++
 packages/api-client/src/controllers/auth.ts   | 26 ++++++++++++++++
 packages/api-client/src/index.ts              |  5 +--
 packages/api-client/src/types/auth.types.ts   |  4 +++
 .../{index.types.d.ts => index.types.ts}      |  0
 6 files changed, 82 insertions(+), 13 deletions(-)
 create mode 100644 apps/platform/src/lib/controller-instance.ts
 create mode 100644 packages/api-client/src/controllers/auth.ts
 create mode 100644 packages/api-client/src/types/auth.types.ts
 rename packages/api-client/src/types/{index.types.d.ts => index.types.ts} (100%)

diff --git a/apps/platform/src/app/auth/otp/page.tsx b/apps/platform/src/app/auth/otp/page.tsx
index b9c03d14..cfd94075 100644
--- a/apps/platform/src/app/auth/otp/page.tsx
+++ b/apps/platform/src/app/auth/otp/page.tsx
@@ -8,6 +8,8 @@ import Cookies from 'js-cookie'
 import { toast } from 'sonner'
 import { LoadingSVG } from '@public/svg/shared'
 import { KeyshadeBigSVG } from '@public/svg/auth'
+import type { ClientResponse } from '@keyshade/api-client/dist/src/types/index.types'
+import type { ResendOTPRequest } from '@keyshade/api-client/dist/src/types/auth.types'
 import { GeistSansFont } from '@/fonts'
 import { Button } from '@/components/ui/button'
 import {
@@ -19,6 +21,7 @@ import {
 import { authEmailAtom } from '@/store'
 import type { User } from '@/types'
 import { zUser } from '@/types'
+import ControllerInstance from '@/lib/controller-instance'
 
 export default function AuthOTPPage(): React.JSX.Element {
   const email = useAtomValue(authEmailAtom)
@@ -92,18 +95,22 @@ export default function AuthOTPPage(): React.JSX.Element {
   const handleResendOtp = async (userEmail: string): Promise<void> => {
     try {
       setIsLoadingRefresh(true)
-      const response = await fetch(
-        `${process.env.NEXT_PUBLIC_BACKEND_URL}/api/auth/resend-otp/${encodeURIComponent(userEmail)}`,
-        {
-          method: 'POST'
-        }
-      )
-      if (response.status === 429) {
+      //TODO:Remove this once initialisation is fixed
+      // ControllerInstance.initialize('http://localhost:4200')
+
+      const { error, success } =
+        (await ControllerInstance.getInstance().authController.resendOTP({
+          userEmail: encodeURIComponent(userEmail)
+        })) as ClientResponse<ResendOTPRequest>
+      if (success) {
+        toast.success('OTP successfully sent to your email')
+        setIsLoadingRefresh(false)
+      } else {
+        // eslint-disable-next-line no-console -- we need to log the error
+        console.log(error)
         toast.error("Couldn't send OTP, too many requests")
         setIsLoadingRefresh(false)
-      } else if (response.ok)
-        toast.success('OTP successfully sent to your email')
-      setIsLoadingRefresh(false)
+      }
     } catch (error) {
       // eslint-disable-next-line no-console -- we need to log the error
       console.error(`Failed to send OTP: ${error}`)
@@ -171,7 +178,7 @@ export default function AuthOTPPage(): React.JSX.Element {
               <span>
                 {isLoadingRefresh ? (
                   <span>
-                    <LoadingSVG className="w-10 h-10" />
+                    <LoadingSVG className="h-10 w-10" />
                   </span>
                 ) : (
                   <Button
diff --git a/apps/platform/src/lib/controller-instance.ts b/apps/platform/src/lib/controller-instance.ts
new file mode 100644
index 00000000..fe432b7b
--- /dev/null
+++ b/apps/platform/src/lib/controller-instance.ts
@@ -0,0 +1,31 @@
+import { AuthController } from '@keyshade/api-client'
+
+export default class ControllerInstance {
+  private static instance: ControllerInstance | null
+
+  private _authController: AuthController | null = null
+
+  get authController(): AuthController {
+    if (!this._authController) {
+      throw new Error('ControllerInstance not initialized')
+    }
+    return this._authController
+  }
+
+  static initialize(baseUrl: string): void {
+    if (!ControllerInstance.instance) {
+      const instance = new ControllerInstance()
+
+      instance._authController = new AuthController(baseUrl)
+
+      ControllerInstance.instance = instance
+    }
+  }
+
+  static getInstance(): ControllerInstance {
+    if (!ControllerInstance.instance) {
+      throw new Error('ControllerInstance not initialized')
+    }
+    return ControllerInstance.instance
+  }
+}
diff --git a/packages/api-client/src/controllers/auth.ts b/packages/api-client/src/controllers/auth.ts
new file mode 100644
index 00000000..3a943f9c
--- /dev/null
+++ b/packages/api-client/src/controllers/auth.ts
@@ -0,0 +1,26 @@
+import {
+  ResendOTPResponse,
+  ResendOTPRequest
+} from '@api-client/types/auth.types'
+import { APIClient } from '@api-client/core/client'
+import { parseResponse } from '@api-client/core/response-parser'
+import { ClientResponse } from '@api-client/types/index.types'
+export default class AuthController {
+  private apiClient: APIClient
+
+  constructor(private readonly backendURL: string) {
+    this.apiClient = new APIClient(this.backendURL)
+  }
+
+  async resendOTP(
+    request: ResendOTPRequest,
+    headers?: Record<string, string>
+  ): Promise<ClientResponse<ResendOTPResponse>> {
+    const response = await this.apiClient.post(
+      `/api/auth/resend-otp/${request.userEmail}`,
+      request,
+      headers
+    )
+    return await parseResponse<ResendOTPResponse>(response)
+  }
+}
diff --git a/packages/api-client/src/index.ts b/packages/api-client/src/index.ts
index 6d1e7afc..79ab5f6d 100644
--- a/packages/api-client/src/index.ts
+++ b/packages/api-client/src/index.ts
@@ -7,7 +7,7 @@ import VariableController from '@api-client/controllers/variable'
 import WorkspaceController from '@api-client/controllers/workspace'
 import WorkspaceRoleController from '@api-client/controllers/workspace-role'
 import WorkspaceMembershipController from '@api-client/controllers/workspace-membership'
-
+import AuthController from '@api-client/controllers/auth'
 export {
   EnvironmentController,
   SecretController,
@@ -17,5 +17,6 @@ export {
   VariableController,
   WorkspaceController,
   WorkspaceRoleController,
-  WorkspaceMembershipController
+  WorkspaceMembershipController,
+  AuthController
 }
diff --git a/packages/api-client/src/types/auth.types.ts b/packages/api-client/src/types/auth.types.ts
new file mode 100644
index 00000000..c33c37fc
--- /dev/null
+++ b/packages/api-client/src/types/auth.types.ts
@@ -0,0 +1,4 @@
+export interface ResendOTPRequest {
+  userEmail: string
+}
+export interface ResendOTPResponse {}
diff --git a/packages/api-client/src/types/index.types.d.ts b/packages/api-client/src/types/index.types.ts
similarity index 100%
rename from packages/api-client/src/types/index.types.d.ts
rename to packages/api-client/src/types/index.types.ts

From 4b7d91256b1ba46edf92cc176eb89795c4c62df7 Mon Sep 17 00:00:00 2001
From: Prakhargarg-2010196 <23prakhargarg2002@gmail.com>
Date: Wed, 30 Oct 2024 02:07:21 +0530
Subject: [PATCH 3/4] fix(platform):Remove unnecessary types imports

---
 apps/platform/src/app/auth/otp/page.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/platform/src/app/auth/otp/page.tsx b/apps/platform/src/app/auth/otp/page.tsx
index cfd94075..a9f3a35d 100644
--- a/apps/platform/src/app/auth/otp/page.tsx
+++ b/apps/platform/src/app/auth/otp/page.tsx
@@ -8,8 +8,6 @@ import Cookies from 'js-cookie'
 import { toast } from 'sonner'
 import { LoadingSVG } from '@public/svg/shared'
 import { KeyshadeBigSVG } from '@public/svg/auth'
-import type { ClientResponse } from '@keyshade/api-client/dist/src/types/index.types'
-import type { ResendOTPRequest } from '@keyshade/api-client/dist/src/types/auth.types'
 import { GeistSansFont } from '@/fonts'
 import { Button } from '@/components/ui/button'
 import {
@@ -99,9 +97,9 @@ export default function AuthOTPPage(): React.JSX.Element {
       // ControllerInstance.initialize('http://localhost:4200')
 
       const { error, success } =
-        (await ControllerInstance.getInstance().authController.resendOTP({
+        await ControllerInstance.getInstance().authController.resendOTP({
           userEmail: encodeURIComponent(userEmail)
-        })) as ClientResponse<ResendOTPRequest>
+        })
       if (success) {
         toast.success('OTP successfully sent to your email')
         setIsLoadingRefresh(false)

From a610bcb8a79344b84c29dcea9494c31c07eed3e7 Mon Sep 17 00:00:00 2001
From: rajdip-b <agentR47@gmail.com>
Date: Sat, 2 Nov 2024 17:03:22 +0530
Subject: [PATCH 4/4] update ESLint rules for platform

---
 apps/platform/.eslintrc.cjs                 | 21 +++++++++++++++++++++
 apps/platform/.eslintrc.js                  | 11 -----------
 apps/platform/src/app/auth/otp/page.tsx     |  2 --
 packages/api-client/src/controllers/auth.ts |  1 +
 4 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 apps/platform/.eslintrc.cjs
 delete mode 100644 apps/platform/.eslintrc.js

diff --git a/apps/platform/.eslintrc.cjs b/apps/platform/.eslintrc.cjs
new file mode 100644
index 00000000..dc26dbae
--- /dev/null
+++ b/apps/platform/.eslintrc.cjs
@@ -0,0 +1,21 @@
+module.exports = {
+  extends: ['custom/next'],
+  parserOptions: {
+    project: 'tsconfig.json',
+    tsconfigRootDir: __dirname,
+    sourceType: 'module'
+  },
+  rules: {
+    'import/no-extraneous-dependencies': 0,
+    '@typescript-eslint/interface-name-prefix': 'off',
+    '@typescript-eslint/explicit-function-return-type': 'off',
+    '@typescript-eslint/explicit-module-boundary-types': 'off',
+    '@typescript-eslint/no-explicit-any': 'off',
+    '@typescript-eslint/no-unused-vars': ['warn'],
+    '@typescript-eslint/space-before-function-paren': 'off',
+    '@typescript-eslint/strict-boolean-expressions': 'off',
+    '@typescript-eslint/prefer-nullish-coalescing': 'off',
+    'space-before-function-paren': 'off',
+    '@typescript-eslint/member-delimiter-style': 'off'
+  }
+}
diff --git a/apps/platform/.eslintrc.js b/apps/platform/.eslintrc.js
deleted file mode 100644
index 039bb630..00000000
--- a/apps/platform/.eslintrc.js
+++ /dev/null
@@ -1,11 +0,0 @@
-module.exports = {
-  extends: ['custom/next'],
-  parserOptions: {
-    project: 'tsconfig.json',
-    tsconfigRootDir: __dirname,
-    sourceType: 'module'
-  },
-  rules: {
-    'import/no-extraneous-dependencies': 0
-  }
-}
diff --git a/apps/platform/src/app/auth/otp/page.tsx b/apps/platform/src/app/auth/otp/page.tsx
index a9f3a35d..f13dfd3c 100644
--- a/apps/platform/src/app/auth/otp/page.tsx
+++ b/apps/platform/src/app/auth/otp/page.tsx
@@ -93,8 +93,6 @@ export default function AuthOTPPage(): React.JSX.Element {
   const handleResendOtp = async (userEmail: string): Promise<void> => {
     try {
       setIsLoadingRefresh(true)
-      //TODO:Remove this once initialisation is fixed
-      // ControllerInstance.initialize('http://localhost:4200')
 
       const { error, success } =
         await ControllerInstance.getInstance().authController.resendOTP({
diff --git a/packages/api-client/src/controllers/auth.ts b/packages/api-client/src/controllers/auth.ts
index 3a943f9c..fb49c175 100644
--- a/packages/api-client/src/controllers/auth.ts
+++ b/packages/api-client/src/controllers/auth.ts
@@ -5,6 +5,7 @@ import {
 import { APIClient } from '@api-client/core/client'
 import { parseResponse } from '@api-client/core/response-parser'
 import { ClientResponse } from '@api-client/types/index.types'
+
 export default class AuthController {
   private apiClient: APIClient