@opensaas/keystone-nextjs-auth 19.1.0 → 20.0.0

package/src/index.ts

@@ -1,14 +1,14 @@
 import url from 'url';
 import {
   AdminFileToWrite,
-  BaseGeneratedListTypes,
+  BaseListTypeInfo,
   KeystoneConfig,
   KeystoneContext,
   AdminUIConfig,
   SessionStrategy,
+  BaseKeystoneTypeInfo,
 } from '@keystone-6/core/types';
-import { getSession } from 'next-auth/client';
-import Providers from 'next-auth/providers';
+import { getSession } from 'next-auth/react';
 import * as cookie from 'cookie';
 import { nextConfigTemplate } from './templates/next-config';
 // import * as Path from 'path';
@@ -22,7 +22,6 @@ import {
 import { getSchemaExtension } from './schema';
 import { authTemplate } from './templates/auth';
 
-export const nextAuthProviders = Providers;
 /**
  * createAuth function
  *
@@ -30,7 +29,7 @@ export const nextAuthProviders = Providers;
  */
 
 export type { NextAuthProviders, KeystoneAuthConfig } from './types';
-export function createAuth<GeneratedListTypes extends BaseGeneratedListTypes>({
+export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
   listKey,
   identityField,
   sessionData,
@@ -40,6 +39,7 @@ export function createAuth<GeneratedListTypes extends BaseGeneratedListTypes>({
   profileMap,
   keystonePath,
   providers,
+  sessionSecret,
 }: AuthConfig<GeneratedListTypes>) {
   // The protectIdentities flag is currently under review to see whether it should be
   // part of the createAuth API (in which case its use cases need to be documented and tested)
@@ -67,26 +67,27 @@ export function createAuth<GeneratedListTypes extends BaseGeneratedListTypes>({
    *  - to the init page when initFirstItem is configured, and there are no user in the database
    *  - to the signin page when no valid session is present
    */
-  const pageMiddleware: AdminUIConfig['pageMiddleware'] = async ({
-    context,
-    isValidSession,
-  }) => {
-    const { req, session } = context;
-    const pathname = url.parse(req?.url!).pathname!;
-    if (pathname === `${customPath}/api/__keystone_api_build`) {
-      return;
-    }
-    if (isValidSession) {
-      if (pathname === `${customPath}/api/auth/signin`) {
-        return { kind: 'redirect', to: `${customPath}` };
+  const pageMiddleware: AdminUIConfig<BaseKeystoneTypeInfo>['pageMiddleware'] =
+    async ({ context, isValidSession }) => {
+      const { req, session } = context;
+      const pathname = url.parse(req?.url!).pathname!;
+      if (pathname === `${customPath}/api/__keystone_api_build`) {
+        return;
+      }
+      if (isValidSession) {
+        if (pathname === `${customPath}/api/auth/signin`) {
+          return { kind: 'redirect', to: `${customPath}` };
+        }
+        if (customPath !== '' && pathname === '/') {
+          return { kind: 'redirect', to: `${customPath}` };
+        }
+        return;
       }
-      return;
-    }
 
-    if (!session && !pathname.includes(`${customPath}/api/auth/`)) {
-      return { kind: 'redirect', to: `${customPath}/api/auth/signin` };
-    }
-  };
+      if (!session && !pathname.includes(`${customPath}/api/auth/`)) {
+        return { kind: 'redirect', to: `${customPath}/api/auth/signin` };
+      }
+    };
 
   /**
    * getAdditionalFiles
@@ -110,6 +111,7 @@ export function createAuth<GeneratedListTypes extends BaseGeneratedListTypes>({
           userMap,
           accountMap,
           profileMap,
+          sessionSecret,
         }),
       },
       {
@@ -194,7 +196,7 @@ export function createAuth<GeneratedListTypes extends BaseGeneratedListTypes>({
         if (pathname.includes('/api/auth')) {
           return;
         }
-        const nextSession = await getSession({ req });
+        const nextSession: unknown = await getSession({ req });
         if (nextSession) {
           return nextSession as NextAuthSession;
         }
@@ -250,7 +252,7 @@ export function createAuth<GeneratedListTypes extends BaseGeneratedListTypes>({
             process.env.NODE_ENV !== 'production' &&
             context.req?.url !== undefined &&
             new URL(context.req.url, 'http://example.com').pathname ===
-            `${customPath}/api/__keystone_api_build`
+              `${customPath}/api/__keystone_api_build`
           ) {
             return true;
           }

package/src/lib/getErrorMessage.ts

@@ -1,3 +1,4 @@
+/* eslint-disable default-case */
 import {
   AuthTokenRedemptionErrorCode,
   AuthTokenRequestErrorCode,

package/src/lib/validateNextAuth.ts

@@ -10,13 +10,13 @@ export async function validateNextAuth(
   itemAPI: KeystoneListsAPI<any>[string]
 ): Promise<
   | { success: false; code: NextAuthErrorCode }
-  | { success: true; item: { id: any;[prop: string]: any } }
+  | { success: true; item: { id: any; [prop: string]: any } }
 > {
   const match = await findMatchingIdentity(identityField, identity, itemAPI);
 
   const { item } = match as {
     success: true;
-    item: { id: any;[prop: string]: any };
+    item: { id: any; [prop: string]: any };
   };
 
   if (item) {

package/src/pages/NextAuthPage.tsx

@@ -1,6 +1,6 @@
 import NextAuth from 'next-auth';
-import { Provider } from 'next-auth/providers';
 import type { KeystoneListsAPI } from '@keystone-6/core/types';
+import { Provider } from 'next-auth/providers';
 import { validateNextAuth } from '../lib/validateNextAuth';
 
 // Need to bring in correct props
@@ -15,6 +15,7 @@ type NextAuthPageProps = {
   userMap: any;
   accountMap: any;
   profileMap: any;
+  sessionSecret: string;
 };
 
 export default function NextAuthPage(props: NextAuthPageProps) {
@@ -28,15 +29,17 @@ export default function NextAuthPage(props: NextAuthPageProps) {
     userMap,
     accountMap,
     profileMap,
+    sessionSecret,
   } = props;
   const list = query[listKey];
   const queryAPI = query[listKey];
   const protectIdentities = true;
 
   return NextAuth({
+    secret: sessionSecret,
     providers,
     callbacks: {
-      async signIn(user, account, profile) {
+      async signIn({ user, account, profile }) {
         let identity;
         if (typeof user.id === 'string') {
           identity = user.id;
@@ -94,10 +97,10 @@ export default function NextAuthPage(props: NextAuthPageProps) {
           return result.success;
         }
       },
-      async redirect(url) {
+      async redirect({ url }) {
         return url;
       },
-      async session(session: any, token: any) {
+      async session({ session, token }) {
         const returnSession = {
           ...session,
           data: token.data,
@@ -107,7 +110,7 @@ export default function NextAuthPage(props: NextAuthPageProps) {
         };
         return returnSession;
       },
-      async jwt(token) {
+      async jwt({ token }) {
         const identity = token.sub;
         if (!token.itemId) {
           const result = await validateNextAuth(

package/src/providers/42-school.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/42-school';
+
+export { default } from 'next-auth/providers/42-school';

package/src/providers/apple.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/apple';
+
+export { default } from 'next-auth/providers/apple';

package/src/providers/atlassian.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/atlassian';
+
+export { default } from 'next-auth/providers/atlassian';

package/src/providers/auth0.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/auth0';
+
+export { default } from 'next-auth/providers/auth0';

package/src/providers/azure-ad-b2c.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/azure-ad-b2c';
+
+export { default } from 'next-auth/providers/azure-ad-b2c';

package/src/providers/azure-ad.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/azure-ad';
+
+export { default } from 'next-auth/providers/azure-ad';

package/src/providers/battlenet.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/battlenet';
+
+export { default } from 'next-auth/providers/battlenet';

package/src/providers/box.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/box';
+
+export { default } from 'next-auth/providers/box';

package/src/providers/bungie.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/bungie';
+
+export { default } from 'next-auth/providers/bungie';

package/src/providers/cognito.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/cognito';
+
+export { default } from 'next-auth/providers/cognito';

package/src/providers/coinbase.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/coinbase';
+
+export { default } from 'next-auth/providers/coinbase';

package/src/providers/credentials.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/credentials';
+
+export { default } from 'next-auth/providers/credentials';

package/src/providers/discord.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/discord';
+
+export { default } from 'next-auth/providers/discord';

package/src/providers/dropbox.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/dropbox';
+
+export { default } from 'next-auth/providers/dropbox';

package/src/providers/email.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/email';
+
+export { default } from 'next-auth/providers/email';

package/src/providers/eveonline.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/eveonline';
+
+export { default } from 'next-auth/providers/eveonline';

package/src/providers/facebook.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/facebook';
+
+export { default } from 'next-auth/providers/facebook';

package/src/providers/faceit.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/faceit';
+
+export { default } from 'next-auth/providers/faceit';

package/src/providers/foursquare.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/foursquare';
+
+export { default } from 'next-auth/providers/foursquare';

package/src/providers/freshbooks.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/freshbooks';
+
+export { default } from 'next-auth/providers/freshbooks';

package/src/providers/fusionauth.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/fusionauth';
+
+export { default } from 'next-auth/providers/fusionauth';

package/src/providers/github.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/github';
+
+export { default } from 'next-auth/providers/github';

package/src/providers/gitlab.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/gitlab';
+
+export { default } from 'next-auth/providers/gitlab';

package/src/providers/google.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/google';
+
+export { default } from 'next-auth/providers/google';

package/src/providers/identity-server4.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/identity-server4';
+
+export { default } from 'next-auth/providers/identity-server4';

package/src/providers/index.ts

@@ -0,0 +1,3 @@
+import Providers from 'next-auth/providers';
+
+export default Providers;

package/src/providers/instagram.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/instagram';
+
+export { default } from 'next-auth/providers/instagram';

package/src/providers/kakao.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/kakao';
+
+export { default } from 'next-auth/providers/kakao';

package/src/providers/keycloak.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/keycloak';
+
+export { default } from 'next-auth/providers/keycloak';

package/src/providers/line.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/line';
+
+export { default } from 'next-auth/providers/line';

package/src/providers/linkedin.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/linkedin';
+
+export { default } from 'next-auth/providers/linkedin';

package/src/providers/mailchimp.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/mailchimp';
+
+export { default } from 'next-auth/providers/mailchimp';

package/src/providers/mailru.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/mailru';
+
+export { default } from 'next-auth/providers/mailru';

package/src/providers/medium.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/medium';
+
+export { default } from 'next-auth/providers/medium';

package/src/providers/naver.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/naver';
+
+export { default } from 'next-auth/providers/naver';

package/src/providers/netlify.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/netlify';
+
+export { default } from 'next-auth/providers/netlify';

package/src/providers/oauth.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/oauth';
+
+export { default } from 'next-auth/providers/oauth';

package/src/providers/okta.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/okta';
+
+export { default } from 'next-auth/providers/okta';

package/src/providers/onelogin.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/onelogin';
+
+export { default } from 'next-auth/providers/onelogin';

package/src/providers/osso.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/osso';
+
+export { default } from 'next-auth/providers/osso';

package/src/providers/osu.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/osu';
+
+export { default } from 'next-auth/providers/osu';

package/src/providers/pipedrive.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/pipedrive';
+
+export { default } from 'next-auth/providers/pipedrive';

package/src/providers/reddit.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/reddit';
+
+export { default } from 'next-auth/providers/reddit';

package/src/providers/salesforce.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/salesforce';
+
+export { default } from 'next-auth/providers/salesforce';

package/src/providers/slack.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/slack';
+
+export { default } from 'next-auth/providers/slack';

package/src/providers/spotify.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/spotify';
+
+export { default } from 'next-auth/providers/spotify';

package/src/providers/strava.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/strava';
+
+export { default } from 'next-auth/providers/strava';

package/src/providers/twitch.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/twitch';
+
+export { default } from 'next-auth/providers/twitch';

package/src/providers/twitter.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/twitter';
+
+export { default } from 'next-auth/providers/twitter';

package/src/providers/vk.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/vk';
+
+export { default } from 'next-auth/providers/vk';

package/src/providers/wordpress.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/wordpress';
+
+export { default } from 'next-auth/providers/wordpress';

package/src/providers/workos.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/workos';
+
+export { default } from 'next-auth/providers/workos';

package/src/providers/yandex.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/yandex';
+
+export { default } from 'next-auth/providers/yandex';

package/src/providers/zoho.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/zoho';
+
+export { default } from 'next-auth/providers/zoho';

package/src/providers/zoom.ts

@@ -0,0 +1,4 @@
+/* eslint-disable no-restricted-exports */
+export * from 'next-auth/providers/zoom';
+
+export { default } from 'next-auth/providers/zoom';

package/src/schema.ts

@@ -26,9 +26,9 @@ export const getSchemaExtension = ({
     ) {
       throw new Error(
         `createAuth was called with an identityField of ${identityField} on the list ${listKey} ` +
-        `but that field doesn't allow being searched uniquely with a String or ID. ` +
-        `You should likely add \`isIndexed: 'unique'\` ` +
-        `to the field at ${listKey}.${identityField}`
+          `but that field doesn't allow being searched uniquely with a String or ID. ` +
+          `You should likely add \`isIndexed: 'unique'\` ` +
+          `to the field at ${listKey}.${identityField}`
       );
     }
     const baseSchema = getBaseAuthSchema({

package/src/templates/auth.ts

@@ -14,6 +14,7 @@ export default getNextAuthPage({
         accountMap: <%- JSON.stringify(accountMap) %>,
         profileMap: <%- JSON.stringify(profileMap) %>,
         autoCreate: <%= autoCreate %>,
+        sessionSecret: '<%= sessionSecret %>',
         providers: keystoneConfig.providers,
         query,
     });
@@ -28,6 +29,7 @@ export const authTemplate = ({
   userMap,
   accountMap,
   profileMap,
+  sessionSecret,
 }: {
   gqlNames: AuthGqlNames;
   identityField: string;
@@ -37,6 +39,7 @@ export const authTemplate = ({
   userMap: any;
   accountMap: any;
   profileMap: any;
+  sessionSecret: string;
 }) => {
   const authOut = ejs.render(template, {
     gqlNames,
@@ -47,6 +50,7 @@ export const authTemplate = ({
     userMap,
     accountMap,
     profileMap,
+    sessionSecret,
   });
   return authOut;
 };

package/src/types.ts

@@ -39,6 +39,8 @@ export type AuthConfig<GeneratedListTypes extends BaseListTypeInfo> = {
   keystonePath?: string;
   /** Providers for Next Auth */
   providers: NextAuthProviders;
+  /** Next-Auth Session Secret */
+  sessionSecret: string;
 };
 
 export type AuthTokenRequestErrorCode =