Skip to content

Commit

Permalink
[home-v2] added clerk
Browse files Browse the repository at this point in the history
  • Loading branch information
@MarkShawn2020
MarkShawn2020 committed Oct 31, 2024
1 parent 60ac794 commit 52e23e7
Show file tree
Hide file tree
Showing 4 changed files with 165 additions and 10 deletions.
2 changes: 1 addition & 1 deletion apps/neurora_home
Submodule neurora_home updated from 6b980a to a33a15
1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
"zod-prisma-types": "^3.1.8"
},
"dependencies": {
"@clerk/nextjs": "^6.0.2",
"@mdx-js/esbuild": "^3.0.1",
"@octokit/rest": "^21.0.2",
"@types/lodash": "^4.14.202",
Expand Down
27 changes: 22 additions & 5 deletions packages/frontend/src/next-auth.options.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,29 @@ import { prisma } from "@cs-magic/common/db/prisma";
import { env } from "@cs-magic/common/env/get-env";
import { WechatProvider } from "./next-auth-providers/wechat";
import { ProfileUpdateProvider } from "./next-auth-providers/profile-update";
import GoogleProvider from "next-auth/providers/google";
import DiscordProvider from "next-auth/providers/discord";

const providers: Provider[] = [
GoogleProvider({
clientId: process.env.GOOGLE_CLIENT_ID!,
clientSecret: process.env.GOOGLE_CLIENT_SECRET!,

httpOptions: {
timeout: 5000,
},
}),

ProfileUpdateProvider,

// SmsProvider,

// DiscordProvider({
// clientId: env?.DISCORD_CLIENT_ID,
// clientSecret: env?.DISCORD_CLIENT_SECRET,
// }),
DiscordProvider({
clientId: env.DISCORD_CLIENT_ID!,
clientSecret: env.DISCORD_CLIENT_SECRET!,

authorization: { params: { scope: "identify email" } },
}),
/**
* ...add more providers here.
*
Expand Down Expand Up @@ -48,7 +61,7 @@ export const authOptions: NextAuthOptions = {
debug: true,

pages: {
signIn: "/auth",
// signIn: "/auth",
// signOut: "/auth",
},

Expand All @@ -60,6 +73,10 @@ export const authOptions: NextAuthOptions = {

// @ts-ignore // todo: ts profile for signin
callbacks: {
async redirect({ url, baseUrl }) {
return baseUrl;
},

// compatible with credential providers
jwt: ({ user, profile, token }) => {
// console.log("[next-auth] jwt: ", { token, user, profile })
Expand Down
145 changes: 141 additions & 4 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3653,6 +3653,82 @@ __metadata:
languageName: node
linkType: hard

"@clerk/backend@npm:1.15.1":
version: 1.15.1
resolution: "@clerk/backend@npm:1.15.1"
dependencies:
"@clerk/shared": "npm:2.10.1"
"@clerk/types": "npm:4.28.0"
cookie: "npm:0.7.0"
snakecase-keys: "npm:5.4.4"
tslib: "npm:2.4.1"
checksum: 10c0/fd0d00a78f66ec1255deffe9b6d1b50485d896b69f8728efaad3b979899bd2bd3ba5df1fd377670a875c4b797d0c61826c7d3076bf8c466993d0363dbf46adca
languageName: node
linkType: hard

"@clerk/clerk-react@npm:5.13.1":
version: 5.13.1
resolution: "@clerk/clerk-react@npm:5.13.1"
dependencies:
"@clerk/shared": "npm:2.10.1"
"@clerk/types": "npm:4.28.0"
tslib: "npm:2.4.1"
peerDependencies:
react: ">=18 || >=19.0.0-beta"
react-dom: ">=18 || >=19.0.0-beta"
checksum: 10c0/acf1d8bf2a6b94c2c99c25b4612e0a85d2d847f186b3d6db317dafc98a6d35090b322705e249f86adff0dcdd16fca05d53710d0512dea48cca37f715fcf62358
languageName: node
linkType: hard

"@clerk/nextjs@npm:^6.0.2":
version: 6.0.2
resolution: "@clerk/nextjs@npm:6.0.2"
dependencies:
"@clerk/backend": "npm:1.15.1"
"@clerk/clerk-react": "npm:5.13.1"
"@clerk/shared": "npm:2.10.1"
"@clerk/types": "npm:4.28.0"
crypto-js: "npm:4.2.0"
server-only: "npm:0.0.1"
tslib: "npm:2.4.1"
peerDependencies:
next: ^13.5.4 || ^14.0.3 || >=15.0.0-rc
react: ">=18 || >=19.0.0-beta"
react-dom: ">=18 || >=19.0.0-beta"
checksum: 10c0/e67ac04a0e1585c577d3619eabd4d88270179ec925249a23e0c11316b906cdbdc6c71cee04193c81af0a45deaaa6e05f576cef7de054b04e4563eb17f6a995a8
languageName: node
linkType: hard

"@clerk/shared@npm:2.10.1":
version: 2.10.1
resolution: "@clerk/shared@npm:2.10.1"
dependencies:
"@clerk/types": "npm:4.28.0"
glob-to-regexp: "npm:0.4.1"
js-cookie: "npm:3.0.5"
std-env: "npm:^3.7.0"
swr: "npm:^2.2.0"
peerDependencies:
react: ">=18 || >=19.0.0-beta"
react-dom: ">=18 || >=19.0.0-beta"
peerDependenciesMeta:
react:
optional: true
react-dom:
optional: true
checksum: 10c0/e04579d4f7befe0716b42d114b5932958c52078e2d7b398f350182c856ddf9948cceaaecf477eeeaa606bf582e379d9d46817ee0ab1e384c2ec37c43131c26a1
languageName: node
linkType: hard

"@clerk/types@npm:4.28.0":
version: 4.28.0
resolution: "@clerk/types@npm:4.28.0"
dependencies:
csstype: "npm:3.1.1"
checksum: 10c0/fa9b61d0800bace7b11e492f755aef94b594cce33da6af6d27271d19948691549c1d0ae00ce8ca19ef7cd7d582857eec3f3438f972a0949359acffecb0ae08f1
languageName: node
linkType: hard

"@colors/colors@npm:1.6.0, @colors/colors@npm:^1.6.0":
version: 1.6.0
resolution: "@colors/colors@npm:1.6.0"
Expand Down Expand Up @@ -4199,6 +4275,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@cs-magic/codebase-ts@workspace:."
dependencies:
"@clerk/nextjs": "npm:^6.0.2"
"@cs-magic/tools": "workspace:^"
"@mdx-js/esbuild": "npm:^3.0.1"
"@octokit/rest": "npm:^21.0.2"
Expand Down Expand Up @@ -19882,6 +19959,13 @@ __metadata:
languageName: node
linkType: hard

"cookie@npm:0.7.0":
version: 0.7.0
resolution: "cookie@npm:0.7.0"
checksum: 10c0/15c20c9b85431c8565b1750f9bccff0bd289b943d956e25fffce3b146e57934075965c8305a4e3a65a70622c9ed483e013daf9159d9c50f5c3f97f2e7c8117ac
languageName: node
linkType: hard

"cookie@npm:^0.5.0":
version: 0.5.0
resolution: "cookie@npm:0.5.0"
Expand Down Expand Up @@ -20195,7 +20279,7 @@ __metadata:
languageName: node
linkType: hard

"crypto-js@npm:^4.2.0":
"crypto-js@npm:4.2.0, crypto-js@npm:^4.2.0":
version: 4.2.0
resolution: "crypto-js@npm:4.2.0"
checksum: 10c0/8fbdf9d56f47aea0794ab87b0eb9833baf80b01a7c5c1b0edc7faf25f662fb69ab18dc2199e2afcac54670ff0cd9607a9045a3f7a80336cccd18d77a55b9fdf0
Expand Down Expand Up @@ -20563,6 +20647,13 @@ __metadata:
languageName: node
linkType: hard

"csstype@npm:3.1.1":
version: 3.1.1
resolution: "csstype@npm:3.1.1"
checksum: 10c0/7c8b8c5923049d84132581c13bae6e1faf999746fe3998ba5f3819a8e1cdc7512ace87b7d0a4a69f0f4b8ba11daf835d4f1390af23e09fc4f0baad52c084753a
languageName: node
linkType: hard

"csstype@npm:3.1.3, csstype@npm:^3.0.10, csstype@npm:^3.0.2, csstype@npm:^3.1.0, csstype@npm:^3.1.2, csstype@npm:^3.1.3":
version: 3.1.3
resolution: "csstype@npm:3.1.3"
Expand Down Expand Up @@ -25606,7 +25697,7 @@ __metadata:
languageName: node
linkType: hard

"glob-to-regexp@npm:^0.4.1":
"glob-to-regexp@npm:0.4.1, glob-to-regexp@npm:^0.4.1":
version: 0.4.1
resolution: "glob-to-regexp@npm:0.4.1"
checksum: 10c0/0486925072d7a916f052842772b61c3e86247f0a80cc0deb9b5a3e8a1a9faad5b04fb6f58986a09f34d3e96cd2a22a24b7e9882fb1cf904c31e9a310de96c429
Expand Down Expand Up @@ -29165,6 +29256,13 @@ __metadata:
languageName: node
linkType: hard

"js-cookie@npm:3.0.5":
version: 3.0.5
resolution: "js-cookie@npm:3.0.5"
checksum: 10c0/04a0e560407b4489daac3a63e231d35f4e86f78bff9d792011391b49c59f721b513411cd75714c418049c8dc9750b20fcddad1ca5a2ca616c3aca4874cce5b3a
languageName: node
linkType: hard

"js-cookie@npm:^2.2.1":
version: 2.2.1
resolution: "js-cookie@npm:2.2.1"
Expand Down Expand Up @@ -30958,6 +31056,13 @@ __metadata:
languageName: node
linkType: hard

"map-obj@npm:^4.1.0":
version: 4.3.0
resolution: "map-obj@npm:4.3.0"
checksum: 10c0/1c19e1c88513c8abdab25c316367154c6a0a6a0f77e3e8c391bb7c0e093aefed293f539d026dc013d86219e5e4c25f23b0003ea588be2101ccd757bacc12d43b
languageName: node
linkType: hard

"map-visit@npm:^1.0.0":
version: 1.0.0
resolution: "map-visit@npm:1.0.0"
Expand Down Expand Up @@ -40253,7 +40358,7 @@ __metadata:
languageName: node
linkType: hard

"server-only@npm:^0.0.1":
"server-only@npm:0.0.1, server-only@npm:^0.0.1":
version: 0.0.1
resolution: "server-only@npm:0.0.1"
checksum: 10c0/4704f0ef85da0be981af6d4ed8e739d39bcfd265b9c246a684060acda5642d0fdc6daffc2308e71e2682c5f508090978802eae0a77623c9b90a49f9ae68048d6
Expand Down Expand Up @@ -40729,6 +40834,17 @@ __metadata:
languageName: node
linkType: hard

"snakecase-keys@npm:5.4.4":
version: 5.4.4
resolution: "snakecase-keys@npm:5.4.4"
dependencies:
map-obj: "npm:^4.1.0"
snake-case: "npm:^3.0.4"
type-fest: "npm:^2.5.2"
checksum: 10c0/72afc51818d9f8cee00b4ccdc3b83bb26e48de21c4ef77d28d0d70b431bec17e48aa3e64c2c418fd9f2b70ac0a8afce24b4e615238877c4ee451b5212b983fb0
languageName: node
linkType: hard

"snapdragon-node@npm:^2.0.1":
version: 2.1.1
resolution: "snapdragon-node@npm:2.1.1"
Expand Down Expand Up @@ -41357,6 +41473,13 @@ __metadata:
languageName: node
linkType: hard

"std-env@npm:^3.7.0":
version: 3.7.0
resolution: "std-env@npm:3.7.0"
checksum: 10c0/60edf2d130a4feb7002974af3d5a5f3343558d1ccf8d9b9934d225c638606884db4a20d2fe6440a09605bca282af6b042ae8070a10490c0800d69e82e478f41e
languageName: node
linkType: hard

"stop-iteration-iterator@npm:^1.0.0":
version: 1.0.0
resolution: "stop-iteration-iterator@npm:1.0.0"
Expand Down Expand Up @@ -42064,7 +42187,7 @@ __metadata:
languageName: node
linkType: hard

"swr@npm:2.2.5, swr@npm:^2.2.5":
"swr@npm:2.2.5, swr@npm:^2.2.0, swr@npm:^2.2.5":
version: 2.2.5
resolution: "swr@npm:2.2.5"
dependencies:
Expand Down Expand Up @@ -43342,6 +43465,13 @@ __metadata:
languageName: node
linkType: hard

"tslib@npm:2.4.1":
version: 2.4.1
resolution: "tslib@npm:2.4.1"
checksum: 10c0/9ac0e4fd1033861f0b4f0d848dc3009ebcc3aa4757a06e8602a2d8a7aed252810e3540e54e70709f06c0f95311faa8584f769bcbede48aff785eb7e4d399b9ec
languageName: node
linkType: hard

"tslib@npm:2.6.2":
version: 2.6.2
resolution: "tslib@npm:2.6.2"
Expand Down Expand Up @@ -43562,6 +43692,13 @@ __metadata:
languageName: node
linkType: hard

"type-fest@npm:^2.5.2":
version: 2.19.0
resolution: "type-fest@npm:2.19.0"
checksum: 10c0/a5a7ecf2e654251613218c215c7493574594951c08e52ab9881c9df6a6da0aeca7528c213c622bc374b4e0cb5c443aa3ab758da4e3c959783ce884c3194e12cb
languageName: node
linkType: hard

"type-fest@npm:^3.12.0, type-fest@npm:^3.6.1":
version: 3.13.1
resolution: "type-fest@npm:3.13.1"
Expand Down

0 comments on commit 52e23e7

Please sign in to comment.