@solidstarters/create-solid-app 1.2.12 → 1.2.14

package/templates/next-template/app/api/auth/[...nextauth]/route.ts

@@ -1,220 +1,6 @@
 import NextAuth from "next-auth";
-import CredentialsProvider from "next-auth/providers/credentials";
-import GoogleProvider from "next-auth/providers/google";
-import { NextRequest } from "next/server";
-import { jwtDecode } from "jwt-decode";
-import { JWT } from "next-auth/jwt";
-import axios from "axios";
-import { signOut } from "next-auth/react";
+import { authProviders } from "@solidstarters/solid-core-ui";
 
-let isRefreshing = false;
-let globalToken: JWT;
+const auth = NextAuth(authProviders);
 
-type Credentials = {
-  username: string,
-  email: string,
-  password: string,
-  accessToken: string
-};
-
-async function refreshAccessToken(token: any) {
-  try {
-    const response = await axios.post(
-      `${process.env.NEXT_PUBLIC_BACKEND_API_URL}/api/iam/refresh-tokens`,
-      { refreshToken: token.refreshToken }
-    );
-
-    const { accessToken, refreshToken } = response.data.data;
-    const { exp: accessTokenExpires } = jwtDecode<{ exp: number }>(accessToken);
-
-    return {
-      ...token,
-      accessToken,
-      refreshToken,
-      accessTokenExpires: accessTokenExpires * 1000, // Convert seconds to milliseconds
-    };
-  } catch (error: any) {
-    console.error("Failed to refresh access token:", error.message || error.response?.data);
-    return {
-      // ...token,
-      error: "RefreshAccessTokenError",
-    };
-  }
-}
-
-
-async function auth(req: NextRequest, res: any) {
-  return await NextAuth(req, res, {
-    session: {
-      strategy: "jwt",
-    },
-    providers: [
-      GoogleProvider({
-        clientId: process.env.GOOGLE_ID!,
-        clientSecret: process.env.GOOGLE_CLIENT_SECRET!
-      }),
-      CredentialsProvider({
-        // @ts-ignore
-        async authorize(credentials: Credentials) {
-          const { username, email, password, accessToken } = credentials;
-
-          try {
-            if (accessToken) {
-              let data = JSON.stringify({
-                username: email,
-                email: email,
-                password: password
-              });
-
-              let config = {
-                method: 'get',
-                url: `${process.env.API_URL}/api/iam/me`,
-                headers: {
-                  'accept': '*/*',
-                  'Content-Type': 'application/json',
-                  'Authorization': `Bearer ${accessToken}`
-                }
-              };
-
-
-              const loginResponse = await axios.request(config);
-
-              if (loginResponse.status == 400) {
-                throw new Error(loginResponse.data.message);
-              }
-              if (loginResponse.status == 401) {
-                throw new Error(loginResponse.data.message);
-              }
-
-              let base64decoded = jwtDecode(loginResponse.data.data.accessToken);
-              let accessTokenExpires = base64decoded.exp;
-
-              return {
-                accessToken: loginResponse.data.data.accessToken,
-                refreshToken: loginResponse.data.data.refreshToken,
-                accessTokenExpires: accessTokenExpires,
-                ...loginResponse.data.data,
-              };
-
-            } else {
-
-              let data = JSON.stringify({
-                username: email,
-                email: email,
-                password: password
-              });
-
-              let config = {
-                method: 'post',
-                maxBodyLength: Infinity,
-                url: `${process.env.API_URL}/api/iam/authenticate`,
-                headers: {
-                  'accept': '*/*',
-                  'Content-Type': 'application/json'
-                },
-                data: data
-              };
-
-
-              const loginResponse = await axios.request(config);
-
-              // const authenticateResponse = await fetch(
-              //   `${process.env.API_URL}/api/iam/authenticate`,
-              //   {
-              //     method: "Post",
-              //     headers: {
-              //     'accept': '*/*', 
-              //       "Content-Type": "application/json"
-              //     },
-              //     body: JSON.stringify({
-              //       username: email,
-              //       email: email,
-              //       password: password
-              //     })
-              //   }
-              // );
-
-              // const loginResponse = await authenticateResponse.json();
-
-              // const response = await fetch(
-              //   `${process.env.API_URL}/api/iam/me`,
-              //   {
-              //     method: "Get",
-              //     headers: {
-              //       "Content-Type": "application/json",
-              //       "Authorization": `Bearer ${loginResponse.data.accessToken}`,
-              //     },
-              //   }
-              // );
-
-              // const responseData = await response.json();
-
-              if (loginResponse.status == 400) {
-                throw new Error(loginResponse.data.message);
-              }
-              if (loginResponse.status == 401) {
-                throw new Error(loginResponse.data.data.message);
-              }
-              let base64decoded = jwtDecode(loginResponse.data.data.accessToken);
-              let accessTokenExpires = base64decoded.exp;
-              const returnResponse = {
-                accessToken: loginResponse.data.data.accessToken,
-                refreshToken: loginResponse.data.data.refreshToken,
-                accessTokenExpires: accessTokenExpires,
-                ...loginResponse.data.data,
-              }
-              return returnResponse;
-            }
-          } catch (error: any) {
-            throw new Error(error.message ? error.message : error?.response?.data?.message);
-          }
-        },
-      }),
-    ],
-    callbacks: {
-      jwt: async ({ token, user }) => {
-        if (Date.now() >= (token.accessTokenExpires as number)) {
-          return refreshAccessToken(token); // Call the refresh token function
-        }
-
-        // If there is no user (first time login or session), we return the user data
-        if (user) {
-          const base64decoded = jwtDecode(user.accessToken);
-          const accessTokenExpires = base64decoded.exp && base64decoded.exp * 1000; // Convert from seconds to milliseconds
-          return {
-            ...token,
-            accessToken: user.accessToken,
-            refreshToken: user.refreshToken,
-            accessTokenExpires: accessTokenExpires,
-            user: user,  // Include the user data here
-          };
-        }
-
-        return token; // If no update needed, just return the existing token
-      },
-      session: async ({ session, token }) => {
-        const user = token.user || {};  // Default to an empty object if user is undefined or null
-        session.error = token.error ? token.error : null;
-        // if (token.error) {
-        //   return null
-        // }
-        session.user = {
-          ...user, // Include the user info from the token
-          accessToken: token?.accessToken,  // Add the access token to session for client use
-          refreshToken: token?.refreshToken,  // Add refresh token to session for future use
-          accessTokenExpires: token?.accessTokenExpires && token?.accessTokenExpires,  // Store the expiry time
-        };
-        return session;
-
-      },
-    },
-    pages: {
-      signIn: "/auth/login",
-    },
-    secret: process.env.NEXTAUTH_SECRET,
-  });
-}
-
-
-
-export { auth as GET, auth as POST };
+export { auth as GET, auth as POST };

