Merge branch 'master' of https://github.com/Eric-ciccotti/rest-nextjs-api-routes-auth into feature/cedric
This commit is contained in:
commit
d480a3f8b2
11 files changed
+216
-101
No files matched your search
@@ -9,8 +9,13 @@ GITHUB_SECRET=YOUR_GITHUB_CLIENT_SECRET
|
||||
GOOGLE_CLIENT_ID=5572607706-p6dftn0ss3m2qnvqbhk4khqte8lk7kt3.apps.googleusercontent.com
|
||||
GOOGLE_CLIENT_SECRET=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
|
||||
|
||||
DATABASE_URL="postgres://postgres:postgrespwd@localhost:5432/thetiptop"
|
||||
|
||||
# Email (magic link)
|
||||
EMAIL_SERVER=smtp://2bfdbee5372880:af828174d7f2ad@smtp.mailtrap.io:2525
|
||||
EMAIL_SERVER_USER=2bfdbee5372880
|
||||
EMAIL_SERVER_PASSWORD=af828174d7f2ad
|
||||
EMAIL_SERVER_HOST=smtp.mailtrap.io
|
||||
EMAIL_SERVER_PORT=2525
|
||||
EMAIL_FROM=thetiptop@test.com
|
||||
|
||||
DATABASE_URL="postgres://postgres:postgrespwd@127.0.0.1:5454/thetiptop"
|
||||
|
||||
@@ -7,8 +7,13 @@ type Props = {
|
||||
children?: React.ReactNode;
|
||||
};
|
||||
|
||||
|
||||
const layoutStyle = {
|
||||
height: "100vh"
|
||||
}
|
||||
|
||||
const Layout = ({ children }: Props) =>
|
||||
<div>
|
||||
<div style={layoutStyle}>
|
||||
<NavBar />
|
||||
<Content children={children} />
|
||||
<Footer />
|
||||
|
||||
+18
-2
@@ -6,6 +6,8 @@ import { signOut, useSession } from "next-auth/react";
|
||||
import style from '../styles/NavBar.module.css';
|
||||
import Image from 'next/image';
|
||||
|
||||
import { FiArrowRight } from 'react-icons/fi';
|
||||
|
||||
const NavBar = () => {
|
||||
|
||||
const navRef = useRef<HTMLInputElement>();
|
||||
@@ -33,12 +35,20 @@ const NavBar = () => {
|
||||
width={250}
|
||||
height={100}
|
||||
/>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div className={`justify-content-center text-center ${style['hidden-mobile']}`}>
|
||||
<Link href="/" legacyBehavior><a className={style.link} >Accueil</a></Link> |
|
||||
<Link href="/contact" legacyBehavior><a className={style.link} >Nos produits</a></Link> |
|
||||
<Link href="/" legacyBehavior><a className={style.link} >Contactez-nous</a></Link> |
|
||||
<Link href="/connexion" legacyBehavior><a className={style.link} >Connexion</a></Link>
|
||||
{!session && <Link href="/connexion" legacyBehavior><a className={style.link} >Connexion</a></Link>}
|
||||
{session && <Link href="/connexion" legacyBehavior><a className={style.link} >Mon compte</a></Link>}
|
||||
{session && <Link href="/" legacyBehavior><a onClick={() => signOut()} className={style.link} >Se déconnecter</a></Link>}
|
||||
|
||||
|
||||
{session && <span className={`${style.connexion} badge rounded-pill bg-light text-dark`}><FiArrowRight />{session.user.email}</span>}
|
||||
|
||||
|
||||
</div>
|
||||
@@ -46,6 +56,9 @@ const NavBar = () => {
|
||||
<span className={`${style.burgerButton}`} onClick={openNav}>☰</span>
|
||||
</div>
|
||||
|
||||
<div className="d-flex justify-content-center">
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div ref={navRef} className={style.overlay} onClick={closeNav}>
|
||||
@@ -54,8 +67,11 @@ const NavBar = () => {
|
||||
<div className="overlay-content">
|
||||
<Link href="/" legacyBehavior><a className={style.link} >Accueil</a></Link> |
|
||||
<Link href="/contact" legacyBehavior><a className={style.link} >Nos produits</a></Link> |
|
||||
|
||||
|
||||
<Link href="/" legacyBehavior><a className={style.link} >Contactez-nous</a></Link> |
|
||||
<Link href="/user" legacyBehavior><a className={style.link} >Connexion</a></Link>
|
||||
<Link href="/connexion" legacyBehavior><a className={style.link} >Connexion</a></Link>
|
||||
{session && <span className={`${style.connexion} badge rounded-pill bg-light text-dark`}><FiArrowRight />{session.user.email}</span>}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -18,28 +18,35 @@ const options = {
|
||||
authorization: 'https://accounts.google.com/o/oauth2/v2/auth?prompt=consent&access_type=offline&response_type=code',
|
||||
}),
|
||||
EmailProvider({
|
||||
server: process.env.EMAIL_SERVER,
|
||||
from: process.env.EMAIL_FROM,
|
||||
server: {
|
||||
host: process.env.EMAIL_SERVER_HOST,
|
||||
port: parseInt(process.env.EMAIL_SERVER_PORT),
|
||||
auth: {
|
||||
user: process.env.EMAIL_SERVER_USER,
|
||||
pass: process.env.EMAIL_SERVER_PASSWORD
|
||||
}
|
||||
},
|
||||
from: process.env.EMAIL_FROM
|
||||
}),
|
||||
],
|
||||
adapter: PrismaAdapter(prisma),
|
||||
secret: process.env.SECRET,
|
||||
callbacks: {
|
||||
async session({ session, user }) {
|
||||
|
||||
const getCurrentUser = await prisma.user.findMany({
|
||||
where: { email: session.user.email },
|
||||
})
|
||||
//récupération du role
|
||||
const { role } = getCurrentUser[0];
|
||||
|
||||
session.user.role = role
|
||||
|
||||
|
||||
|
||||
return session
|
||||
}
|
||||
},
|
||||
error: '/error',
|
||||
|
||||
pages: {
|
||||
// signIn: '/auth/signin',
|
||||
// signOut: '/auth/signout',
|
||||
// error: '/auth/error', // Error code passed in query string as ?error=
|
||||
verifyRequest: '/verify-request', // (used for check email message)
|
||||
// newUser: '/auth/new-user' // New users will be directed here on first sign in (leave the property out if not of interest)
|
||||
}
|
||||
}
|
||||
+101
-87
@@ -4,7 +4,7 @@ import prisma from '../lib/prisma'
|
||||
import Image from 'next/image';
|
||||
import * as Yup from 'yup';
|
||||
import Head from "next/head";
|
||||
import { signIn, useSession } from "next-auth/react";
|
||||
import { getCsrfToken, signIn, useSession } from "next-auth/react";
|
||||
import { yupResolver } from "@hookform/resolvers/yup";
|
||||
import { useForm } from "react-hook-form";
|
||||
|
||||
@@ -21,31 +21,42 @@ import imageConnexion from '../public/images/connexion_image.png'
|
||||
import Link from "next/link";
|
||||
|
||||
import { SiGnuprivacyguard } from 'react-icons/si'
|
||||
import { toast } from "react-toastify";
|
||||
import { Token } from "nodemailer/lib/xoauth2";
|
||||
import { isGeneratorFunction } from "util/types";
|
||||
|
||||
|
||||
|
||||
|
||||
export async function getServerSideProps(context) {
|
||||
const csrfToken = await getCsrfToken(context)
|
||||
return {
|
||||
props: { csrfToken },
|
||||
}
|
||||
}
|
||||
|
||||
type LoginSubmitForm = {
|
||||
email: string,
|
||||
acceptTerms: boolean
|
||||
};
|
||||
|
||||
type Props = {
|
||||
csrfToken: Token
|
||||
}
|
||||
|
||||
|
||||
const MainPage = () => {
|
||||
const MainPage = ({ csrfToken }: Props) => {
|
||||
const { data: session } = useSession();
|
||||
|
||||
const validationSchema = Yup.object().shape({
|
||||
email: Yup.string().email(),
|
||||
acceptTerms: Yup.bool().oneOf(
|
||||
[true],
|
||||
"Accepter les conditions est obligatoire"
|
||||
)
|
||||
// email: Yup.string().email(
|
||||
// "Veuillez rentrer une adresse mail valide"
|
||||
// ),
|
||||
// acceptTerms: Yup.bool().oneOf(
|
||||
// [true],
|
||||
// "Vous devez accepter les conditions obligatoire"
|
||||
// )
|
||||
})
|
||||
|
||||
const {
|
||||
register,
|
||||
clearErrors,
|
||||
handleSubmit,
|
||||
watch,
|
||||
trigger,
|
||||
@@ -55,37 +66,63 @@ const MainPage = () => {
|
||||
});
|
||||
|
||||
|
||||
const term = watch("acceptTerms")
|
||||
const acceptTermCheckBox = watch("acceptTerms")
|
||||
|
||||
|
||||
const connexionWithGoogle = async () => {
|
||||
if (term) {
|
||||
signIn("google");
|
||||
if (onCheckTerms()) {
|
||||
signIn("google")
|
||||
}
|
||||
//relance une vérification de la checkbox
|
||||
await trigger("acceptTerms");
|
||||
}
|
||||
|
||||
const onSubmit = async (data: LoginSubmitForm) => {
|
||||
|
||||
const onMailSubmit = async (data: LoginSubmitForm) => {
|
||||
if (onCheckTerms()) {
|
||||
signIn("email", { email: data.email, callbackUrl: `${window.location.origin}/create` })
|
||||
}
|
||||
await trigger("acceptTerms");
|
||||
await trigger("email");
|
||||
}
|
||||
|
||||
|
||||
// try {
|
||||
// const body = { bioValue: data.bio };
|
||||
// await fetch(`/api/profile`, {
|
||||
// method: "POST",
|
||||
// headers: { "Content-Type": "application/json" },
|
||||
// body: JSON.stringify(body),
|
||||
// })
|
||||
// .then((res) => res.json())
|
||||
// .then((data) => {
|
||||
// setResponse(data);
|
||||
// console.log('response', data);
|
||||
// })
|
||||
// await Router.push("/profile");
|
||||
// } catch (error) {
|
||||
// console.error(error);
|
||||
// }
|
||||
};
|
||||
|
||||
const onCheckTerms = (): any => {
|
||||
if (acceptTermCheckBox) {
|
||||
return true;
|
||||
} else {
|
||||
toast.error('Vous devez accepter les conditions obligatoires', {
|
||||
position: "top-center",
|
||||
autoClose: 2000,
|
||||
hideProgressBar: false,
|
||||
closeOnClick: true,
|
||||
pauseOnHover: true,
|
||||
draggable: true,
|
||||
progress: undefined,
|
||||
theme: "light",
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
// try {
|
||||
// const body = { bioValue: data.bio };
|
||||
// await fetch(`/api/profile`, {
|
||||
// method: "POST",
|
||||
// headers: { "Content-Type": "application/json" },
|
||||
// body: JSON.stringify(body),
|
||||
// })
|
||||
// .then((res) => res.json())
|
||||
// .then((data) => {
|
||||
// setResponse(data);
|
||||
// console.log('response', data);
|
||||
// })
|
||||
// await Router.push("/profile");
|
||||
// } catch (error) {
|
||||
// console.error(error);
|
||||
// }
|
||||
return (
|
||||
<>
|
||||
<Head>
|
||||
@@ -93,70 +130,47 @@ const MainPage = () => {
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com" />
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="" />
|
||||
</Head>
|
||||
|
||||
<div className={`${style['bloc-content']} col-12 col-lg-6`}>
|
||||
|
||||
|
||||
<h1 className="fw-light">Connexion</h1>
|
||||
|
||||
<SiGnuprivacyguard size={50} />
|
||||
|
||||
<form onSubmit={handleSubmit(onSubmit)}>
|
||||
<form onSubmit={handleSubmit(onMailSubmit)}>
|
||||
<div className="form-group mx-auto my-3 w-100">
|
||||
|
||||
<div className="mb-3">
|
||||
|
||||
<input
|
||||
type="email"
|
||||
className={`form-control ${errors.email ? 'is-invalid' : ''}`}
|
||||
placeholder="Email..."
|
||||
|
||||
{...register("email")}
|
||||
/>
|
||||
</div>
|
||||
<input
|
||||
type="email" id="email" name="email"
|
||||
className={`mb-3 form-control ${errors.email ? 'is-invalid' : ''}`}
|
||||
placeholder="Email..."
|
||||
{...register("email")}
|
||||
/>
|
||||
<div className="d-grid">
|
||||
<button type="submit" className="btn btn-primary">
|
||||
<button type="submit" className="btn d-grid btn-primary">
|
||||
Se connecter avec mon email
|
||||
</button>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<hr />
|
||||
|
||||
<div className="d-grid">
|
||||
<button onClick={connexionWithGoogle} type="button" className={`btn btn-primary ${style.loginButton}`} style={{ backgroundColor: "#dd4b39" }}>
|
||||
<span className={style.logo}><AiOutlineGoogle /></span>Se connecter avec google
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="form-check">
|
||||
<label
|
||||
htmlFor="acceptTerms"
|
||||
className="form-check-label"
|
||||
>
|
||||
J'ai lu et j'accepte les
|
||||
conditions
|
||||
</label>
|
||||
<input
|
||||
type="checkbox"
|
||||
className="form-check-input"
|
||||
{...register("acceptTerms")}
|
||||
name="acceptTerms"
|
||||
/>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<hr />
|
||||
<div className="d-grid">
|
||||
<button onClick={connexionWithGoogle} type="button" className={`btn btn-primary ${style.loginButton}`} style={{ backgroundColor: "#dd4b39" }}>
|
||||
<span className={style.logo}><AiOutlineGoogle /></span>Se connecter avec google
|
||||
</button>
|
||||
</div>
|
||||
<div className="form-group">
|
||||
<label
|
||||
htmlFor="acceptTerms"
|
||||
className="form-check-label"
|
||||
>
|
||||
J'ai lu et j'accepte les
|
||||
conditions
|
||||
</label>
|
||||
<input
|
||||
type="checkbox"
|
||||
className={`form-check-input ${errors.acceptTerms ? 'is-invalid' : ''}`}
|
||||
{...register("acceptTerms")}
|
||||
name="acceptTerms"
|
||||
/>
|
||||
</div>
|
||||
</form>
|
||||
<div className="invalid-feedback alert alert-danger">{errors.acceptTerms?.message}</div>
|
||||
<div className="invalid-feedback alert alert-danger">{errors.email?.message}</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
</div >
|
||||
</>)
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
import React, { useEffect } from "react";
|
||||
import prisma from '../lib/prisma'
|
||||
|
||||
|
||||
import Image from 'next/image';
|
||||
import * as Yup from 'yup';
|
||||
import Head from "next/head";
|
||||
import { getCsrfToken, signIn, useSession } from "next-auth/react";
|
||||
import { yupResolver } from "@hookform/resolvers/yup";
|
||||
import { useForm } from "react-hook-form";
|
||||
|
||||
import { AiOutlineCheck } from 'react-icons/ai'
|
||||
|
||||
import Router from "next/router";
|
||||
|
||||
|
||||
import style from '../styles/Connexion.module.css';
|
||||
|
||||
import imageConnexion from '../public/images/connexion_image.png'
|
||||
|
||||
|
||||
import Link from "next/link";
|
||||
|
||||
import { GrValidate } from 'react-icons/gr'
|
||||
import { toast } from "react-toastify";
|
||||
import { Token } from "nodemailer/lib/xoauth2";
|
||||
import { isGeneratorFunction } from "util/types";
|
||||
|
||||
|
||||
|
||||
const VerifyRequest = () => {
|
||||
|
||||
//va rediriger après 3 seconde
|
||||
useEffect(() => {
|
||||
setTimeout(() => {
|
||||
Router.push("/")
|
||||
}, 3000)
|
||||
}, [])
|
||||
|
||||
return (
|
||||
<>
|
||||
<Head>
|
||||
<title>Page Confirmation email</title>
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com" />
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="" />
|
||||
</Head>
|
||||
<div className={`${style['bloc-content']} col-12 col-lg-6`}>
|
||||
<h1 className="fw-light">Un email a été envoyé</h1>
|
||||
<GrValidate size={100} />
|
||||
<div className="d-grid mt-4">
|
||||
<button onClick={() => Router.push("/")} type="button" className={`btn btn-primary`}>
|
||||
Cliquez ici si vous n'êtes pas rediriger à l'accueil
|
||||
</button>
|
||||
</div>
|
||||
</div >
|
||||
</>)
|
||||
};
|
||||
|
||||
export default VerifyRequest;
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 58 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 33 KiB |
@@ -5,7 +5,7 @@
|
||||
background-position: 50% 50%;
|
||||
background-repeat: no-repeat;
|
||||
background-size: contain;
|
||||
animation: zoomInOut 4s ease-in-out infinite;
|
||||
/* animation: zoomInOut 4s ease-in-out infinite; */
|
||||
z-index: 9000;
|
||||
}
|
||||
|
||||
|
||||
@@ -9,6 +9,12 @@
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.connexion {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 0;
|
||||
}
|
||||
|
||||
/**************************/
|
||||
|
||||
.overlay {
|
||||
|
||||
@@ -5,6 +5,7 @@ body {
|
||||
margin: 0;
|
||||
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
|
||||
Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
|
||||
font-size: small;
|
||||
}
|
||||
|
||||
a,
|
||||
|
||||
Reference in new issue
Block a user