chore: fix mail verification (#475)

- remove unsed files from dashboard
- update dashboard for inviting user
- test invite user functionality from ui

Author: lakhansamani

cmd/root.go

@@ -101,7 +101,7 @@ func init() {
 	f.StringVar(&rootArgs.config.SMTPSenderEmail, "smtp-sender-email", "", "Sender email for the SMTP server")
 	f.StringVar(&rootArgs.config.SMTPSenderName, "smtp-sender-name", "", "Sender name for the SMTP server")
 	f.StringVar(&rootArgs.config.SMTPLocalName, "smtp-local-name", "", "Local name for the SMTP server")
-	f.BoolVar(&rootArgs.config.SkipTLSVerification, "skip-tls-verification", false, "Skip TLS verification for the SMTP server")
+	f.BoolVar(&rootArgs.config.SMTPSkipTLSVerification, "smtp-skip-tls-verification", false, "Skip TLS verification for the SMTP server")
 
 	// Auth flags
 	f.StringSliceVar(&rootArgs.config.DefaultRoles, "default-roles", []string{"user"}, "Default user roles to assign")
@@ -205,6 +205,17 @@ func runRoot(c *cobra.Command, args []string) {
 		Level(zeroLogLevel).
 		With().Timestamp().Logger()
 
+	// Derive IsEmailServiceEnabled from SMTP config
+	rootArgs.config.IsEmailServiceEnabled = strings.TrimSpace(rootArgs.config.SMTPHost) != "" &&
+		rootArgs.config.SMTPPort > 0 &&
+		strings.TrimSpace(rootArgs.config.SMTPSenderEmail) != ""
+
+	// Derive IsSMSServiceEnabled from Twilio config
+	rootArgs.config.IsSMSServiceEnabled = strings.TrimSpace(rootArgs.config.TwilioAPIKey) != "" &&
+		strings.TrimSpace(rootArgs.config.TwilioAPISecret) != "" &&
+		strings.TrimSpace(rootArgs.config.TwilioAccountSID) != "" &&
+		strings.TrimSpace(rootArgs.config.TwilioSender) != ""
+
 	// Storage provider
 	storageProvider, err := storage.New(&rootArgs.config, &storage.Dependencies{
 		Log: &log,

internal/config/config.go

@@ -83,7 +83,7 @@ type Config struct {
 	// SMTPLocalName is the local name for the SMTP server
 	SMTPLocalName string
 	// SkipTLSVerification is the flag to skip TLS verification
-	SkipTLSVerification bool
+	SMTPSkipTLSVerification bool
 
 	// Memory Store Configurations
 	// RedisURL is the URL of the redis server

internal/email/email.go

@@ -45,7 +45,7 @@ func New(
 	if strings.TrimSpace(config.SMTPLocalName) != "" {
 		mailer.LocalName = config.SMTPLocalName
 	}
-	if config.SkipTLSVerification {
+	if config.SMTPSkipTLSVerification {
 		mailer.TLSConfig = &tls.Config{InsecureSkipVerify: true}
 	}
 	return &provider{

internal/integration_tests/magic_link_login_test.go

@@ -19,7 +19,7 @@ func TestMagicLinkLogin(t *testing.T) {
 	cfg.SMTPSenderEmail = "test@authorizer.dev"
 	cfg.SMTPSenderName = "Test"
 	cfg.SMTPLocalName = "Test"
-	cfg.SkipTLSVerification = true
+	cfg.SMTPSkipTLSVerification = true
 	cfg.IsEmailServiceEnabled = true
 	cfg.IsSMSServiceEnabled = true
 	cfg.EnableEmailVerification = true

internal/integration_tests/resend_otp_test.go

@@ -26,7 +26,7 @@ func TestResendOTP(t *testing.T) {
 	cfg.SMTPSenderEmail = "test@authorizer.dev"
 	cfg.SMTPSenderName = "Test"
 	cfg.SMTPLocalName = "Test"
-	cfg.SkipTLSVerification = true
+	cfg.SMTPSkipTLSVerification = true
 	cfg.IsEmailServiceEnabled = true
 	cfg.IsSMSServiceEnabled = true
 	cfg.EnableEmailVerification = true

internal/integration_tests/verify_otp_test.go

@@ -22,7 +22,7 @@ func TestVerifyOTP(t *testing.T) {
 	cfg.SMTPSenderEmail = "test@authorizer.dev"
 	cfg.SMTPSenderName = "Test"
 	cfg.SMTPLocalName = "Test"
-	cfg.SkipTLSVerification = true
+	cfg.SMTPSkipTLSVerification = true
 	cfg.IsEmailServiceEnabled = true
 	cfg.IsSMSServiceEnabled = true
 	cfg.EnableEmailVerification = true

web/dashboard/src/components/DeleteEmailTemplateModal.tsx

@@ -18,7 +18,7 @@ import {
 import { useClient } from 'urql';
 import { FaRegTrashAlt } from 'react-icons/fa';
 import { DeleteEmailTemplate } from '../graphql/mutation';
-import { capitalizeFirstLetter } from '../utils';
+import { capitalizeFirstLetter, getGraphQLErrorMessage } from '../utils';
 
 interface deleteEmailTemplateModalInputPropTypes {
 	emailTemplateId: string;
@@ -41,7 +41,7 @@ const DeleteEmailTemplateModal = ({
 			.toPromise();
 		if (res.error) {
 			toast({
-				title: capitalizeFirstLetter(res.error.message),
+				title: capitalizeFirstLetter(getGraphQLErrorMessage(res.error, 'Failed to delete email template')),
 				isClosable: true,
 				status: 'error',
 				position: 'top-right',

web/dashboard/src/components/DeleteUserModal.tsx

@@ -18,7 +18,7 @@ import {
 import { useClient } from 'urql';
 import { FaRegTrashAlt } from 'react-icons/fa';
 import { DeleteUser } from '../graphql/mutation';
-import { capitalizeFirstLetter } from '../utils';
+import { capitalizeFirstLetter, getGraphQLErrorMessage } from '../utils';
 
 interface userDataTypes {
 	id: string;
@@ -48,7 +48,7 @@ const DeleteUserModal = ({
 			.toPromise();
 		if (res.error) {
 			toast({
-				title: capitalizeFirstLetter(res.error.message),
+				title: capitalizeFirstLetter(getGraphQLErrorMessage(res.error, 'Failed to delete user')),
 				isClosable: true,
 				status: 'error',
 				position: 'top-right',

web/dashboard/src/components/DeleteWebhookModal.tsx

@@ -18,7 +18,7 @@ import {
 import { useClient } from 'urql';
 import { FaRegTrashAlt } from 'react-icons/fa';
 import { DeleteWebhook } from '../graphql/mutation';
-import { capitalizeFirstLetter } from '../utils';
+import { capitalizeFirstLetter, getGraphQLErrorMessage } from '../utils';
 
 interface deleteWebhookModalInputPropTypes {
 	webhookId: string;
@@ -41,7 +41,7 @@ const DeleteWebhookModal = ({
 			.toPromise();
 		if (res.error) {
 			toast({
-				title: capitalizeFirstLetter(res.error.message),
+				title: capitalizeFirstLetter(getGraphQLErrorMessage(res.error, 'Failed to delete webhook')),
 				isClosable: true,
 				status: 'error',
 				position: 'top-right',

web/dashboard/src/components/EditUserModal.tsx

@@ -15,19 +15,19 @@ import {
 	useDisclosure,
 	Text,
 	useToast,
+	Input,
 } from '@chakra-ui/react';
 import { useClient } from 'urql';
-import { FaSave } from 'react-icons/fa';
+import { FaSave, FaPlus } from 'react-icons/fa';
 import InputField from './InputField';
 import {
 	DateInputType,
 	MultiSelectInputType,
 	SelectInputType,
 	TextInputType,
 } from '../constants';
-import { getObjectDiff } from '../utils';
+import { getObjectDiff, getGraphQLErrorMessage } from '../utils';
 import { UpdateUser } from '../graphql/mutation';
-import { GetAvailableRolesQuery } from '../graphql/queries';
 
 const GenderTypes = {
 	Undisclosed: null,
@@ -46,7 +46,7 @@ interface userDataTypes {
 	birthdate: string;
 	phone_number: string;
 	picture: string;
-	roles: [string] | [];
+	roles: string[];
 }
 
 const EditUserModal = ({
@@ -58,7 +58,7 @@ const EditUserModal = ({
 }) => {
 	const client = useClient();
 	const toast = useToast();
-	const [availableRoles, setAvailableRoles] = useState<string[]>([]);
+	const [newRole, setNewRole] = useState('');
 	const { isOpen, onOpen, onClose } = useDisclosure();
 	const [userData, setUserData] = useState<userDataTypes>({
 		id: '',
@@ -73,19 +73,13 @@ const EditUserModal = ({
 		picture: '',
 		roles: [],
 	});
+	// Available roles for multiselect: current user roles (no env query)
+	const availableRoles = Array.from(
+		new Set([...(userData.roles || []), ...(user.roles || [])]),
+	);
 	React.useEffect(() => {
 		setUserData(user);
-		fetchAvailableRoles();
-	}, []);
-	const fetchAvailableRoles = async () => {
-		const res = await client.query(GetAvailableRolesQuery).toPromise();
-		if (res.data?._env?.ROLES && res.data?._env?.PROTECTED_ROLES) {
-			setAvailableRoles([
-				...res.data._env.ROLES,
-				...res.data._env.PROTECTED_ROLES,
-			]);
-		}
-	};
+	}, [user]);
 	const saveHandler = async () => {
 		const diff = getObjectDiff(user, userData);
 		const updatedUserData = diff.reduce(
@@ -101,7 +95,7 @@ const EditUserModal = ({
 			.toPromise();
 		if (res.error) {
 			toast({
-				title: 'User data update failed',
+				title: getGraphQLErrorMessage(res.error, 'User data update failed'),
 				isClosable: true,
 				status: 'error',
 				position: 'top-right',
@@ -229,13 +223,45 @@ const EditUserModal = ({
 								<Flex w="30%" justifyContent="start" alignItems="center">
 									<Text fontSize="sm">Roles:</Text>
 								</Flex>
-								<Center w="70%">
+								<Center w="70%" flexDirection="column" alignItems="stretch">
 									<InputField
 										variables={userData}
 										setVariables={setUserData}
 										availableRoles={availableRoles}
 										inputType={MultiSelectInputType.USER_ROLES}
 									/>
+									<Flex mt={2} gap={2}>
+										<Input
+											size="sm"
+											placeholder="Add role"
+											value={newRole}
+											onChange={(e) => setNewRole(e.target.value)}
+											onKeyDown={(e) => {
+												if (e.key === 'Enter' && newRole.trim()) {
+													setUserData({
+														...userData,
+														roles: [...(userData.roles || []), newRole.trim()],
+													});
+													setNewRole('');
+												}
+											}}
+										/>
+										<Button
+											size="sm"
+											leftIcon={<FaPlus />}
+											onClick={() => {
+												if (newRole.trim()) {
+													setUserData({
+														...userData,
+														roles: [...(userData.roles || []), newRole.trim()],
+													});
+													setNewRole('');
+												}
+											}}
+										>
+											Add
+										</Button>
+									</Flex>
 								</Center>
 							</Flex>
 						</Stack>