package/templates/next-template/app/auth/confirm-forgot-password/page.tsx

@@ -1,15 +1,10 @@
 "use client"
 import {SolidResetPassword} from "@solidstarters/solid-core-ui";
-import { useSearchParams } from "next/navigation";
 
 const ForgotPasswordPage = () => {
-  const searchParams = useSearchParams();
-  const token = searchParams.get('token');
-  const userName = searchParams.get('username');
-  const decodedUsername = userName ? decodeURIComponent(userName) : '';
   return (
     <div>
-      <SolidResetPassword verificationToken={token} username={decodedUsername} />
+      <SolidResetPassword />
     </div>
   );
 };

package/templates/next-template/app/auth/initiate-forgot-password-thank-you/page.tsx

@@ -1,45 +1,10 @@
 "use client"
 
-import { LayoutContext } from "@solidstarters/solid-core-ui";
-import Link from "next/link";
-import { useSearchParams } from "next/navigation";
-import { useContext } from "react";
+import { ForgotPasswordThankYou } from "@solidstarters/solid-core-ui";
 
 const InitiateForgotPasswordThankYou = () => {
-    const { layoutConfig } = useContext(LayoutContext);
-    const { authLayout } = layoutConfig;
-    const searchParams = useSearchParams();
-    const email = searchParams.get('email');
-    const decodedEmail = email ? decodeURIComponent(email) : '';
     return (
-        <div className="">
-            <div className={`auth-container ${authLayout === 'Center' ? 'center' : 'side'}`}>
-                {authLayout === 'Center' &&
-                    <div className="flex justify-content-center">
-                        <div className="solid-logo flex align-items-center gap-3">
-                            <img
-                                alt="solid logo"
-                                src={'/images/SS-Logo-1 1.png'}
-                                className="position-relative img-fluid"
-                            />
-                            <div>
-                                <p className="solid-logo-title">
-                                    Solid<br />Starters
-                                </p>
-                            </div>
-                        </div>
-                    </div>
-                }
-                <h5 className='text-center font-bold'>We have sent an email to yourregistered email address</h5>
-                <p className='font-bold text-center'>{decodedEmail}</p>
-                <p className='text-center'>
-                    Please follow the instructions in the email
-                </p>
-                <div className='text-center'>
-                    <Link href={"/"} className='btn'>Back to Home</Link>
-                </div>
-            </div>
-        </div>
+        <ForgotPasswordThankYou />
     );
 };
 

