+ *
+ * (
)
// Confirm that profile photo was returned
- if (response.ok) {
- const pictureBuffer = await response.arrayBuffer()
- const pictureBase64 = Buffer.from(pictureBuffer).toString("base64")
- return {
- id: profile.sub,
- name: profile.name,
- email: profile.email,
- image: `data:image/jpeg;base64, ${pictureBase64}`,
- }
- } else {
- return {
- id: profile.sub,
- name: profile.name,
- email: profile.email,
- image: null,
- }
+ let image
+ // TODO: Do this without Buffer
+ if (response.ok && typeof Buffer !== "undefined") {
+ try {
+ const pictureBuffer = await response.arrayBuffer()
+ const pictureBase64 = Buffer.from(pictureBuffer).toString("base64")
+ image = `data:image/jpeg;base64, ${pictureBase64}`
+ } catch {}
+ }
+
+ return {
+ id: profile.sub,
+ name: profile.name,
+ email: profile.email,
+ image: image ?? null,
}
},
style: {
diff --git a/packages/core/src/providers/credentials.ts b/packages/core/src/providers/credentials.ts
index d8e71ad9..095678b9 100644
--- a/packages/core/src/providers/credentials.ts
+++ b/packages/core/src/providers/credentials.ts
@@ -49,10 +49,6 @@ export interface CredentialsConfig<
export type CredentialsProviderType = "Credentials"
-export type CredentialsConfigInternal<
- C extends Record (
diff --git a/packages/core/src/providers/index.ts b/packages/core/src/providers/index.ts
index ffa3819b..91da0513 100644
--- a/packages/core/src/providers/index.ts
+++ b/packages/core/src/providers/index.ts
@@ -65,12 +65,16 @@ export type Provider = (
| EmailConfig
| CredentialsConfig
) & {
+ /**
+ * Used to deep merge user-provided config with the default config
+ * @internal
+ */
options: Record (
+ options: OAuthUserConfig & AdditionalConfig
+): OAuthConfig {
+ return {
+ id: "notion",
+ name: "Notion",
+ type: "oauth",
+ token: {
+ url: `${NOTION_HOST}/v1/oauth/token`,
+ },
+ userinfo: {
+ url: `${NOTION_HOST}/v1/users`,
+
+ // The result of this method will be the input to the `profile` callback.
+ // We use a custom request handler, since we need to do things such as pass the "Notion-Version" header
+ // More info: https://next-auth.js.org/configuration/providers/oauth
+ async request(context) {
+ const profile = await fetch(`${NOTION_HOST}/v1/users/me`, {
+ headers: {
+ Authorization: `Bearer ${context.tokens.access_token}`,
+ "Notion-Version": NOTION_API_VERSION,
+ },
+ })
+
+ const {
+ bot: {
+ owner: { user },
+ },
+ } = await profile.json()
+
+ return user
+ },
+ },
+ authorization: {
+ params: {
+ client_id: options.clientId,
+ response_type: "code",
+ owner: "user",
+ redirect_uri: options.redirectUri,
+ },
+ url: `${NOTION_HOST}/v1/oauth/authorize`,
+ },
+
+ async profile(profile, tokens) {
+ return {
+ id: profile.id,
+ name: profile.name,
+ email: profile.person.email,
+ image: profile.avatar_url,
+ }
+ },
+ style: {
+ logo: "/notion.svg",
+ logoDark: "/notion.svg",
+ bg: "#fff",
+ text: "#000",
+ bgDark: "#fff",
+ textDark: "#000",
+ },
+ options,
+ }
+}
diff --git a/packages/core/src/providers/oauth-types.ts b/packages/core/src/providers/oauth-types.ts
deleted file mode 100644
index 66c75b2f..00000000
--- a/packages/core/src/providers/oauth-types.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
-export type OAuthProviderType =
- | "42-school"
- | "apple"
- | "atlassian"
- | "auth0"
- | "authentik"
- | "azure-ad-b2c"
- | "azure-ad"
- | "battlenet"
- | "box"
- | "boxyhq-saml"
- | "bungie"
- | "cognito"
- | "coinbase"
- | "credentials"
- | "discord"
- | "dropbox"
- | "duende-identity-server6"
- | "email"
- | "eveonline"
- | "facebook"
- | "faceit"
- | "foursquare"
- | "freshbooks"
- | "fusionauth"
- | "github"
- | "gitlab"
- | "google"
- | "hubspot"
- | "identity-server4"
- | "index"
- | "instagram"
- | "kakao"
- | "keycloak"
- | "line"
- | "linkedin"
- | "mailchimp"
- | "mailru"
- | "medium"
- | "naver"
- | "netlify"
- | "oauth-types.js"
- | "oauth"
- | "okta"
- | "onelogin"
- | "osso"
- | "osu"
- | "patreon"
- | "pinterest"
- | "pipedrive"
- | "reddit"
- | "salesforce"
- | "slack"
- | "spotify"
- | "strava"
- | "todoist"
- | "trakt"
- | "twitch"
- | "twitter"
- | "united-effects"
- | "vk"
- | "wikimedia"
- | "wordpress"
- | "workos"
- | "yandex"
- | "zitadel"
- | "zoho"
- | "zoom"
diff --git a/packages/core/src/providers/oauth.ts b/packages/core/src/providers/oauth.ts
index 82aa8840..87edda7f 100644
--- a/packages/core/src/providers/oauth.ts
+++ b/packages/core/src/providers/oauth.ts
@@ -66,7 +66,7 @@ export type TokenEndpointHandler = EndpointHandler<
params: CallbackParamsType
/**
* When using this custom flow, make sure to do all the necessary security checks.
- * Thist object contains parameters you have to match against the request to make sure it is valid.
+ * This object contains parameters you have to match against the request to make sure it is valid.
*/
checks: OAuthChecks
},
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
index dd37d09e..9e4f0f12 100644
--- a/packages/core/src/types.ts
+++ b/packages/core/src/types.ts
@@ -203,7 +203,7 @@ export interface CallbacksOptions {
* Its content is forwarded to the `session` callback,
* where you can control what should be returned to the client.
* Anything else will be kept inaccessible from the client.
- *
+ *
* Returning `null` will invalidate the JWT session by clearing
* the user's cookies. You'll still have to monitor and invalidate
* unexpired tokens from future requests yourself to prevent
@@ -220,7 +220,7 @@ export interface CallbacksOptions {
account?: A | null
profile?: P
isNewUser?: boolean
- }) => Awaitable
+ *
+ *