WIP: Add New Services and Notification Feature

README.md

@@ -58,15 +58,23 @@ src/
 ### SQL Script for Creating the `subscriptions` Table in Supabase:
 
 ```sql
-create table subscriptions (
-  id uuid primary key default uuid_generate_v4(),
-  user_id uuid not null references auth.users(id) on delete cascade,
-  stripe_subscription_id text unique,
-  plan text check (plan in ('free', 'starter', 'creator', 'pro')) not null default 'free',
-  status text check (status in ('active', 'canceled', 'past_due', 'incomplete', 'trialing')) not null default 'active',
-  current_period_start timestamp with time zone,
-  current_period_end timestamp with time zone,
-  created_at timestamp with time zone default now()
+CREATE TABLE subscriptions (
+    id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
+    user_id UUID NOT NULL REFERENCES auth.users(id) ON DELETE CASCADE,
+    stripe_subscription_id TEXT UNIQUE,
+    plan TEXT CHECK (plan IN ('free', 'starter', 'creator', 'pro')) NOT NULL DEFAULT 'free',
+    status TEXT CHECK (status IN ('active', 'canceled', 'past_due', 'incomplete', 'trialing')) NOT NULL DEFAULT 'active',
+    current_period_start TIMESTAMP WITH TIME ZONE,
+    current_period_end TIMESTAMP WITH TIME ZONE,
+    created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
+);
+
+CREATE TABLE notifications (
+    id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
+    user_id UUID NOT NULL REFERENCES auth.users(id) ON DELETE CASCADE,
+    message TEXT NOT NULL,
+    is_read BOOLEAN DEFAULT FALSE,
+    created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
 );
 ```
 

src/app/(domains)/(auth)/confirm-signup/page.tsx

@@ -6,7 +6,7 @@
 import Spinner from "@/components/Spinner";
 import { useI18n } from '@/hooks/useI18n';
 import { supabase } from "@/libs/supabase/client";
