Skip to content

Fix auth login logic: avoid password rehashing and token-gated auth #1902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dipok-1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix auth login logic: avoid password rehashing and token-gated auth #1902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 19 additions & 16 deletions src/components/Signin.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,15 @@ const Signin = () => {
setIsPasswordVisible((prevState: any) => !prevState);
}
const router = useRouter();
const email = useRef('');
const password = useRef('');
// const email = useRef('');
// const password = useRef('');
const [email, setEmail] = useState('');
const [password, setPassword] = useState('');

const handleEmailChange = (e: React.ChangeEvent<HTMLInputElement>) => {
const value = e.target.value;
email.current = value;
// email.current = value.trim();
setEmail(value);

setFocusedIndex(0);
setRequiredError((prevState) => ({
Expand Down Expand Up @@ -86,9 +89,9 @@ const Signin = () => {
};

const handleSuggestionClick = (domain: string) => {
const [username] = email.current.split('@');
const [username] = email.split('@');
const newEmail = `${username}@${domain}`;
email.current = newEmail;
setEmail(newEmail);
passwordRef.current?.focus();
setSuggestedDomains([]);
};
Expand All @@ -114,21 +117,21 @@ const Signin = () => {
e.preventDefault();
}

if (!email.current || !password.current) {
if (!email || !password) {
setRequiredError({
emailReq: email.current ? false : true,
passReq: password.current ? false : true,
emailReq: email ? false : true,
passReq: password ? false : true,
});
toast.dismiss(loadId);
return;
}
setCheckingPassword(true);
const res = await signIn('credentials', {
username: email.current,
password: password.current,
username: email.trim(),
password: password,
redirect: false,
});

console.log('SignIn Response:', res);
toast.dismiss(loadId);
if (!res?.error) {
router.push('/');
Expand Down Expand Up @@ -199,12 +202,12 @@ const Signin = () => {
name="email"
id="email"
placeholder="name@email.com"
value={email.current}
value={email}
onChange={handleEmailChange}
onKeyDown={handleKeyDown}
onBlur={() => setSuggestedDomains([])} // Hide suggestions on blur
/>
{email.current && suggestedDomains.length > 0 && (
{email && suggestedDomains.length > 0 && (
<ul
ref={dropdownRef}
className={`absolute top-20 z-50 max-h-96 w-full min-w-[8rem] overflow-auto rounded-md border bg-popover text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2`}
Expand All @@ -226,7 +229,7 @@ const Signin = () => {
: ''
}`}
>
{email.current.split('@')[0]}@{domain}
{email.split('@')[0]}@{domain}
</li>
{index < suggestedDomains.length - 1 && <Separator />}
</>
Expand All @@ -252,7 +255,7 @@ const Signin = () => {
...prevState,
passReq: false,
}));
password.current = e.target.value;
setPassword(e.target.value);
}}
onKeyDown={async (e) => {
if (e.key === 'Enter') {
Expand Down Expand Up @@ -311,7 +314,7 @@ const Signin = () => {
<Button
size={'lg'}
variant={'branding'}
disabled={!email.current || !password.current || checkingPassword}
disabled={!email || !password || checkingPassword}
onClick={handleSubmit}
>
Login
Expand Down
12 changes: 9 additions & 3 deletions src/lib/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,15 @@ async function validateUser(
export const authOptions = {
providers: [
CredentialsProvider({
id: 'credentials',
name: 'Credentials',
credentials: {
username: { label: 'email', type: 'text', placeholder: '' },
password: { label: 'password', type: 'password', placeholder: '' },
},
async authorize(credentials: any) {
console.log("LOCAL_CMS_PROVIDER =", process.env.LOCAL_CMS_PROVIDER);

try {
if (process.env.LOCAL_CMS_PROVIDER) {
return {
Expand All @@ -131,7 +134,7 @@ export const authOptions = {
}),
};
}
const hashedPassword = await bcrypt.hash(credentials.password, 10);
// const hashedPassword = await bcrypt.hash(credentials.password, 10);

const userDb = await prisma.user.findFirst({
where: {
Expand All @@ -147,8 +150,7 @@ export const authOptions = {
if (
userDb &&
userDb.password &&
(await bcrypt.compare(credentials.password, userDb.password)) &&
userDb?.appxAuthToken
await bcrypt.compare(credentials.password, userDb.password)
) {
const jwt = await generateJWT({
id: userDb.id,
Expand Down Expand Up @@ -180,6 +182,10 @@ export const authOptions = {
});

if (user.data) {
const hashedPassword = await bcrypt.hash(
credentials.password,
10,
)
try {
await db.user.upsert({
where: {
Expand Down