@iexec/web3mail 0.1.1 → 0.2.0

package/dist/config/config.d.ts

@@ -3,3 +3,4 @@ export declare const WORKERPOOL_ADDRESS = "prod-v8-bellecour.main.pools.iexec.et
 export declare const DATAPROTECTOR_SUBGRAPH_ENDPOINT = "https://thegraph-product.iex.ec/subgraphs/name/bellecour/dataprotector";
 export declare const MAX_DESIRED_APP_ORDER_PRICE = 0;
 export declare const MAX_DESIRED_WORKERPOOL_ORDER_PRICE = 0;
+export declare const DEFAULT_CONTENT_TYPE = "text/plain";

package/dist/config/config.js

@@ -3,3 +3,4 @@ export const WORKERPOOL_ADDRESS = 'prod-v8-bellecour.main.pools.iexec.eth';
 export const DATAPROTECTOR_SUBGRAPH_ENDPOINT = 'https://thegraph-product.iex.ec/subgraphs/name/bellecour/dataprotector';
 export const MAX_DESIRED_APP_ORDER_PRICE = 0;
 export const MAX_DESIRED_WORKERPOOL_ORDER_PRICE = 0;
+export const DEFAULT_CONTENT_TYPE = 'text/plain';

package/dist/utils/validators.d.ts

@@ -2,3 +2,4 @@ export declare const throwIfMissing: () => never;
 export declare const addressOrEnsSchema: () => import("yup").StringSchema<string, import("yup").AnyObject, undefined, "">;
 export declare const emailSubjectSchema: () => import("yup").StringSchema<string, import("yup").AnyObject, undefined, "">;
 export declare const emailContentSchema: () => import("yup").StringSchema<string, import("yup").AnyObject, undefined, "">;
+export declare const contentTypeSchema: () => import("yup").StringSchema<string, import("yup").AnyObject, undefined, "">;

package/dist/utils/validators.js

@@ -14,3 +14,6 @@ export const addressOrEnsSchema = () => string()
 export const emailSubjectSchema = () => string().max(78).strict();
 // 4096 bytes is the current max length for iExec SMS secrets
 export const emailContentSchema = () => string().max(4096).strict();
+// Valid content types for the variable 'contentType'
+const validContentTypes = ['text/plain', 'text/html'];
+export const contentTypeSchema = () => string().oneOf(validContentTypes, 'Invalid contentType').optional();

package/dist/web3mail/sendEmail.d.ts

@@ -1,2 +1,2 @@
 import { IExecConsumer, SendEmailParams, SendEmailResponse, SubgraphConsumer } from './types.js';
-export declare const sendEmail: ({ graphQLClient, iexec, emailSubject, emailContent, protectedData, }: IExecConsumer & SubgraphConsumer & SendEmailParams) => Promise<SendEmailResponse>;
+export declare const sendEmail: ({ graphQLClient, iexec, emailSubject, emailContent, contentType, protectedData, }: IExecConsumer & SubgraphConsumer & SendEmailParams) => Promise<SendEmailResponse>;

package/dist/web3mail/sendEmail.js

@@ -7,12 +7,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { MAX_DESIRED_APP_ORDER_PRICE, MAX_DESIRED_WORKERPOOL_ORDER_PRICE, WEB3_MAIL_DAPP_ADDRESS, WORKERPOOL_ADDRESS, } from '../config/config.js';
+import { DEFAULT_CONTENT_TYPE, MAX_DESIRED_APP_ORDER_PRICE, MAX_DESIRED_WORKERPOOL_ORDER_PRICE, WEB3_MAIL_DAPP_ADDRESS, WORKERPOOL_ADDRESS, } from '../config/config.js';
 import { WorkflowError } from '../utils/errors.js';
 import { generateSecureUniqueId } from '../utils/generateUniqueId.js';
 import { checkProtectedDataValidity } from '../utils/subgraphQuery.js';
