fix: template respone & ui

lakhansamani · lakhansamani · commit 7792cdbc5eae · 2022-08-09T09:07:47.000+05:30
diff --git a/dashboard/package-lock.json b/dashboard/package-lock.json
diff --git a/dashboard/src/components/UpdateEmailTemplateModal.tsx b/dashboard/src/components/UpdateEmailTemplateModal.tsx
@@ -62,8 +62,7 @@ interface validatorDataType {
 }
 
 const initTemplateData: emailTemplateDataType = {
-	[EmailTemplateInputDataFields.EVENT_NAME]:
-		emailTemplateEventNames.BASIC_AUTH_SIGNUP,
+	[EmailTemplateInputDataFields.EVENT_NAME]: emailTemplateEventNames.Signup,
 	[EmailTemplateInputDataFields.SUBJECT]: '',
 };
 
@@ -206,10 +205,10 @@ const UpdateEmailTemplate = ({
 		).reduce((acc, varData): any => {
 			if (
 				(templateData[EmailTemplateInputDataFields.EVENT_NAME] !==
-					emailTemplateEventNames.VERIFY_OTP &&
+					emailTemplateEventNames['Verify Otp'] &&
 					varData[1] === emailTemplateVariables.otp) ||
 				(templateData[EmailTemplateInputDataFields.EVENT_NAME] ===
-					emailTemplateEventNames.VERIFY_OTP &&
+					emailTemplateEventNames['Verify Otp'] &&
 					varData[1] === emailTemplateVariables.verification_url)
 			) {
 				return acc;
diff --git a/dashboard/src/components/UpdateWebhookModal.tsx b/dashboard/src/components/UpdateWebhookModal.tsx
@@ -94,7 +94,7 @@ interface validatorDataType {
 }
 
 const initWebhookData: webhookDataType = {
-	[WebhookInputDataFields.EVENT_NAME]: webhookEventNames.USER_LOGIN,
+	[WebhookInputDataFields.EVENT_NAME]: webhookEventNames['User login'],
 	[WebhookInputDataFields.ENDPOINT]: '',
 	[WebhookInputDataFields.ENABLED]: true,
 	[WebhookInputDataFields.HEADERS]: [{ ...initHeadersData }],
diff --git a/dashboard/src/constants.ts b/dashboard/src/constants.ts
@@ -183,20 +183,21 @@ export enum UpdateModalViews {
 export const pageLimits: number[] = [5, 10, 15];
 
 export const webhookEventNames = {
-	USER_SIGNUP: 'user.signup',
-	USER_CREATED: 'user.created',
-	USER_LOGIN: 'user.login',
-	USER_DELETED: 'user.deleted',
-	USER_ACCESS_ENABLED: 'user.access_enabled',
-	USER_ACCESS_REVOKED: 'user.access_revoked',
+	'User signup': 'user.signup',
+	'User created': 'user.created',
+	'User login': 'user.login',
+	'User deleted': 'user.deleted',
+	'User access enabled': 'user.access_enabled',
+	'User access revoked': 'user.access_revoked',
 };
 
 export const emailTemplateEventNames = {
-	BASIC_AUTH_SIGNUP: 'basic_auth_signup',
-	MAGIC_LINK_LOGIN: 'magic_link_login',
-	UPDATE_EMAIL: 'update_email',
-	FORGOT_PASSWORD: 'forgot_password',
-	VERIFY_OTP: 'verify_otp',
+	Signup: 'basic_auth_signup',
+	'Magic Link Login': 'magic_link_login',
+	'Update Email': 'update_email',
+	'Forgot Password': 'forgot_password',
+	'Verify Otp': 'verify_otp',
+	'Invite member': 'invite_member',
 };
 
 export enum webhookVerifiedStatus {
diff --git a/dashboard/src/graphql/queries/index.ts b/dashboard/src/graphql/queries/index.ts
@@ -126,7 +126,7 @@ export const WebhooksDataQuery = `
 export const EmailTemplatesQuery = `
   query getEmailTemplates($params: PaginatedInput!) {
     _email_templates(params: $params) {
-      EmailTemplates {
+      email_templates {
         id
         event_name
         subject
diff --git a/dashboard/src/pages/EmailTemplates.tsx b/dashboard/src/pages/EmailTemplates.tsx
@@ -40,7 +40,7 @@ import {
 	UpdateModalViews,
 	EmailTemplateInputDataFields,
 } from '../constants';
-import { EmailTemplatesQuery, WebhooksDataQuery } from '../graphql/queries';
+import { EmailTemplatesQuery } from '../graphql/queries';
 import dayjs from 'dayjs';
 import DeleteEmailTemplateModal from '../components/DeleteEmailTemplateModal';
 
@@ -94,7 +94,7 @@ const EmailTemplates = () => {
 			})
 			.toPromise();
 		if (res.data?._email_templates) {
-			const { pagination, EmailTemplates: emailTemplates } =
+			const { pagination, email_templates: emailTemplates } =
 				res.data?._email_templates;
 			const maxPages = getMaxPages(pagination);
 			if (emailTemplates?.length) {
diff --git a/server/graph/generated/generated.go b/server/graph/generated/generated.go
diff --git a/server/graph/model/models_gen.go b/server/graph/model/models_gen.go
diff --git a/server/graph/schema.graphqls b/server/graph/schema.graphqls
@@ -201,7 +201,7 @@ type EmailTemplate {
 
 type EmailTemplates {
 	pagination: Pagination!
-	EmailTemplates: [EmailTemplate!]!
+	email_templates: [EmailTemplate!]!
 }
 
 input UpdateEnvInput {
diff --git a/server/resolvers/invite_members.go b/server/resolvers/invite_members.go
@@ -166,7 +166,7 @@ func InviteMembersResolver(ctx context.Context, params model.InviteMemberInput)
 		go emailservice.SendEmail([]string{user.Email}, constants.VerificationTypeInviteMember, map[string]interface{}{
 			"user":             user.ToMap(),
 			"organization":     utils.GetOrganization(),
-			"verification_url": utils.GetInviteVerificationURL(verifyEmailURL, verificationToken, hostname),
+			"verification_url": utils.GetInviteVerificationURL(verifyEmailURL, verificationToken, redirectURL),
 		})
 	}
 
diff --git a/server/validators/email_template.go b/server/validators/email_template.go
@@ -4,7 +4,7 @@ import "github.com/authorizerdev/authorizer/server/constants"
 
 // IsValidEmailTemplateEventName function to validate email template events
 func IsValidEmailTemplateEventName(eventName string) bool {
-	if eventName != constants.VerificationTypeBasicAuthSignup && eventName != constants.VerificationTypeForgotPassword && eventName != constants.VerificationTypeMagicLinkLogin && eventName != constants.VerificationTypeUpdateEmail && eventName != constants.VerificationTypeOTP {
+	if eventName != constants.VerificationTypeBasicAuthSignup && eventName != constants.VerificationTypeForgotPassword && eventName != constants.VerificationTypeMagicLinkLogin && eventName != constants.VerificationTypeUpdateEmail && eventName != constants.VerificationTypeOTP && eventName != constants.VerificationTypeInviteMember {
 		return false
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ interface validatorDataType {`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`const initWebhookData: webhookDataType = {`
`97`		`- [WebhookInputDataFields.EVENT_NAME]: webhookEventNames.USER_LOGIN,`
	`97`	`+ [WebhookInputDataFields.EVENT_NAME]: webhookEventNames['User login'],`
`98`	`98`	`[WebhookInputDataFields.ENDPOINT]: '',`
`99`	`99`	`[WebhookInputDataFields.ENABLED]: true,`
`100`	`100`	`[WebhookInputDataFields.HEADERS]: [{ ...initHeadersData }],`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ type EmailTemplate {`
`201`	`201`
`202`	`202`	`type EmailTemplates {`
`203`	`203`	`pagination: Pagination!`
`204`		`- EmailTemplates: [EmailTemplate!]!`
	`204`	`+ email_templates: [EmailTemplate!]!`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`input UpdateEnvInput {`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ func InviteMembersResolver(ctx context.Context, params model.InviteMemberInput)`
`166`	`166`	`go emailservice.SendEmail([]string{user.Email}, constants.VerificationTypeInviteMember, map[string]interface{}{`
`167`	`167`	`"user": user.ToMap(),`
`168`	`168`	`"organization": utils.GetOrganization(),`
`169`		`- "verification_url": utils.GetInviteVerificationURL(verifyEmailURL, verificationToken, hostname),`
	`169`	`+ "verification_url": utils.GetInviteVerificationURL(verifyEmailURL, verificationToken, redirectURL),`
`170`	`170`	`})`
`171`	`171`	`}`
`172`	`172`