mythic-insight/calcom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

fix bad auth commit (#487)

Browse source
This commit is contained in:
Alex Johansson 2021-08-18 14:15:22 +02:00 committed by GitHub
parent a0a0ec86f0
commit aed9757409
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/auth.ts
View file

@ -17,13 +17,13 @@ type CalendsoSessionUser = DefaultSessionUser & {
id: number; id: number;
username: string; username: string;
}; };
interface Session extends DefaultSession { export interface Session extends DefaultSession {
user?: CalendsoSessionUser; user?: CalendsoSessionUser;
} }
export async function getSession(options: GetSessionOptions): Promise<CalendsoSession | null> { export async function getSession(options: GetSessionOptions): Promise<Session | null> {
const session = await getSessionInner(options); const session = await getSessionInner(options);
// that these are equal are ensured in `[...nextauth]`'s callback // that these are equal are ensured in `[...nextauth]`'s callback
return session as CalendsoSession; return session as Session | null;
} }

4
pages/api/auth/[...nextauth].tsx
View file

@ -1,7 +1,7 @@
import NextAuth from "next-auth"; import NextAuth from "next-auth";
import Providers from "next-auth/providers"; import Providers from "next-auth/providers";
import prisma from "../../../lib/prisma"; import prisma from "../../../lib/prisma";
import { CalendsoSession, verifyPassword } from "../../../lib/auth"; import { Session, verifyPassword } from "../../../lib/auth";
export default NextAuth({ export default NextAuth({
session: { session: {
@ -59,7 +59,7 @@ export default NextAuth({
return token; return token;
}, },
async session(session, token) { async session(session, token) {
const calendsoSession: CalendsoSession = { const calendsoSession: Session = {
...session, ...session,
user: { user: {
...session.user, ...session.user,