package/templates/next-template/app/auth/initiate-google-oauth/page.tsx

@@ -0,0 +1,9 @@
+import { GoogleAuthChecking } from "@solidstarters/solid-core-ui";
+
+const InitiateGoogleOAuth = () => {
+    return (
+        <GoogleAuthChecking />
+    )
+}
+
+export default InitiateGoogleOAuth

package/templates/next-template/app/auth/initiate-login/page.tsx

@@ -0,0 +1,13 @@
+"use client"
+import { SolidInitialLoginOtp } from "@solidstarters/solid-core-ui";
+import { useSearchParams } from "next/navigation";
+
+const InitiateLoginConfirm = () => {
+    return (
+        <div>
+            <SolidInitialLoginOtp />
+        </div>
+    );
+};
+
+export default InitiateLoginConfirm;

package/templates/next-template/app/auth/initiate-register/page.tsx

@@ -0,0 +1,14 @@
+"use client"
+import { SolidInitiateRegisterOtp } from "@solidstarters/solid-core-ui";
+
+import { useSearchParams } from "next/navigation";
+
+const InitiateRegisterConfirm = () => {
+    return (
+        <div>
+            <SolidInitiateRegisterOtp />
+        </div>
+    );
+};
+
+export default InitiateRegisterConfirm;

package/templates/next-template/app/auth/layout.tsx

@@ -1,129 +1,10 @@
-"use client"
-import { LayoutContext, useLazyGetAuthSettingsQuery } from "@solidstarters/solid-core-ui";
-import { toggleTheme } from "@solidstarters/solid-core-ui";
-import { LayoutConfig } from "@solidstarters/solid-core-ui";
-import { PrimeReactContext } from "primereact/api";
-import { useContext, useEffect, useState } from "react";
-import { useDispatch, useSelector } from "react-redux";
-import { usePathname, useRouter } from "next/navigation";
-import Link from "next/link";
-import { Dialog } from "primereact/dialog";
-import { Button } from "primereact/button";
+import { AuthLayout } from "@solidstarters/solid-core-ui";
 
