@solidstarters/solid-core-ui 1.1.16 → 1.1.18

package/src/components/layout/AppConfig.tsx

@@ -41,7 +41,8 @@ const AppConfig = (props: AppConfigProps) => {
     };
 
     const applyScale = () => {
-        document.documentElement.style.fontSize = layoutConfig.scale + 'px';
+        // document.documentElement.style.fontSize = layoutConfig.scale + 'px';
+        document.documentElement.style.fontSize = 14 + 'px';
     };
 
     useEffect(() => {
@@ -51,7 +52,7 @@ const AppConfig = (props: AppConfigProps) => {
 
     return (
         <>
-            <button className="layout-config-button config-link" type="button" onClick={onConfigButtonClick}>
+            {/* <button className="layout-config-button config-link" type="button" onClick={onConfigButtonClick}>
                 <i className="pi pi-cog"></i>
             </button>
 
@@ -95,7 +96,7 @@ const AppConfig = (props: AppConfigProps) => {
                         </button>
                     </div>
                 </div>
-            </Sidebar>
+            </Sidebar> */}
         </>
     );
 };

package/src/components/layout/user-profile-menu.tsx

@@ -82,7 +82,7 @@ const UserProfileMenu = () => {
             </div>
             <InputSwitch checked={checked} onChange={handleThemeToggle} />
           </div>
-          <div className="user-profile-body p-3">
+          <div className="user-profile-body py-1">
             <Button
               text
               severity="secondary"

package/src/index.ts

@@ -215,6 +215,9 @@ export { SingleSelectAutoCompleteField } from '@/components/common/SingleSelectA
 export { SocialMediaLogin } from '@/components/common/SocialMediaLogin';
 export { BackButton } from '@/components/common/BackButton'
 export { FileReaderExt } from '@/components/common/FileReaderExt'
+export { NotFound } from '@/components/common/NotFound'
+import Error from '@/components/common/error';
+export { Error };
 export { SolidFormStepper } from '@/components/common/SolidFormStepper'
 
 // export { SolidListViewOptions } from '@/components/core/common/SolidListViewOptions';
@@ -468,6 +471,10 @@ export { setIsAuthenticated, setUser } from '@/redux/features/userSlice';
 // export type { AppDispatch} from '@/redux/store';
 // export {initializeStore} from '@/redux/store';
 
+// Admin Parent Layout
+export { AdminLayout } from '@/components/layout/AdminLayout';
+export { SolidAdmin } from '@/components/common/SolidAdmin';
+
 // Re-export default exports
 //Login.tsx
 export { default as Login } from '@/components/auth/Login';
@@ -480,6 +487,9 @@ export { default as CodeEditor } from '@/components/common/CodeEditor';
 // export { default as FilterComponent } from '@/components/common/FilterComponent';
 //MarkdownViewer.tsx
 export { default as MarkdownViewer } from '@/components/common/MarkdownViewer';
+
+
+export { default as SolidFormLayouts } from '@/components/core/form/SolidFormLayouts';
 //SolidFormView.tsx
 export { default as SolidFormView } from '@/components/core/form/SolidFormView';
 //KanbanBoard.tsx
@@ -582,6 +592,7 @@ export { default as UserSidebar } from '@/components/layout/UserSidebar';
 export { default as menu } from '@/helpers/menu';
 
 // Auth 
+export { AuthLayout } from '@/components/auth/AuthLayout';
 export { default as SolidForgotPassword } from '@/components/auth/SolidForgotPassword';
 export { default as SolidLogin } from '@/components/auth/SolidLogin';
 export { default as SolidOTPVerify } from '@/components/auth/SolidOTPVerify';
@@ -590,6 +601,8 @@ export { default as SolidResetPassword } from '@/components/auth/SolidResetPassw
 export { default as SolidChangeForcePassword } from '@/components/auth/SolidChangeForcePassword';
 export { default as SolidInitialLoginOtp } from '@/components/auth/SolidInitialLoginOtp';
 export { default as SolidInitiateRegisterOtp } from '@/components/auth/SolidInitiateRegisterOtp';
+export { GoogleAuthChecking } from '@/components/auth/GoogleAuthChecking';
+export { ForgotPasswordThankYou } from '@/components/auth/ForgotPasswordThankYou';
 
 //redux
 export { default as authenticationReducer } from '@/redux/features/authSlice';
@@ -603,4 +616,7 @@ export { default as GenerateModelCodeRowAction } from '@/components/core/extensi
 
 // types
 export type { LayoutConfig } from '@/types';
-export { GeneralSettings } from '@/components/common/GeneralSettings';
+export { GeneralSettings } from '@/components/common/GeneralSettings';
+
+export { default as authProviders } from '@/nextAuth/authProviders'
+export { SolidThemeLink } from '@/components/common/SolidThemeLink';

package/src/nextAuth/authProviders.tsx

@@ -0,0 +1,220 @@
+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 { refreshAccessToken } from "./refreshAccessToken";
+import { NextAuthOptions } from "next-auth";
+
+type Credentials = {
+    username: string,
+    email: string,
+    password: string,
+    accessToken: string,
+    accessCode: string,
+};
+
+const authProviders: NextAuthOptions = {
+    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, accessCode } = credentials;
+
+                try {
+                    if (accessCode) {
+                        let config = {
+                            method: 'get',
+                            url: `${process.env.API_URL}/api/iam/google/authenticate?accessCode=${accessCode}`,
+                        };
+
+
+                        const loginResponse = await axios.request(config);
+                        console.log("loginResponse", loginResponse.data);
+
+                        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 {
+                        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: {
+        // @ts-ignore
+        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
+        },
+        // @ts-ignore
+        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 default authProviders

package/src/nextAuth/refreshAccessToken.tsx

@@ -0,0 +1,27 @@
+import axios from "axios";
+import { jwtDecode } from "jwt-decode";
+
+export 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",
+      };
+    }
+  }

package/src/redux/api/modelApi.ts

@@ -7,7 +7,7 @@ export const modelsApi = createApi({
     endpoints: (builder) => ({
         getModels: builder.query({
             query: (qs) => {
-                return `/model-metadata?populate[0]=module&${qs}`
+                return `/model-metadata?&populate[1]=userKeyField&${qs}`
             },
             transformResponse: (response: any) => {
                 if (response.error) {
@@ -64,7 +64,14 @@ export const modelsApi = createApi({
                 method: 'DELETE',
             }),
         }),
+        updateUserKey: builder.mutation({
+            query: (data) => ({
+                url: `/model-metadata/update-user-key`,
+                method: 'POST',
+                body: data,
+            }), 
+        }),
     })
 })
 
-export const { useGetModelsQuery,useLazyGetModelsQuery, useLazyGetmodelByIdQuery, useGetmodelByIdQuery, useCreatemodelMutation,useGenerateCodeForModelMutation,useUpdatemodelMutation, useDeleteMultipleModelsMutation ,useDeletemodelMutation } = modelsApi  
+export const { useGetModelsQuery,useLazyGetModelsQuery, useLazyGetmodelByIdQuery, useGetmodelByIdQuery, useCreatemodelMutation,useGenerateCodeForModelMutation,useUpdatemodelMutation, useDeleteMultipleModelsMutation ,useDeletemodelMutation, useUpdateUserKeyMutation } = modelsApi