wabe 0.5.8 → 0.5.10

package/dist/index.d.ts

@@ -2,7 +2,7 @@
 
 /// <reference types="react" />
 
-import { Context, CorsOptions, Wobe, WobeHandler, WobeResponse } from 'wobe';
+import { Context, CorsOptions, RateLimitOptions, Wobe, WobeHandler, WobeResponse } from 'wobe';
 
 export type Scalars = {
 	ID: {
@@ -1009,7 +1009,11 @@ export type WabeFileAdapter = (file: File) => Promise<string>;
 export interface FileConfig {
 	adapter: WabeFileAdapter;
 }
-export type Templates = "sendOTPCode";
+export type HtmlTemplates = {
+	sendOTPCode: (options: {
+		otp: string;
+	}) => string | Promise<string>;
+};
 export interface EmailSendOptions {
 	from: string;
 	to: Array<string>;
@@ -1035,7 +1039,7 @@ export interface EmailAdapter {
 export interface EmailConfig {
 	adapter: EmailAdapter;
 	mainEmail?: string;
-	htmlTemplates?: Record<Templates, (payload: any) => string>;
+	htmlTemplates?: HtmlTemplates;
 }
 export declare class EmailDevAdapter implements EmailAdapter {
 	send(): Promise<string>;
@@ -1120,7 +1124,7 @@ export type CreateCustomerOptions = {
 };
 export type CreatePaymentOptions = {
 	currency: Currency$1;
-	customerEmail: string;
+	customerEmail?: string;
 	products: Array<Product>;
 	paymentMethod: Array<PaymentMethod>;
 	paymentMode: PaymentMode;
@@ -1159,23 +1163,11 @@ export type ValidateWebhookOptions = {
  * ValidateWebhookOutput
  * @property valid - Whether the webhook is valid or not
  * @property payload - The payload of the webhook
- * @property type - The type of the webhook
- * @property customerId - The customer id
- * @property createdAt - The created at timestamp in seconds
- * @property currency - The currency
- * @property amount - The amount
- * @property paymentMethod - The payment method
  */
 export type ValidateWebhookOutput = {
 	isValid: boolean;
-	payload: {
-		type: string;
-		customerId?: string;
-		createdAt?: number;
-		currency?: string;
-		amount?: number;
-		paymentMethod?: Array<string>;
-	};
+	type: string;
+	payload: any | null;
 };
 export type InitWebhookOutput = {
 	webhookId: string;
@@ -1253,10 +1245,14 @@ declare class PaymentController implements PaymentAdapter {
 	getAllTransactions(options: GetAllTransactionsOptions): Promise<Transaction[]>;
 	getHypotheticalSubscriptionRevenue(): Promise<number>;
 }
+export type SecurityConfig = {
+	corsOptions?: CorsOptions;
+	rateLimit?: RateLimitOptions;
+};
 export interface WabeConfig<T extends WabeTypes> {
 	port: number;
 	hostname?: string;
-	corsOptions?: CorsOptions;
+	security?: SecurityConfig;
 	schema?: SchemaInterface<T>;
 	database: DatabaseConfig;
 	codegen?: {
@@ -1290,7 +1286,7 @@ export declare class Wabe<T extends WabeTypes> {
 	server: Wobe<WobeCustomContext<T>>;
 	config: WabeConfig<T>;
 	controllers: WabeControllers<T>;
-	constructor({ port, hostname, corsOptions, schema, database, authentication, rootKey, codegen, hooks, file, email, payment, routes, }: WabeConfig<T>);
+	constructor({ port, hostname, security, schema, database, authentication, rootKey, codegen, hooks, file, email, payment, routes, }: WabeConfig<T>);
 	loadRoleEnum(): void;
 	loadAuthenticationMethods(): void;
 	loadHooks(): void;
@@ -1357,7 +1353,7 @@ export interface Tokens {
 	idToken?: string;
 }
 export interface OAuth2ProviderWithPKCE {
-	createAuthorizationURL(state: string, codeVerifier: string): Promise<URL>;
+	createAuthorizationURL(state: string, codeVerifier: string): URL;
 	validateAuthorizationCode(code: string, codeVerifier: string): Promise<Tokens>;
 	refreshAccessToken?(refreshToken: string): Promise<Tokens>;
 }
@@ -1367,7 +1363,7 @@ export declare class Google implements OAuth2ProviderWithPKCE {
 	constructor(config: WabeConfig<any>);
 	createAuthorizationURL(state: string, codeVerifier: string, options?: {
 		scopes?: string[];
-	}): Promise<URL>;
+	}): URL;
 	validateAuthorizationCode(code: string, codeVerifier: string): Promise<Tokens>;
 	refreshAccessToken(refreshToken: string): Promise<Tokens>;
 	getUserInfo(accessToken: string, idToken: string): Promise<{
@@ -1381,9 +1377,8 @@ export declare class PaymentDevAdapter implements PaymentAdapter {
 	}>;
 	validateWebhook(): Promise<{
 		isValid: boolean;
-		payload: {
-			type: string;
-		};
+		payload: {};
+		type: string;
 	}>;
 	createCustomer(): Promise<string>;
 	createPayment(): Promise<string>;

package/dist/index.js

@@ -61415,7 +61415,7 @@ class PaymentDevAdapter {
     };
   }
   async validateWebhook() {
-    return { isValid: true, payload: { type: "" } };
+    return { isValid: true, payload: {}, type: "" };
   }
   async createCustomer() {
     return "";
@@ -61824,12 +61824,12 @@ var getDefaultHooks = () => [
   },
   {
     operationType: "beforeCreate" /* BeforeCreate */,
-    priority: 2,
+    priority: 3,
     callback: defaultSearchableFieldsBeforeCreate
   },
   {
     operationType: "beforeUpdate" /* BeforeUpdate */,
-    priority: 2,
+    priority: 3,
     callback: defaultSearchableFieldsBeforeUpdate
   },
   {
@@ -61846,13 +61846,13 @@ var getDefaultHooks = () => [
   {
     className: "User",
     operationType: "beforeCreate" /* BeforeCreate */,
-    priority: 1,
+    priority: 2,
     callback: defaultSetEmail
   },
   {
     className: "User",
     operationType: "beforeUpdate" /* BeforeUpdate */,
-    priority: 1,
+    priority: 2,
     callback: defaultSetEmailOnUpdate
   },
   {
@@ -62784,9 +62784,9 @@ class Google {
     this.client = new OAuth2Client(googleConfig.clientId, authorizeEndpoint, tokenEndpoint, redirectURI);
     this.clientSecret = googleConfig.clientSecret;
   }
-  async createAuthorizationURL(state, codeVerifier, options) {
+  createAuthorizationURL(state, codeVerifier, options) {
     const scopes = options?.scopes ?? [];
-    const url = await this.client.createAuthorizationURL({
+    const url = this.client.createAuthorizationURL({
       state,
       codeVerifier,
       scopes: [...scopes, "openid"]
@@ -62870,73 +62870,6 @@ var verifyChallengeResolver = async (_, {
   return true;
 };
 
-// src/schema/resolvers/cancelSubscription.ts
-var cancelSubscriptionResolver = (_, { input }, context) => {
-  if (!context.user && !context.isRoot)
-    throw new Error("Permission denied");
-  const paymentController = context.wabe.controllers.payment;
-  if (!paymentController)
-    throw new Error("Payment adapter not defined");
-  return paymentController.cancelSubscription(input);
-};
-
-// src/schema/resolvers/makePayment.ts
-var makePaymentResolver = async (_, { input }, context) => {
-  if (!context.user && !context.isRoot)
-    throw new Error("Permission denied");
-  const paymentController = context.wabe.controllers.payment;
-  if (!paymentController)
-    throw new Error("Payment adapter not defined");
-  const {
-    cancelUrl,
-    successUrl,
-    customerEmail,
-    paymentMode,
-    automaticTax,
-    recurringInterval,
-    products
-  } = input;
-  const email = customerEmail || context.user?.email;
-  if (!email)
-    throw new Error("Customer email is required");
-  const userWithEmail = await context.wabe.controllers.database.getObjects({
-    className: "User",
-    context: {
-      ...context,
-      isRoot: true
-    },
-    fields: ["id"],
-    where: {
-      email: {
-        equalTo: email
-      }
-    },
-    first: 1
-  });
-  if (!userWithEmail.length)
-    throw new Error("User not found");
-  const url = await paymentController.createPayment({
-    cancelUrl,
-    successUrl,
-    customerEmail: email,
-    paymentMode,
-    automaticTax: automaticTax ?? false,
-    recurringInterval: recurringInterval ?? "month",
-    products
-  });
-  return url;
-};
-
-// src/schema/resolvers/getInvoices.ts
-var getInvoicesResolver = (_, { email }, context) => {
-  if (!context.user && !context.isRoot)
-    throw new Error("Permission denied");
-  const paymentController = context.wabe.controllers.payment;
-  if (!paymentController)
-    throw new Error("Payment adapter not defined");
-  return paymentController.getInvoices({ email });
-};
-
 // src/schema/resolvers/meResolver.ts
 var meResolver = (_, __, context) => {
   return {
@@ -63174,7 +63107,7 @@ var sendOtpCodeResolver = async (_, { input }, context) => {
   const otpClass = new OTP(context.wabe.config.rootKey);
   const otp = otpClass.generate(userId);
   const mainEmail = context.wabe.config.email?.mainEmail || "noreply@wabe.com";
-  const template = context.wabe.config.email?.htmlTemplates?.sendOTPCode(otp) || sendOtpCodeTemplate(otp);
+  const template = await context.wabe.config.email?.htmlTemplates?.sendOTPCode({ otp }) || sendOtpCodeTemplate(otp);
   await emailController.send({
     from: mainEmail,
     to: [input.email],
@@ -63198,52 +63131,6 @@ var defaultQueries = {
       }
     },
     resolve: meResolver
-  },
-  getInvoices: {
-    type: "Array",
-    typeValue: "Object",
-    required: true,
-    outputObject: {
-      name: "Invoice",
-      fields: {
-        amountDue: {
-          type: "Int",
-          required: true
-        },
-        amountPaid: {
-          type: "Int",
-          required: true
-        },
-        currency: {
-          type: "Currency",
-          required: true
-        },
-        id: {
-          type: "String",
-          required: true
-        },
-        created: {
-          type: "Int",
-          required: true
-        },
-        invoiceUrl: {
-          type: "String",
-          required: true
-        },
-        isPaid: {
-          type: "Boolean",
-          required: true
-        }
-      }
-    },
-    description: "Get invoices of a customer",
-    args: {
-      email: {
-        type: "Email",
-        required: true
-      }
-    },
-    resolve: getInvoicesResolver
   }
 };
 var defaultMutations = {
@@ -63285,72 +63172,6 @@ var defaultMutations = {
     },
     resolve: sendOtpCodeResolver
   },
-  makePayment: {
-    type: "String",
-    description: "Create a payment with the payment provider. Returns the url to redirect the user to pay",
-    args: {
-      input: {
-        customerEmail: {
-          type: "Email",
-          description: "The payer's email, if not provided, the payer's email will be the user's email that call the mutation."
-        },
-        paymentMode: {
-          type: "PaymentMode",
-          required: true
-        },
-        successUrl: {
-          type: "String",
-          required: true
-        },
-        cancelUrl: {
-          type: "String",
-          required: true
-        },
-        products: {
-          type: "Array",
-          typeValue: "Object",
-          object: {
-            name: "Product",
-            fields: {
-              name: {
-                type: "String",
-                required: true
-              },
-              unitAmount: {
-                type: "Int",
-                required: true
-              },
-              quantity: {
-                type: "Int",
-                required: true
-              }
-            }
-          },
-          required: true,
-          requiredValue: true
-        },
-        automaticTax: {
-          type: "Boolean"
-        },
-        recurringInterval: {
-          type: "PaymentReccuringInterval"
-        }
-      }
-    },
-    resolve: makePaymentResolver
-  },
-  cancelSubscription: {
-    type: "Boolean",
-    args: {
-      input: {
-        email: {
-          type: "Email",
-          required: true
-        }
-      }
-    },
-    resolve: cancelSubscriptionResolver
-  },
   sendEmail: {
     type: "String",
     description: "Send basic email with text and html, returns the id of the email",
@@ -66421,6 +66242,34 @@ class Wobe {
     this.runtimeAdapter.stopServer(this.server);
   }
 }
+
+class WobeStore {
+  options;
+  store;
+  intervalId = undefined;
+  constructor(options) {
+    this.options = options;
+    this.store = {};
+    this._init();
+  }
+  _init() {
+    this.intervalId = setInterval(() => {
+      this.clear();
+    }, this.options.interval);
+  }
+  set(key, value) {
+    this.store[key] = value;
+  }
+  get(key) {
+    return this.store[key];
+  }
+  clear() {
+    this.store = {};
+  }
+  stop() {
+    clearInterval(this.intervalId);
+  }
+}
 var cors = (options) => {
   const defaults = {
     origin: "*",
@@ -66467,6 +66316,21 @@ var cors = (options) => {
     }
   };
 };
+var rateLimit = ({
+  interval,
+  numberOfRequests
+}) => {
+  const store = new WobeStore({
+    interval
+  });
+  return (ctx) => {
+    const ipAdress = ctx.getIpAdress();
+    const userRequests = store.get(ipAdress) || 0;
+    if (userRequests >= numberOfRequests)
+      throw new HttpException(new Response("Rate limit exceeded", { status: 429 }));
+    store.set(ipAdress, userRequests + 1);
+  };
+};
 
 // ../../node_modules/graphql-yoga/esm/error.js
 var import_graphql27 = __toESM(require_graphql2(), 1);
@@ -75838,7 +75702,7 @@ class Wabe {
   constructor({
     port,
     hostname,
-    corsOptions,
+    security,
     schema,
     database,
     authentication,
@@ -75853,7 +75717,7 @@ class Wabe {
     this.config = {
       port,
       hostname,
-      corsOptions,
+      security,
       schema,
       database,
       codegen,
@@ -75965,8 +75829,11 @@ class Wabe {
     }
     this.server.options("/*", (ctx) => {
       return ctx.res.send("OK");
-    }, cors(this.config.corsOptions));
-    this.server.beforeHandler(cors(this.config.corsOptions));
+    }, cors(this.config.security?.corsOptions));
+    const rateLimitOptions = this.config.security?.rateLimit;
+    if (rateLimitOptions)
+      this.server.beforeHandler(rateLimit(rateLimitOptions));
+    this.server.beforeHandler(cors(this.config.security?.corsOptions));
     this.server.beforeHandler(async (ctx) => {
       const headers = ctx.request.headers;
       if (headers.get("Wabe-Root-Key") === this.config.rootKey) {

package/generated/schema.graphql

@@ -722,9 +722,6 @@ type Query {
   """Hello world description"""
   helloWorld(name: String!): String
   me: MeOutput
-
-  """Get invoices of a customer"""
-  getInvoices(email: Email!): [Invoice]!
 }
 
 """User class"""
@@ -1200,16 +1197,6 @@ type MeOutput {
   user: User
 }
 
-type Invoice {
-  amountDue: Int!
-  amountPaid: Int!
-  currency: Currency!
-  id: String!
-  created: Int!
-  invoiceUrl: String!
-  isPaid: Boolean!
-}
-
 type Mutation {
   """User class"""
   createUser(input: CreateUserInput!): CreateUserPayload
@@ -1268,12 +1255,6 @@ type Mutation {
   """Send an OTP code by email to the user"""
   sendOtpCode(input: SendOtpCodeInput!): Boolean
 
-  """
-  Create a payment with the payment provider. Returns the url to redirect the user to pay
-  """
-  makePayment(input: MakePaymentInput!): String
-  cancelSubscription(input: CancelSubscriptionInput!): Boolean
-
   """Send basic email with text and html, returns the id of the email"""
   sendEmail(input: SendEmailInput!): String
   signInWith(input: SignInWithInput!): SignInWithOutput
@@ -1785,26 +1766,6 @@ input SendOtpCodeInput {
   email: Email!
 }
 
-input MakePaymentInput {
-  customerEmail: Email
-  paymentMode: PaymentMode!
-  successUrl: String!
-  cancelUrl: String!
-  products: [MakePaymentProductInput]!
-  automaticTax: Boolean
-  recurringInterval: PaymentReccuringInterval
-}
-
-input MakePaymentProductInput {
-  name: String!
-  unitAmount: Int!
-  quantity: Int!
-}
-
-input CancelSubscriptionInput {
-  email: Email!
-}
-
 input SendEmailInput {
   from: String!
   to: [String!]!

package/generated/wabe.ts

@@ -705,7 +705,6 @@ export type Query = {
   _internalConfigs: _InternalConfigConnection;
   helloWorld?: Scalars['String']['output'];
   me?: MeOutput;
-  getInvoices: Invoice[];
 };
 
 export type QueryUserArgs = {
@@ -778,10 +777,6 @@ export type QueryHelloWorldArgs = {
   name: Scalars['String']['input'];
 };
 
-export type QueryGetInvoicesArgs = {
-  email: Scalars['Email']['input'];
-};
-
 export type UserWhereInput = {
   id?: IdWhereInput;
   name?: StringWhereInput;
@@ -1246,16 +1241,6 @@ export type MeOutput = {
   user?: User;
 };
 
-export type Invoice = {
-  amountDue: Scalars['Int']['output'];
-  amountPaid: Scalars['Int']['output'];
-  currency: Currency;
-  id: Scalars['String']['output'];
-  created: Scalars['Int']['output'];
-  invoiceUrl: Scalars['String']['output'];
-  isPaid: Scalars['Boolean']['output'];
-};
-
 export type Mutation = {
   createUser?: CreateUserPayload;
   createUsers: UserConnection;
@@ -1298,8 +1283,6 @@ export type Mutation = {
   secondCustomMutation?: Scalars['Int']['output'];
   resetPassword?: Scalars['Boolean']['output'];
   sendOtpCode?: Scalars['Boolean']['output'];
-  makePayment?: Scalars['String']['output'];
-  cancelSubscription?: Scalars['Boolean']['output'];
   sendEmail?: Scalars['String']['output'];
   signInWith?: SignInWithOutput;
   signUpWith?: SignUpWithOutput;
@@ -1472,14 +1455,6 @@ export type MutationSendOtpCodeArgs = {
   input: SendOtpCodeInput;
 };
 
-export type MutationMakePaymentArgs = {
-  input: MakePaymentInput;
-};
-
-export type MutationCancelSubscriptionArgs = {
-  input: CancelSubscriptionInput;
-};
-
 export type MutationSendEmailArgs = {
   input: SendEmailInput;
 };
@@ -2001,26 +1976,6 @@ export type SendOtpCodeInput = {
   email: Scalars['Email']['input'];
 };
 
-export type MakePaymentInput = {
-  customerEmail?: Scalars['Email']['input'];
-  paymentMode: PaymentMode;
-  successUrl: Scalars['String']['input'];
-  cancelUrl: Scalars['String']['input'];
-  products: MakePaymentProductInput[];
-  automaticTax?: Scalars['Boolean']['input'];
-  recurringInterval?: PaymentReccuringInterval;
-};
-
-export type MakePaymentProductInput = {
-  name: Scalars['String']['input'];
-  unitAmount: Scalars['Int']['input'];
-  quantity: Scalars['Int']['input'];
-};
-
-export type CancelSubscriptionInput = {
-  email: Scalars['Email']['input'];
-};
-
 export type SendEmailInput = {
   from: Scalars['String']['input'];
   to: Scalars['String']['input'][];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wabe",
-  "version": "0.5.8",
+  "version": "0.5.10",
   "description": "Your backend in minutes not days",
   "homepage": "https://wabe.dev",
   "author": {