-import { addressOrEnsSchema, emailContentSchema, emailSubjectSchema, throwIfMissing, } from '../utils/validators.js';
-export const sendEmail = ({ graphQLClient = throwIfMissing(), iexec = throwIfMissing(), emailSubject, emailContent, protectedData, }) => __awaiter(void 0, void 0, void 0, function* () {
+import { addressOrEnsSchema, contentTypeSchema, emailContentSchema, emailSubjectSchema, throwIfMissing, } from '../utils/validators.js';
+export const sendEmail = ({ graphQLClient = throwIfMissing(), iexec = throwIfMissing(), emailSubject, emailContent, contentType = DEFAULT_CONTENT_TYPE, protectedData, }) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c, _d, _e;
     try {
         const vDatasetAddress = addressOrEnsSchema()
@@ -27,6 +27,10 @@ export const sendEmail = ({ graphQLClient = throwIfMissing(), iexec = throwIfMis
             .required()
             .label('emailContent')
             .validateSync(emailContent);
+        const vContentType = contentTypeSchema()
+            .required()
+            .label('contentType')
+            .validateSync(contentType);
         // Check protected data validity through subgraph
         const isValidProtectedData = yield checkProtectedDataValidity(graphQLClient, vDatasetAddress);
         if (!isValidProtectedData) {
@@ -85,8 +89,10 @@ export const sendEmail = ({ graphQLClient = throwIfMissing(), iexec = throwIfMis
         // Push requester secrets
         const emailSubjectId = generateSecureUniqueId(16);
         const emailContentId = generateSecureUniqueId(16);
+        const optionsId = generateSecureUniqueId(16);
         yield iexec.secrets.pushRequesterSecret(emailSubjectId, vEmailSubject);
         yield iexec.secrets.pushRequesterSecret(emailContentId, vEmailContent);
+        yield iexec.secrets.pushRequesterSecret(optionsId, JSON.stringify({ contentType: vContentType }));
         // Create and sign request order
         const requestorderToSign = yield iexec.order.createRequestorder({
             app: WEB3_MAIL_DAPP_ADDRESS,
@@ -101,6 +107,7 @@ export const sendEmail = ({ graphQLClient = throwIfMissing(), iexec = throwIfMis
                 iexec_secrets: {
                     1: emailSubjectId,
                     2: emailContentId,
+                    3: optionsId,
                 },
             },
         });

package/dist/web3mail/types.d.ts

@@ -1,5 +1,5 @@
-import { EnhancedWallet, IExec } from 'iexec';
 import { GraphQLClient } from 'graphql-request';
+import { EnhancedWallet, IExec } from 'iexec';
 export type Web3SignerProvider = EnhancedWallet;
 export type IExecConsumer = {
     iexec: IExec;
@@ -15,6 +15,7 @@ export type SendEmailParams = {
     emailSubject: string;
     emailContent: string;
     protectedData: Address;
+    contentType?: string;
 };
 export type SendEmailResponse = {
     taskId: Address;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iexec/web3mail",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "This product enables users to confidentially store data–such as mail address, documents, personal information ...",
   "main": "./dist/bundle.js",
   "type": "module",

package/src/config/config.ts

@@ -4,3 +4,4 @@ export const DATAPROTECTOR_SUBGRAPH_ENDPOINT =
   'https://thegraph-product.iex.ec/subgraphs/name/bellecour/dataprotector';
 export const MAX_DESIRED_APP_ORDER_PRICE = 0;
 export const MAX_DESIRED_WORKERPOOL_ORDER_PRICE = 0;
+export const DEFAULT_CONTENT_TYPE = 'text/plain';

package/src/utils/validators.ts

@@ -25,3 +25,9 @@ export const emailSubjectSchema = () => string().max(78).strict();
 
 // 4096 bytes is the current max length for iExec SMS secrets
 export const emailContentSchema = () => string().max(4096).strict();
+
+// Valid content types for the variable 'contentType'
+const validContentTypes = ['text/plain', 'text/html'];
+
+export const contentTypeSchema = () =>
+  string().oneOf(validContentTypes, 'Invalid contentType').optional();

package/src/web3mail/sendEmail.ts

@@ -1,4 +1,5 @@
 import {
+  DEFAULT_CONTENT_TYPE,
   MAX_DESIRED_APP_ORDER_PRICE,
   MAX_DESIRED_WORKERPOOL_ORDER_PRICE,
   WEB3_MAIL_DAPP_ADDRESS,
@@ -9,6 +10,7 @@ import { generateSecureUniqueId } from '../utils/generateUniqueId.js';
 import { checkProtectedDataValidity } from '../utils/subgraphQuery.js';
 import {
   addressOrEnsSchema,
+  contentTypeSchema,
   emailContentSchema,
   emailSubjectSchema,
   throwIfMissing,
@@ -25,6 +27,7 @@ export const sendEmail = async ({
   iexec = throwIfMissing(),
   emailSubject,
   emailContent,
+  contentType = DEFAULT_CONTENT_TYPE,
   protectedData,
 }: IExecConsumer &
   SubgraphConsumer &
@@ -43,6 +46,11 @@ export const sendEmail = async ({
       .label('emailContent')
       .validateSync(emailContent);
 
+    const vContentType = contentTypeSchema()
+      .required()
+      .label('contentType')
+      .validateSync(contentType);
+
     // Check protected data validity through subgraph
     const isValidProtectedData = await checkProtectedDataValidity(
       graphQLClient,
@@ -128,9 +136,13 @@ export const sendEmail = async ({
     // Push requester secrets
     const emailSubjectId = generateSecureUniqueId(16);
     const emailContentId = generateSecureUniqueId(16);
+    const optionsId = generateSecureUniqueId(16);
     await iexec.secrets.pushRequesterSecret(emailSubjectId, vEmailSubject);
     await iexec.secrets.pushRequesterSecret(emailContentId, vEmailContent);
-
+    await iexec.secrets.pushRequesterSecret(
+      optionsId,
+      JSON.stringify({ contentType: vContentType })
+    );
     // Create and sign request order
     const requestorderToSign = await iexec.order.createRequestorder({
       app: WEB3_MAIL_DAPP_ADDRESS,
@@ -145,6 +157,7 @@ export const sendEmail = async ({
         iexec_secrets: {
           1: emailSubjectId,
           2: emailContentId,
+          3: optionsId,
         },
       },
     });

package/src/web3mail/types.ts

@@ -1,5 +1,5 @@
-import { EnhancedWallet, IExec } from 'iexec';
 import { GraphQLClient } from 'graphql-request';
+import { EnhancedWallet, IExec } from 'iexec';
 
 export type Web3SignerProvider = EnhancedWallet;
 
@@ -20,6 +20,7 @@ export type SendEmailParams = {
   emailSubject: string;
   emailContent: string;
   protectedData: Address;
+  contentType?: string;
 };
 
 export type SendEmailResponse = {