-import SupabaseService from "@/services/supabase";
+import AuthService from "@/services/auth";
 
 type State = {
     isLoading: boolean;
@@ -57,14 +57,14 @@
         } else {
             dispatch({ type: "CONFIRMATION_FAILURE", error: translate("confirm-signup-error-token-missing") });
         }
     }, []);
 
     async function handleConfirmSignup(token: string) {
         dispatch({ type: "SET_LOADING", isLoading: true });
-        const SupabaseServiceInstance = new SupabaseService(supabase);
+        const AuthServiceInstance = new AuthService(supabase);
 
         try {
-            const response = await SupabaseServiceInstance.confirmEmail(token, 'signup');
+            const response = await AuthServiceInstance.confirmEmail(token, 'signup');
             if (response?.id) {
                 dispatch({ type: "CONFIRMATION_SUCCESS" });
             } else {

src/app/(domains)/(auth)/forgot-password/page.tsx

@@ -7,7 +7,7 @@ import ButtonComponent from "@/components/Button";
 import InputComponent from "@/components/Input";
 import { useI18n } from "@/hooks/useI18n";
 import { supabase } from "@/libs/supabase/client";
-import SupabaseService from "@/services/supabase";
+import AuthService from "@/services/auth";
 import { isValidEmail } from "@/utils/isValidEmail";
 
 const initialState = {
@@ -66,8 +66,8 @@ export default function ForgotPassword() {
                 throw new Error("Validation Error");
             }
 
-            const SupabaseServiceInstance = new SupabaseService(supabase);
-            const response = await SupabaseServiceInstance.forgotPassword(state.inputValue.email);
+            const AuthServiceInstance = new AuthService(supabase);
+            const response = await AuthServiceInstance.forgotPassword(state.inputValue.email);
 
             if (response) {
                 dispatch({ type: "SET_SUCCESS", payload: true });

src/app/(domains)/(auth)/layout.tsx

@@ -1,17 +1,17 @@
 import { redirect } from 'next/navigation';
 
 import { createClient } from '@/libs/supabase/server';
-import SupabaseService from '@/services/supabase';
+import AuthService from '@/services/auth';
 
 type Props = {
     children: React.ReactNode;
 }
 
 export default async function AuthLayout({ children }: Props) {
     const supabase = await createClient();
-    const SupabaseServiceInstance = new SupabaseService(supabase);
-
-    const userId = await SupabaseServiceInstance.getUserId();
+    const AuthServiceInstance = new AuthService(supabase);
+    const userId = await AuthServiceInstance.getUserId();
+
     if (userId) {
         redirect('/dashboard');
     }

src/app/(domains)/(auth)/new-password/page.tsx

@@ -10,7 +10,7 @@
 import PasswordStrengthIndicator from "@/components/PasswordStrength";
 import { useI18n } from '@/hooks/useI18n';
 import { supabase } from "@/libs/supabase/client";
-import SupabaseService from "@/services/supabase";
+import AuthService from "@/services/auth";
 
 const initialState = {
     isLoading: false,
@@ -69,7 +69,7 @@
         } else {
             dispatch({ type: "SET_TOKEN_VALUE", payload: token });
         }
     }, [searchParams]);
 
     async function handleNewPassword() {
         try {
@@ -90,9 +90,9 @@
                 throw new Error("Validation Error");
             }
 
-            const SupabaseServiceInstance = new SupabaseService(supabase);
+            const AuthServiceInstance = new AuthService(supabase);
 
-            const response = await SupabaseServiceInstance.newPassword(state.inputValue.password);
+            const response = await AuthServiceInstance.updatePassword(state.inputValue.password);
 
             if (response) {
                 dispatch({ type: "SET_PASSWORD_CHANGED", payload: true });

src/app/(domains)/(auth)/signin/page.tsx

@@ -12,7 +12,7 @@ import OAuth from "@/components/OAuth";
 import { ROUTES } from '@/constants/ROUTES';
 import { useI18n } from '@/hooks/useI18n'; 
 import { supabase } from '@/libs/supabase/client';
-import SupabaseService from '@/services/supabase';
+import AuthService from '@/services/auth';
 import { isValidEmail } from '@/utils/isValidEmail';
 
 const initialState = {
@@ -72,8 +72,8 @@ export default function SignIn() {
               throw new Error("Validation Error");
           }
 
-          const SupabaseServiceInstance = new SupabaseService(supabase);
-          const response = await SupabaseServiceInstance.signIn(state.inputValue.email, state.inputValue.password);
+          const AuthServiceInstance = new AuthService(supabase);
+          const response = await AuthServiceInstance.signIn(state.inputValue.email, state.inputValue.password);
 
           if (response?.id) {
               router.push(ROUTES.dashboard);

src/app/(domains)/(auth)/signup/page.tsx

@@ -10,7 +10,7 @@ import OAuth from "@/components/OAuth";
 import PasswordStrengthIndicator from "@/components/PasswordStrength";
 import { useI18n } from '@/hooks/useI18n';
 import { supabase } from "@/libs/supabase/client";
-import SupabaseService from "@/services/supabase";
+import AuthService from "@/services/auth";
 import { isValidEmail } from "@/utils/isValidEmail";
 
 const initialState = {
@@ -90,8 +90,8 @@ export default function SignUp() {
         throw new Error("Terms not accepted");
       }
 
-      const SupabaseServiceInstance = new SupabaseService(supabase);
-      const response = await SupabaseServiceInstance.signUp(state.inputValue.email, state.inputValue.password);
+      const AuthServiceInstance = new AuthService(supabase);
+      const response = await AuthServiceInstance.signUp(state.inputValue.email, state.inputValue.password);
 
       if (response?.id) {
         dispatch({ type: "SET_REGISTRATION_COMPLETE", payload: true });

src/app/(domains)/dashboard/settings/page.tsx

@@ -2,15 +2,15 @@ import { headers } from "next/headers";
 
 import SettingsOptions from "@/components/SettingsOptions";
 import { createClient } from "@/libs/supabase/server";
-import SupabaseService from "@/services/supabase";
+import AuthService from "@/services/auth";
 import { capitalize } from "@/utils/capitalize";
 import { loadTranslationsSSR } from '@/utils/loadTranslationsSSR';
 
 export default async function Settings() {
     const { translate } = await loadTranslationsSSR();
     const supabase = await createClient();
-    const SupabaseServiceInstance = new SupabaseService(supabase);
-    const data = await SupabaseServiceInstance.getUser();
+    const AuthServiceInstance = new AuthService(supabase);
+    const data = await AuthServiceInstance.getUser();
     const sharedData = JSON.parse((await headers()).get('x-shared-data') || '{}');
 
     return (

src/app/(domains)/dashboard/subscription/page.tsx

@@ -3,16 +3,16 @@ import { headers } from "next/headers";
 import ManageBilling from "@/components/ManageBilling";
 import PricingSection from "@/components/Pricing";
 import { createClient } from "@/libs/supabase/server";
-import SupabaseService from "@/services/supabase";
+import AuthService from "@/services/auth";
 import { capitalize } from "@/utils/capitalize";
 import { loadTranslationsSSR } from '@/utils/loadTranslationsSSR';
 
 export default async function Subscription() {
   const { translate } = await loadTranslationsSSR();
   const sharedData = JSON.parse((await headers()).get('x-shared-data') || '{}');
   const supabase = await createClient();
-  const SupabaseServiceInstance = new SupabaseService(supabase);
-  const session = await SupabaseServiceInstance.getSession();
+  const AuthServiceInstance = new AuthService(supabase);
+  const session = await AuthServiceInstance.getSession();
 
   const currentPlanText = translate("subscription-current-plan-description");
   const currentPlan = capitalize(sharedData?.plan);

src/components/MyAccount.tsx

@@ -5,9 +5,9 @@ import { useState, useEffect, useRef } from 'react';
 
 import { useI18n } from "@/hooks/useI18n";
 import { supabase } from '@/libs/supabase/client';
-import SupabaseService from '@/services/supabase';
+import AuthService from '@/services/auth';
 
-const SupabaseServiceInstance = new SupabaseService(supabase);
+const AuthServiceInstance = new AuthService(supabase);
 
 function MyAccount() {
     const { translate } = useI18n();
@@ -58,7 +58,7 @@ function MyAccount() {
                     <a
                         className="block px-4 py-2 text-gray-700 hover:bg-gray-100 cursor-pointer flex items-center justify-between"
                         onClick={async () => {
-                            await SupabaseServiceInstance.signOut();
+                            await AuthServiceInstance.signOut();
                             window.location.reload();
                         }}
                     >

src/components/Navbar.tsx

@@ -6,7 +6,7 @@ import { useEffect, useState } from "react";
 
 import { useI18n } from "@/hooks/useI18n";
 import { supabase } from '@/libs/supabase/client';
-import SupabaseService from '@/services/supabase';
+import AuthService from '@/services/auth';
 
 import LanguageSelector from "./LanguageSelector";
 import Spinner from "./Spinner";
@@ -20,8 +20,8 @@ export default function Navbar() {
 
     useEffect(() => {
         const getUserSession = async () => {
-            const SupabaseServiceInstance = new SupabaseService(supabase);
-            const user = await SupabaseServiceInstance.getUserId();
+            const AuthServiceInstance = new AuthService(supabase);
+            const user = await AuthServiceInstance.getUserId();
             if (!!user) {
                 setIsLogged(true);
             } else {

src/components/OAuth.tsx

@@ -1,25 +1,25 @@
 import { PROVIDERS_IMAGE_URL } from "@/constants/PROVIDERS_IMAGE_URL";
 import { supabase } from "@/libs/supabase/client";
-import SupabaseService from "@/services/supabase";
+import AuthService from "@/services/auth";
 
 export default function OAuth() {
-    const SupabaseServiceInstance = new SupabaseService(supabase);
+    const AuthServiceInstance = new AuthService(supabase);
 
     const PROVIDERS_MAP = [
         {
             provider: 'Google',
             logo: PROVIDERS_IMAGE_URL.Google,
-            onClick: () => SupabaseServiceInstance.signInProvider('google')
+            onClick: () => AuthServiceInstance.signInWithProvider('google')
         },
         {
             provider: 'Facebook',
             logo: PROVIDERS_IMAGE_URL.Facebook,
-            onClick: () => SupabaseServiceInstance.signInProvider('facebook')
+            onClick: () => AuthServiceInstance.signInWithProvider('facebook')
         },
         {
             provider: 'Twitter',
             logo: PROVIDERS_IMAGE_URL.Twitter,
-            onClick: () => SupabaseServiceInstance.signInProvider('twitter')
+            onClick: () => AuthServiceInstance.signInWithProvider('twitter')
         }
     ]
     return (
@@ -51,7 +51,7 @@
             className="p-2 border border-gray-300 rounded-md bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
             onClick={onClick}
         >
             <img
                 src={logo}
                 alt={provider}
                 className="w-5 h-5"

src/components/SettingsOptions.tsx

@@ -6,7 +6,7 @@ import ButtonComponent from "@/components/Button";
 import { useI18n } from "@/hooks/useI18n";
 import { useToast } from "@/hooks/useToast";
 import { supabase } from "@/libs/supabase/client";
-import SupabaseService from "@/services/supabase";
+import AuthService from "@/services/auth";
 
 type SettingsOptionsProps = {
     userEmail?: string;
@@ -15,15 +15,15 @@ type SettingsOptionsProps = {
 
 function SettingsOptions({ userEmail, currentPlan }: SettingsOptionsProps) {
     const { translate } = useI18n();
-    const SupabaseServiceInstance = new SupabaseService(supabase);
+    const AuthServiceInstance = new AuthService(supabase);
     const { addToast } = useToast();
     const [isLoading, setIsLoading] = useState({
         forgotPassword: false,
     });
 
     const handleForgotPassword = async (userEmail: string) => {
         setIsLoading((data) => ({ ...data, forgotPassword: true }));
-        const response = await SupabaseServiceInstance.forgotPassword(userEmail);
+        const response = await AuthServiceInstance.forgotPassword(userEmail);
 
         if (response) {
             await addToast({

src/hooks/useCheckout.ts

@@ -3,8 +3,8 @@ import { FIXED_CURRENCY } from "@/constants/FIXED_CURRENCY";
 import { HAS_FREE_TRIAL } from "@/constants/HAS_FREE_TRIAL";
 import { useToast } from "@/hooks/useToast";
 import { supabase } from '@/libs/supabase/client';
-import StripeService from '@/services/stripe';
-import SupabaseService from '@/services/supabase';
+import AuthService from '@/services/auth';
+import PaymentService from '@/services/payment';
 
 export const useCheckout = () => {
     const { addToast } = useToast();
@@ -15,8 +15,8 @@ export const useCheckout = () => {
         }
 
         setIsLoading(true);
-        const SupabaseServiceInstance = new SupabaseService(supabase);
-        const user = await SupabaseServiceInstance.getUserId();
+        const AuthServiceInstance = new AuthService(supabase);
+        const user = await AuthServiceInstance.getUserId();
 
         if (!user) {
             window.location.href = '/signin';
@@ -35,7 +35,7 @@ export const useCheckout = () => {
             const sessionId = jsonResponse.id;
 
             if (sessionId) {
-                await StripeService.redirectToCheckout(sessionId);
+                await PaymentService.redirectToCheckout(sessionId);
             } else {
                 addToast({
                     id: Date.now().toString(),

src/middleware.ts

@@ -3,25 +3,39 @@ import type { NextRequest } from 'next/server';
 
 import { updateSession } from '@/libs/supabase/middleware';
 import { createClient } from '@/libs/supabase/server';
-import { fetchSubscription } from '@/services/api/subscription';
-import SupabaseService from '@/services/supabase';
+import AuthService from '@/services/auth';
 
 export async function middleware(request: NextRequest) {
   await updateSession(request);
   const url = request.nextUrl.clone();
 
   if (url.pathname.startsWith('/dashboard')) {
     const supabase = await createClient();
-    const SupabaseServiceInstance = new SupabaseService(supabase);
+    const AuthServiceInstance = new AuthService(supabase);
 
-    const userId = await SupabaseServiceInstance.getUserId();
+    const userId = await AuthServiceInstance.getUserId();
 
     if (!userId) {
       const redirectUrl = new URL('/signin', request.url);
       return NextResponse.redirect(redirectUrl);
     }
 
-    const subscription = await fetchSubscription(userId);
+
+    const subscriptionRequest = await fetch(
+      `${process.env.NEXT_PUBLIC_PROJECT_URL}/api/payments/get-subscription?userId=${userId}`,
+      {
+        method: 'GET',
+        cache: 'no-store',
+      }
+    );
+
+    if (!subscriptionRequest.ok) {
+      console.error('Failed to fetch subscription:', subscriptionRequest.statusText);
+      return null;
+    }
+
+    const data = await subscriptionRequest.json();
+    const subscription = data.subscription;
 
     const plan = subscription &&
       subscription?.status === 'active'