Skip to content

Commit f83adb2

Browse files
committed
refactor: Adjust code structure
1 parent 0c90cf4 commit f83adb2

File tree

11 files changed

+41
-46
lines changed

11 files changed

+41
-46
lines changed

dev/src/middleware.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import NextAuth from "next-auth";
2-
import middleware from "./../../src/middleware";
2+
import middleware from "../../src/payload/middleware";
33
import { authConfig } from "./auth.config";
44

55
export const config = {

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
"default": "./dist/index.js"
1414
},
1515
"./middleware": {
16-
"types": "./dist/middleware.d.ts",
17-
"import": "./dist/middleware.js",
18-
"default": "./dist/middleware.js"
16+
"types": "./dist/payload/middleware.d.ts",
17+
"import": "./dist/payload/middleware.js",
18+
"default": "./dist/payload/middleware.js"
1919
},
2020
"./components": {
2121
"types": "./dist/components/index.d.ts",

src/PayloadAdapter.ts renamed to src/authjs/PayloadAdapter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import type {
77
VerificationToken as AdapterVerificationToken,
88
} from "next-auth/adapters";
99
import type { CollectionSlug, Payload, SanitizedConfig } from "payload";
10-
import type { Session, User, VerificationToken } from "./types";
10+
import type { Session, User, VerificationToken } from "../payload/types";
1111

1212
export interface PayloadAdapterOptions {
1313
/**

src/withPayload.ts renamed to src/authjs/withPayload.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/* eslint-disable no-param-reassign */
22
import type { NextAuthConfig } from "next-auth";
3-
import type { PayloadAdapterOptions } from "./PayloadAdapter";
4-
import { PayloadAdapter } from "./PayloadAdapter";
3+
import { PayloadAdapter, type PayloadAdapterOptions } from "./PayloadAdapter";
54

65
export interface WithPayloadOptions extends PayloadAdapterOptions {
76
/**

src/index.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
export { getPayloadUser } from "./getPayloadUser";
2-
export { PayloadAdapter } from "./PayloadAdapter";
3-
export { authjsPlugin } from "./plugin";
4-
export type { AuthjsPluginConfig } from "./types";
5-
export { withPayload } from "./withPayload";
1+
export { PayloadAdapter } from "./authjs/PayloadAdapter";
2+
export { withPayload } from "./authjs/withPayload";
3+
export { getPayloadUser } from "./payload/getPayloadUser";
4+
export { authjsPlugin, type AuthjsPluginConfig } from "./payload/plugin";

src/AuthjsAuthStrategy.ts renamed to src/payload/AuthjsAuthStrategy.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import NextAuth from "next-auth";
22
import type { AuthStrategy } from "payload";
3-
import type { AuthjsPluginConfig } from "./types";
4-
import { withPayload } from "./withPayload";
3+
import { withPayload } from "../authjs/withPayload";
4+
import type { AuthjsPluginConfig } from "./plugin";
55

66
/**
77
* Auth.js Authentication Strategy for Payload CMS

src/generateUsersCollection.ts renamed to src/payload/generateUsersCollection.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { CollectionConfig, Field } from "payload";
22
import { AuthjsAuthStrategy } from "./AuthjsAuthStrategy";
3-
import type { AuthjsPluginConfig } from "./types";
3+
import type { AuthjsPluginConfig } from "./plugin";
44

55
export const generateUsersCollection = (
66
collections: CollectionConfig[],
File renamed without changes.
File renamed without changes.

src/plugin.ts renamed to src/payload/plugin.ts

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,32 @@
1-
import type { Plugin } from "payload";
1+
import type { NextAuthConfig } from "next-auth";
2+
import type { CollectionSlug, Plugin } from "payload";
23
import { generateUsersCollection } from "./generateUsersCollection";
3-
import type { AuthjsPluginConfig } from "./types";
4+
5+
export interface AuthjsPluginConfig {
6+
/**
7+
* Enable or disable plugin
8+
*
9+
* @default true
10+
*/
11+
enabled?: boolean;
12+
13+
/**
14+
* The slug of the collection that contains the users
15+
*
16+
* @default "users"
17+
*/
18+
userCollectionSlug?: CollectionSlug;
19+
20+
/**
21+
* Auth.js configuration
22+
*
23+
* @example
24+
* import { config } from "./auth.config";
25+
*
26+
* authjsPlugin({ authjsConfig: config })
27+
*/
28+
authjsConfig: NextAuthConfig;
29+
}
430

531
export const authjsPlugin =
632
(pluginOptions: AuthjsPluginConfig): Plugin =>

0 commit comments

Comments
 (0)