cleanup and make sure not to cause a DB failure

withstudiocms · May 9, 2024 · 837fe5c · 837fe5c
1 parent 9d9305f
commit 837fe5c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/...ges/studioCMS/src/integrations/studioCMSDashboard/routes/authroutes/login/api/register.ts b/...ges/studioCMS/src/integrations/studioCMSDashboard/routes/authroutes/login/api/register.ts
@@ -45,7 +45,7 @@ export async function POST(context: APIContext): Promise<Response> {
     if (existingUser) {
         return new Response(
             JSON.stringify({
-                error: "Username already used"
+                error: "Username/Email already used"
             }),
             {
                 status: 400

diff --git a/...s/studioCMS/src/integrations/studioCMSDashboard/routes/authroutes/login/auth0/callback.ts b/...s/studioCMS/src/integrations/studioCMSDashboard/routes/authroutes/login/auth0/callback.ts
@@ -76,8 +76,9 @@ const clientDomain = `https://${NoHTTPDOMAIN}`;
 		}
 
 		const existingUserName = await db.select().from(User).where(eq(User.username, username)).get();
+		const existingUserByEmail = await db.select().from(User).where(eq(User.email, email)).get();
 
-		if (existingUserName) {
+		if (existingUserName || existingUserByEmail) {
 			return new Response("User already exists", {
 				status: 400,
 			});

diff --git a/...studioCMS/src/integrations/studioCMSDashboard/routes/authroutes/login/discord/callback.ts b/...studioCMS/src/integrations/studioCMSDashboard/routes/authroutes/login/discord/callback.ts
@@ -72,8 +72,9 @@ export async function GET(context: APIContext): Promise<Response> {
 		}
 
 		const existingUserByUsername = await db.select().from(User).where(eq(User.username, username)).get();
+		const existingUserByEmail = await db.select().from(User).where(eq(User.email, email)).get();
 
-		if (existingUserByUsername) {
+		if (existingUserByUsername || existingUserByEmail) {
 			return new Response("User already exists", {
 				status: 400,
 			});

diff --git a/.../studioCMS/src/integrations/studioCMSDashboard/routes/authroutes/login/github/callback.ts b/.../studioCMS/src/integrations/studioCMSDashboard/routes/authroutes/login/github/callback.ts
@@ -67,8 +67,9 @@ export async function GET(context: APIContext): Promise<Response> {
 		}
 
 		const existingUserName = await db.select().from(User).where(eq(User.username, username)).get();
+		const existingUserByEmail = await db.select().from(User).where(eq(User.email, email)).get();
 
-		if (existingUserName) {
+		if (existingUserName || existingUserByEmail) {
 			return new Response("User already exists", {
 				status: 400,
 			});

diff --git a/.../studioCMS/src/integrations/studioCMSDashboard/routes/authroutes/login/google/callback.ts b/.../studioCMS/src/integrations/studioCMSDashboard/routes/authroutes/login/google/callback.ts
@@ -70,8 +70,9 @@ export async function GET(context: APIContext): Promise<Response> {
 		const username = `g_${fixname}`
 
 		const existingUserName = await db.select().from(User).where(eq(User.username, username)).get();
+		const existingUserByEmail = await db.select().from(User).where(eq(User.email, email)).get();
 
-		if (existingUserName) {
+		if (existingUserName || existingUserByEmail) {
 			return new Response("User already exists", {
 				status: 400,
 			});

diff --git a/playgrounds/node/.env.demo b/playgrounds/node/.env.demo
@@ -1,8 +1,8 @@
-# OPTIONALS
-
 # credentials for GitHub OAuth
 CMS_GITHUB_CLIENT_ID=
-CMS_GITHUB_CLIENT_SECRET=http://localhost:4321/dashboard/login/github/callback
+CMS_GITHUB_CLIENT_SECRET=
+# Github Callback URL `http://localhost:4321/dashboard/login/github/callback`
+# Github callback URL is NOT AN ENV VARIABLE!
 
 # credentials for Discord OAuth
 CMS_DISCORD_CLIENT_ID=