-const AuthLayout = ({ children }: { children: React.ReactNode }) => {
-    const [trigger, { data: solidSettingsData }] = useLazyGetAuthSettingsQuery()
-    const [allowRegistration, setAllowRegistration] = useState<boolean | null>(null);
-    const [isRestricted, setIsRestricted] = useState(false);
-    const pathname = usePathname();
-    const router = useRouter();
-
-    const { changeTheme } = useContext(PrimeReactContext);
-    const { layoutConfig, setLayoutConfig } = useContext(LayoutContext);
-    const dispatch = useDispatch();
-    const _changeTheme = (theme: string, colorScheme: string) => {
-        changeTheme?.(layoutConfig.theme, theme, 'theme-css', () => {
-            setLayoutConfig((prevState: LayoutConfig) => ({ ...prevState, theme, colorScheme }));
-        });
-    };
-    useEffect(() => {
-        const theme = solidSettingsData?.data?.authPagesTheme; // 'dark' or 'light'
-        if (theme) {
-            dispatch(toggleTheme()); // Dispatch Redux action
-            _changeTheme(
-                theme === "dark" ? "solid-dark-purple" : "solid-light-purple",
-                theme
-            );
-        }
-    }, [solidSettingsData]);
-    useEffect(() => {
-        trigger("") // Fetch settings on mount
-    }, [trigger])
-
-    useEffect(() => {
-        // Hardcoded as false for demonstration
-        const iamAllowPublicRegistration = solidSettingsData?.data?.iamAllowPublicRegistration;
-
-        if (!iamAllowPublicRegistration) {
-            setAllowRegistration(false);
-            if (pathname === "/auth/register") {
-                setIsRestricted(true);
-            }
-        } else {
-            setAllowRegistration(true);
-        }
-    }, [pathname]);
-
-    if (allowRegistration === null) return null;
-
-    const authChildren = allowRegistration || pathname !== "/auth/register" ? children : null;
-    const handleRegistration = () => {
-        router.push("/auth/login");
-        setIsRestricted(false);
-    }
+const AuthLayoutContainer = ({ children }: { children: React.ReactNode }) => {
     return (
-        <div className={`solid-auth-theme-wrapper ${solidSettingsData?.data?.authPagesLayout || 'center'}`}>
-            <div className={`${solidSettingsData?.data?.authPagesLayout !== 'center' ? 'grid w-full h-full m-0' : ''}`}>
-                {solidSettingsData?.data?.authPagesLayout === 'left' &&
-                    <div className='col-6 flex align-items-center justify-content-center solid-login-dark-bg'>
-                        <div className="w-full">
-                            {authChildren}
-                        </div>
-                    </div>
-                }
-
-                <div
-                    className={`${solidSettingsData?.data?.authPagesLayout !== 'center' ? 'col-6 position-relative' : ''} 
-                                ${solidSettingsData?.data?.authPagesLayout === 'left' ? 'solid-left-layout' : ''} 
-                                ${solidSettingsData?.data?.authPagesLayout === 'right' ? 'solid-right-layout' : ''}`.trim()}
-                >
-                    {solidSettingsData?.data?.authPagesLayout !== 'center' &&
-                        <div className="solid-logo flex align-items-center gap-3">
-                            <img
-                                alt="solid logo"
-                                src={'/images/SS-Logo-1 1.png'}
-                                className="position-relative img-fluid"
-                            />
-                            <div>
-                                <p className="solid-logo-title">
-                                    Solid<br />Starters
-                                </p>
-                            </div>
-                        </div>
-                    }
-                </div>
-
-                {solidSettingsData?.data?.authPagesLayout === 'center' && <div className="solid-center-layout">
-                    {authChildren}
-                </div>}
-                {solidSettingsData?.data?.authPagesLayout === 'right' &&
-                    <div className='col-6 flex align-items-center justify-content-center solid-login-dark-bg'>
-                        <div className="w-full">
-                            {authChildren}
-                        </div>
-                    </div>
-                }
-            </div>
-            <div className="absolute solid-auth-footer flex align-items-center justify-content-between">
-                <div>
-                    <p className="solid-auth-input-label text-sm m-0">Made with <svg className="mx-1" width="12px" height="12px" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><g id="SVGRepo_bgCarrier" stroke-width="0"></g><g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g><g id="SVGRepo_iconCarrier"> <path d="M1.24264 8.24264L8 15L14.7574 8.24264C15.553 7.44699 16 6.36786 16 5.24264V5.05234C16 2.8143 14.1857 1 11.9477 1C10.7166 1 9.55233 1.55959 8.78331 2.52086L8 3.5L7.21669 2.52086C6.44767 1.55959 5.28338 1 4.05234 1C1.8143 1 0 2.8143 0 5.05234V5.24264C0 6.36786 0.44699 7.44699 1.24264 8.24264Z" fill="#ff0000"></path> </g></svg> in Mumbai</p>
-                </div>
-                <div className="flex align-items-center gap-5">
-                    <p className="solid-auth-subtitle m-0"> <Link href={'#'}>Terms of Service</Link></p>
-                    <p className="solid-auth-subtitle m-0"> <Link href={'#'}>Privacy Policy.</Link></p>
-                </div>
-            </div>
-            <Dialog
-                visible={isRestricted}
-                onHide={handleRegistration}
-                header="Access Restricted"
-                footer={<Button label="Close" onClick={handleRegistration} size="small" />}
-                draggable={false}
-            >
-                <p>Sign-up is not available. Please contact the admin.</p>
-            </Dialog>
-        </div>
+        <AuthLayout>
+            {children}
+        </AuthLayout>
     )
 }
-
-
-export default AuthLayout
+export default AuthLayoutContainer