added authentication( still needs work) #7

Merged
ameye merged 1 commits from adding-login into master 2023-10-21 10:32:27 +00:00
7 changed files with 327 additions and 55 deletions
+1
View File
@@ -0,0 +1 @@
AUX_ENDPOINT="http://localhost:50016/api"
+110 -29
View File
@@ -1,6 +1,9 @@
import React, { useState } from "react"; import React, { useState } from "react";
import { useRouter } from "next/router";
// import { cookies } from "next/headers";
import Link from "next/link"; import Link from "next/link";
import Grid from "@mui/material/Grid"; import Grid from "@mui/material/Grid";
import LoadingButton from "@mui/lab/LoadingButton";
import IconButton from "@mui/material/IconButton"; import IconButton from "@mui/material/IconButton";
import { Typography } from "@mui/material"; import { Typography } from "@mui/material";
import { Box } from "@mui/system"; import { Box } from "@mui/system";
@@ -10,16 +13,77 @@ import Button from "@mui/material/Button";
import Visibility from "@mui/icons-material/Visibility"; import Visibility from "@mui/icons-material/Visibility";
import VisibilityOff from "@mui/icons-material/VisibilityOff"; import VisibilityOff from "@mui/icons-material/VisibilityOff";
import styles from "./signinform.module.css"; import styles from "./signinform.module.css";
import WrenchBoardLogo from "@/public/images/logos/wrenchboard-logo.png"; import Fetcher from "services/Fetcher";
const SignInForm = () => { const SignInForm = () => {
const handleSubmit = (event) => { const [formValues, setFormValues] = useState({
email: "",
password: "",
});
const [errorHandlers, setErrorHandlers] = useState({
email: false,
password: false,
});
const [loading, setLoading] = useState(false);
const api = new Fetcher();
const router = useRouter();
const handleChange = (event) => {
setFormValues({ ...formValues, [event.target.name]: event.target.value });
};
// "use server"
const handleSubmit = async (event) => {
event.preventDefault(); event.preventDefault();
const data = new FormData(event.currentTarget);
console.log({ const { email, password } = formValues;
email: data.get("email"),
password: data.get("password"), if (email === "" || password === "") {
}); setErrorHandlers({ ...errorHandlers, email: true, password: true });
setTimeout(() => {
setErrorHandlers({ ...errorHandlers, email: false, password: false });
}, 1500);
return;
} else if (email === "") {
setErrorHandlers({ ...errorHandlers, email: true });
setTimeout(() => {
setErrorHandlers({ ...errorHandlers, email: false });
}, 1500);
return;
} else if (password === "") {
setErrorHandlers({ ...errorHandlers, password: true });
setTimeout(() => {
setErrorHandlers({ ...errorHandlers, password: false });
}, 1500);
return;
}
setLoading(true);
try {
const data = {
username: email,
password,
};
const res = await api.login(data);
if (res.status === 204 || res.length === 0) {
setErrorHandlers({ ...errorHandlers, email: true, password: true });
}
// Store the token in cookies
// const cookieStore = cookies();
// cookieStore.set("cmc-profile", { ...res.profile }, { secure: true });
// cookieStore.set("cmc-token", res.token, { secure: true });
document.cookie = "cmc-token=" + res.token;
// setLoading(false);
router.push("/");
console.log(res);
} catch (error) {
setLoading(false);
console.log(error);
}
}; };
const [showPassword, setShowPassword] = useState(false); const [showPassword, setShowPassword] = useState(false);
@@ -95,13 +159,20 @@ const SignInForm = () => {
required required
fullWidth fullWidth
id="email" id="email"
label="Email Address" label={
errorHandlers.email
? "Incomplete/wrong email"
: "Email Address"
}
value={formValues.email}
onChange={handleChange}
name="email" name="email"
autoComplete="email" autoComplete="email"
InputProps={{ InputProps={{
style: { borderRadius: 8 }, style: { borderRadius: 8 },
}} }}
sx={textFieldStyles} sx={textFieldStyles}
error={errorHandlers.email}
/> />
</Grid> </Grid>
@@ -122,10 +193,17 @@ const SignInForm = () => {
required required
fullWidth fullWidth
name="password" name="password"
label="Password" label={
errorHandlers.password
? "Incomplete/wrong password"
: "Password"
}
value={formValues.password}
type={showPassword ? "text" : "password"} type={showPassword ? "text" : "password"}
id="password" id="password"
autoComplete="new-password" autoComplete="new-password"
onChange={handleChange}
error={errorHandlers.password}
InputProps={{ InputProps={{
style: { borderRadius: 8 }, style: { borderRadius: 8 },
endAdornment: ( endAdornment: (
@@ -154,26 +232,29 @@ const SignInForm = () => {
</Grid> </Grid>
</Box> </Box>
<Button <Box sx={{ backgroundColor: "#4687BA" }}>
type="submit" <LoadingButton
fullWidth type="submit"
variant="contained" fullWidth
sx={{ variant="contained"
mt: 2, loading={loading}
backgroundColor: "#4687BA", disabled={loading}
textTransform: "capitalize", // loadingPosition="end"
borderRadius: "8px", sx={{
fontWeight: "500", textTransform: "capitalize",
fontSize: "16px", borderRadius: "8px",
padding: "12px 10px", fontWeight: "500",
color: "#fff !important", fontSize: "16px",
"&:hover": { padding: "12px 10px",
backgroundColor: "rgba(70, 135, 186, 0.8)" color: "#fff !important",
}, "&:hover": {
}} backgroundColor: "rgba(70, 135, 186, 0.8)",
> },
Sign In }}
</Button> >
<span>Sign In</span>
</LoadingButton>
</Box>
</Box> </Box>
</Box> </Box>
</Grid> </Grid>
+1 -1
View File
@@ -20,7 +20,7 @@ const Layout = ({ children }) => {
useEffect(() => { useEffect(() => {
const authenticationPages = [ const authenticationPages = [
"/", // "/",
"/auth", "/auth",
"/auth/login", "/auth/login",
"/auth/sign-up", "/auth/sign-up",
+44 -9
View File
@@ -1,12 +1,32 @@
import { NextResponse } from "next/server"; import { NextResponse } from "next/server";
import { cookies } from "next/headers";
const checkAuthentication = async () => { const checkAuthentication = async () => {
// Replace this logic with your actual authentication check. const token = req.cookies["cmc-token"]; // Access the token from cookies
const isAuthenticated = false; // Check if the user is authenticated. console.log("checking token", token);
const isAuthenticated = token ? true : false; // Check if the user is authenticated.
return isAuthenticated; return isAuthenticated;
}; };
const isTokenValid = () => {
const cookies = document.cookie.split("; "); // Get all cookies and split them into an array
for (const cookie of cookies) {
const [name, value] = cookie.split("="); // Split the cookie into its name and value
if (name === "cmc-token" && value) {
return true; // The cmc-token cookie exists
}
}
return false; // The cmc-token cookie does not exist
};
export async function middleware(req) { export async function middleware(req) {
const token = isTokenValid()
// req.cookies["cmc-token"]; // Access the token from cookies
const cookieList = cookies();
const headers = new Headers(req.headers); const headers = new Headers(req.headers);
headers.set("X-XSS-Protection", "1; mode=block"); headers.set("X-XSS-Protection", "1; mode=block");
headers.set("X-Frame-Options", "SAMEORIGIN"); headers.set("X-Frame-Options", "SAMEORIGIN");
@@ -15,16 +35,31 @@ export async function middleware(req) {
const { origin, pathname } = req.nextUrl; const { origin, pathname } = req.nextUrl;
try { try {
const authenticated = await checkAuthentication(); if (pathname === "/auth/login" && token) {
// Redirect to the home page if already authenticated
if (pathname === "/auth/login" && authenticated) { return NextResponse.redirect(new URL("/"), { status: 307 });
return NextResponse.redirect(new URL("/ecommerce"));
} }
if (authenticationPages.includes(pathname) && !authenticated) { if (!authenticationPages.includes(pathname) && !token) {
return NextResponse.redirect(new URL("/auth/login", origin)); // Redirect to the login page if not authenticated
return NextResponse.redirect(new URL("/auth/login", origin), {
status: 307,
});
} }
// Add authentication logic here (verify the token, etc.)
// const isAuthenticated = verifyToken(token);
const isAuthenticated = cookieList.has("cmc-token");
console.log(token)
if (!isAuthenticated) {
// Handle unauthenticated users
return NextResponse.error(new Error("Authentication failed"), {
status: 401,
});
}
// Continue with the request if authenticated
return NextResponse.next(); return NextResponse.next();
} catch (error) { } catch (error) {
console.error("Error during authentication check:", error); console.error("Error during authentication check:", error);
@@ -37,7 +72,7 @@ export const config = {
}; };
const authenticationPages = [ const authenticationPages = [
"/", // "/",
"/auth", "/auth",
"/auth/login", "/auth/login",
"/auth/sign-up", "/auth/sign-up",
+23 -11
View File
@@ -1,24 +1,36 @@
"use client"; "use client"
import { useEffect, useLayoutEffect } from "react"; import { useEffect } from "react";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
/**
* This function is used to protect routes in a web application.
* It checks if the user is authenticated and redirects them to the sign-in page if they are not.
*/
const AuthRoute = ({ children }) => { const AuthRoute = ({ children }) => {
const router = useRouter(); const router = useRouter();
const token = req.cookies["cmc-token"]; // Access the token from cookies
useEffect(() => { useEffect(() => {
const isAuthenticated = false; // In a real application, this would be determined based on the user's authentication status.
if (!isAuthenticated) { const isAuthenticated = token ? true : false;
if (router.pathname === "/auth/login" && isAuthenticated) {
router.push("/"); router.push("/");
} }
if (!authenticationPages.includes(router.pathname) && !isAuthenticated) {
router.push("/auth/login");
}
}, []); }, []);
return <>{children}</>; return <>{children}</>;
}; };
export default AuthRoute; export default AuthRoute;
const authenticationPages = [
// "/",
"/auth",
"/auth/login",
"/auth/sign-up",
"/auth/forgot-password",
"/auth/lock-screen",
"/auth/confirm-mail",
"/auth/logout",
];
+87 -5
View File
@@ -1,6 +1,88 @@
import SignInForm from "@/components/Authentication/SignInForm"; import React from "react";
import axios from "axios" import Grid from "@mui/material/Grid";
import Link from "next/link";
import styles from "@/styles/PageTitle.module.css";
import Features from "@/components/Dashboard/eCommerce/Features";
import Ratings from "@/components/Dashboard/eCommerce/Ratings";
import AudienceOverview from "@/components/Dashboard/eCommerce/AudienceOverview";
import VisitsByDay from "@/components/Dashboard/eCommerce/VisitsByDay";
import Impressions from "@/components/Dashboard/eCommerce/Impressions";
import ActivityTimeline from "@/components/Dashboard/eCommerce/ActivityTimeline";
import RevenuStatus from "@/components/Dashboard/eCommerce/RevenuStatus";
import SalesByCountries from "@/components/Dashboard/eCommerce/SalesByCountries";
import NewCustomers from "@/components/Dashboard/eCommerce/NewCustomers";
import RecentOrders from "@/components/Dashboard/eCommerce/RecentOrders";
import TeamMembersList from "@/components/Dashboard/eCommerce/TeamMembersList";
import BestSellingProducts from "@/components/Dashboard/eCommerce/BestSellingProducts";
import LiveVisitsOnOurSite from "@/components/Dashboard/eCommerce/LiveVisitsOnOurSite";
import AuthRoute from "middlewares/AuthRoute";
export default function SignIn() { function MainPage() {
return <SignInForm />; return (
} <>
{/* Page title */}
<div className={styles.pageTitle}>
<h1>eCommerce</h1>
<ul>
<li>
<Link href="/">Dashboard</Link>
</li>
<li>eCommerce</li>
</ul>
</div>
<Grid container rowSpacing={1} columnSpacing={{ xs: 1, sm: 2, md: 2 }}>
<Grid item xs={12} md={12} lg={12} xl={8}>
{/* Features */}
<Features />
{/* AudienceOverview */}
<AudienceOverview />
<Grid container columnSpacing={{ xs: 1, sm: 2, md: 2 }}>
<Grid item xs={12} md={8}>
{/* VisitsByDay */}
<VisitsByDay />
</Grid>
<Grid item xs={12} md={4}>
{/* Impressions */}
<Impressions />
{/* ActivityTimeline */}
<ActivityTimeline />
</Grid>
<Grid item xs={12} md={12}>
{/* RevenuStatus */}
<RevenuStatus />
</Grid>
</Grid>
</Grid>
<Grid item xs={12} md={12} lg={12} xl={4}>
{/* Ratings */}
<Ratings />
{/* LiveVisitsOnOurSite */}
<LiveVisitsOnOurSite />
{/* SalesByLocations */}
<SalesByCountries />
{/* NewCustomers */}
<NewCustomers />
</Grid>
</Grid>
{/* Recent Orders */}
<RecentOrders />
<Grid
container
rowSpacing={1}
columnSpacing={{ xs: 1, sm: 1, md: 1, lg: 1, xl: 2 }}
>
<Grid item xs={12} md={12} lg={12} xl={8}>
{/* TeamMembersList */}
<TeamMembersList />
</Grid>
<Grid item xs={12} md={12} lg={12} xl={4}>
{/* BestSellingProducts */}
<BestSellingProducts />
</Grid>
</Grid>
</>
);
}
export default MainPage
+61
View File
@@ -0,0 +1,61 @@
import Axios from "axios";
class Fetcher {
constructor(url) {
// this.url = url;
console.log("first request!!!");
}
// Endpoints Here
// GET /api/
// POST /api/
login(values) {
return this.postAuxEnd("/auth/login", values);
}
//---------------------------------------- -----
// Unified call below
//---------------------------------------- -----
async getAuxEnd(uri, reqData) {
const endPoint =
(process.env.AUX_ENDPOINT || "http://localhost:50016/api") + uri;
console.log("Checking endpoint get request", endPoint);
try {
const response = await Axios.get(endPoint);
console.log(response.data); // Log the response data if needed.
return response.data;
} catch (error) {
this.handleAxiosError(error);
}
}
async postAuxEnd(uri, reqData) {
const endPoint =
(process.env.AUX_ENDPOINT || "http://localhost:50016/api") + uri;
console.log("Checking endpoint post request", endPoint);
try {
const response = await Axios.post(endPoint, reqData);
console.log(response.data); // Log the response data if needed.
return response.data;
} catch (error) {
this.handleAxiosError(error);
}
}
handleAxiosError(error) {
if (error.response) {
// Response status is an error code.
console.log(error.response.status);
} else if (error.request) {
// Response not received though the request was sent.
console.log(error.request);
} else {
// An error occurred when setting up the request.
console.log(error.message);
}
}
}
export default Fetcher;