diff --git a/template/app/main.wasp b/template/app/main.wasp
index 4526868..5dfed47 100644
--- a/template/app/main.wasp
+++ b/template/app/main.wasp
@@ -66,7 +66,6 @@ app OpenSaaS {
// configFn: import { getDiscordAuthConfig } from "@src/auth/userSignupFields"
// }
},
- onAfterSignup: import { onAfterSignup } from "@src/auth/hooks",
onAuthFailedRedirectTo: "/login",
onAuthSucceededRedirectTo: "/demo-app",
},
diff --git a/template/app/src/auth/hooks.ts b/template/app/src/auth/hooks.ts
deleted file mode 100644
index b652294..0000000
--- a/template/app/src/auth/hooks.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { HttpError } from 'wasp/server';
-import type { OnAfterSignupHook } from 'wasp/server/auth';
-
-export const onAfterSignup: OnAfterSignupHook = async ({ providerId, user, prisma }) => {
- // For Stripe to function correctly, we need a valid email associated with the user.
- // Discord allows an email address to be optional. If this is the case, we delete the user
- // from our DB and throw an error.
- if (providerId.providerName === 'discord' && !user.email) {
- await prisma.user.delete({
- where: {
- id: user.id,
- },
- });
- throw new HttpError(403, 'Discord user needs a valid email to sign up');
- }
-};
diff --git a/template/app/src/auth/userSignupFields.ts b/template/app/src/auth/userSignupFields.ts
index bea820f..43068f8 100644
--- a/template/app/src/auth/userSignupFields.ts
+++ b/template/app/src/auth/userSignupFields.ts
@@ -3,19 +3,35 @@ import { defineUserSignupFields } from 'wasp/auth/providers/types';
const adminEmails = process.env.ADMIN_EMAILS?.split(',') || [];
+const emailDataSchema = z.object({
+ email: z.string(),
+});
+
export const getEmailUserFields = defineUserSignupFields({
- username: (data: any) => data.email,
- isAdmin: (data: any) => adminEmails.includes(data.email),
- email: (data: any) => data.email,
+ email: (data) => {
+ const emailData = emailDataSchema.parse(data);
+ return emailData.email;
+ },
+ username: (data) => {
+ const emailData = emailDataSchema.parse(data);
+ return emailData.email;
+ },
+ isAdmin: (data) => {
+ const emailData = emailDataSchema.parse(data);
+ return adminEmails.includes(emailData.email);
+ },
});
const githubDataSchema = z.object({
profile: z.object({
- emails: z.array(
- z.object({
- email: z.string(),
- })
- ),
+ emails: z
+ .array(
+ z.object({
+ email: z.string(),
+ verified: z.boolean(),
+ })
+ )
+ .min(1, 'You need to have an email address associated with your GitHub account to sign up.'),
login: z.string(),
}),
});
@@ -23,7 +39,7 @@ const githubDataSchema = z.object({
export const getGitHubUserFields = defineUserSignupFields({
email: (data) => {
const githubData = githubDataSchema.parse(data);
- return githubData.profile.emails[0].email;
+ return getGithubEmailInfo(githubData).email;
},
username: (data) => {
const githubData = githubDataSchema.parse(data);
@@ -31,10 +47,20 @@ export const getGitHubUserFields = defineUserSignupFields({
},
isAdmin: (data) => {
const githubData = githubDataSchema.parse(data);
- return adminEmails.includes(githubData.profile.emails[0].email);
+ const emailInfo = getGithubEmailInfo(githubData);
+ if (!emailInfo.verified) {
+ return false;
+ }
+ return adminEmails.includes(emailInfo.email);
},
});
+// We are using the first email from the list of emails returned by GitHub.
+// If you want to use a different email, you can modify this function.
+function getGithubEmailInfo(githubData: z.infer
) {
+ return githubData.profile.emails[0];
+}
+
// NOTE: if we don't want to access users' emails, we can use scope ["user:read"]
// instead of ["user"] and access args.profile.username instead
export function getGitHubAuthConfig() {
@@ -46,6 +72,7 @@ export function getGitHubAuthConfig() {
const googleDataSchema = z.object({
profile: z.object({
email: z.string(),
+ email_verified: z.boolean(),
}),
});
@@ -60,6 +87,9 @@ export const getGoogleUserFields = defineUserSignupFields({
},
isAdmin: (data) => {
const googleData = googleDataSchema.parse(data);
+ if (!googleData.profile.email_verified) {
+ return false;
+ }
return adminEmails.includes(googleData.profile.email);
},
});
@@ -74,12 +104,17 @@ const discordDataSchema = z.object({
profile: z.object({
username: z.string(),
email: z.string().email().nullable(),
+ verified: z.boolean().nullable(),
}),
});
export const getDiscordUserFields = defineUserSignupFields({
email: (data) => {
const discordData = discordDataSchema.parse(data);
+ // Users need to have an email for payment processing.
+ if (!discordData.profile.email) {
+ throw new Error('You need to have an email address associated with your Discord account to sign up.');
+ }
return discordData.profile.email;
},
username: (data) => {
@@ -87,8 +122,11 @@ export const getDiscordUserFields = defineUserSignupFields({
return discordData.profile.username;
},
isAdmin: (data) => {
- const email = discordDataSchema.parse(data).profile.email;
- return !!email && adminEmails.includes(email);
+ const discordData = discordDataSchema.parse(data);
+ if (!discordData.profile.email || !discordData.profile.verified) {
+ return false;
+ }
+ return adminEmails.includes(discordData.profile.email);
},
});
diff --git a/template/app/src/payment/PricingPage.tsx b/template/app/src/payment/PricingPage.tsx
index 41297c4..acde745 100644
--- a/template/app/src/payment/PricingPage.tsx
+++ b/template/app/src/payment/PricingPage.tsx
@@ -38,9 +38,11 @@ export const paymentPlanCards: Record = {
const PricingPage = () => {
const [isPaymentLoading, setIsPaymentLoading] = useState(false);
-
+ const [errorMessage, setErrorMessage] = useState(null);
+
const { data: user } = useAuth();
- const isUserSubscribed = !!user && !!user.subscriptionStatus && user.subscriptionStatus !== SubscriptionStatus.Deleted;
+ const isUserSubscribed =
+ !!user && !!user.subscriptionStatus && user.subscriptionStatus !== SubscriptionStatus.Deleted;
const {
data: customerPortalUrl,
@@ -65,8 +67,13 @@ const PricingPage = () => {
} else {
throw new Error('Error generating checkout session URL');
}
- } catch (error) {
+ } catch (error: unknown) {
console.error(error);
+ if (error instanceof Error) {
+ setErrorMessage(error.message);
+ } else {
+ setErrorMessage('Error processing payment. Please try again later.');
+ }
setIsPaymentLoading(false); // We only set this to false here and not in the try block because we redirect to the checkout url within the same window
}
}
@@ -78,11 +85,13 @@ const PricingPage = () => {
}
if (customerPortalUrlError) {
- console.error('Error fetching customer portal url');
+ setErrorMessage('Error fetching Customer Portal URL');
+ return;
}
if (!customerPortalUrl) {
- throw new Error(`Customer Portal does not exist for user ${user.id}`)
+ setErrorMessage(`Customer Portal does not exist for user ${user.id}`);
+ return;
}
window.open(customerPortalUrl, '_blank');
@@ -101,6 +110,11 @@ const PricingPage = () => {
out below with test credit card number
4242 4242 4242 4242 4242
+ {errorMessage && (
+
+ {errorMessage}
+
+ )}
{Object.values(PaymentPlanId).map((planId) => (