@fonoster/common 0.12.15 → 0.13.0

package/dist/assistants/assistantSchema.d.ts

@@ -189,7 +189,7 @@ declare const assistantSchema: z.ZodObject<{
                 method: z.ZodDefault<z.ZodNativeEnum<typeof import("..").AllowedHttpMethod>>;
                 url: z.ZodString;
                 waitForResponse: z.ZodDefault<z.ZodBoolean>;
-                headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+                headers: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodString>, Record<string, string>, Record<string, string>>>;
             }, "strip", z.ZodTypeAny, {
                 url?: string;
                 method?: import("..").AllowedHttpMethod;

package/dist/assistants/languageModelConfigSchema.d.ts

@@ -87,7 +87,7 @@ declare const languageModelConfigSchema: z.ZodObject<{
             method: z.ZodDefault<z.ZodNativeEnum<typeof import("..").AllowedHttpMethod>>;
             url: z.ZodString;
             waitForResponse: z.ZodDefault<z.ZodBoolean>;
-            headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+            headers: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodString>, Record<string, string>, Record<string, string>>>;
         }, "strip", z.ZodTypeAny, {
             url?: string;
             method?: import("..").AllowedHttpMethod;

package/dist/assistants/tools/toolSchema.d.ts

@@ -67,7 +67,7 @@ declare const toolSchema: z.ZodObject<{
         method: z.ZodDefault<z.ZodNativeEnum<typeof AllowedHttpMethod>>;
         url: z.ZodString;
         waitForResponse: z.ZodDefault<z.ZodBoolean>;
-        headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+        headers: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodString>, Record<string, string>, Record<string, string>>>;
     }, "strip", z.ZodTypeAny, {
         url?: string;
         method?: AllowedHttpMethod;

package/dist/assistants/tools/toolSchema.js

@@ -73,7 +73,13 @@ const toolSchema = zod_1.z.object({
             .default(sendHttpRequest_1.AllowedHttpMethod.GET),
         url: zod_1.z.string().url({ message: Messages.VALID_URL }),
         waitForResponse: zod_1.z.boolean().default(true),
-        headers: zod_1.z.record(zod_1.z.string(), zod_1.z.string()).optional()
+        headers: zod_1.z
+            .record(zod_1.z.string(), zod_1.z.string())
+            .refine((headers) => !Object.keys(headers || {}).some((key) => key.toLowerCase() === "accept" ||
+            key.toLowerCase() === "content-type"), {
+            message: "Headers cannot include 'accept' or 'content-type' as they are set internally"
+        })
+            .optional()
     })
 });
 exports.toolSchema = toolSchema;

package/dist/protos/identity.proto

@@ -226,6 +226,7 @@ message VerifyCodeRequest {
 
 message SendResetPasswordCodeRequest {
   string username = 1;
+  string reset_password_url = 2;
 }
 
 message ResetPasswordRequest {

package/dist/utils/sendHttpRequest.d.ts

@@ -2,12 +2,12 @@ declare enum AllowedHttpMethod {
     GET = "get",
     POST = "post"
 }
-declare function sendHttpRequest(params: {
+declare function sendHttpRequest(request: {
     method: AllowedHttpMethod;
     url: string;
     waitForResponse: boolean;
     headers?: Record<string, string>;
-    body?: Record<string, unknown>;
+    params?: Record<string, unknown>;
 }): Promise<{
     result: string;
 }>;

package/dist/utils/sendHttpRequest.js

@@ -29,6 +29,7 @@ exports.sendHttpRequest = sendHttpRequest;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+const url_1 = require("url");
 const logger_1 = require("@fonoster/logger");
 const zod_1 = require("zod");
 const responseSchema = zod_1.z.object({
@@ -40,25 +41,35 @@ var AllowedHttpMethod;
     AllowedHttpMethod["GET"] = "get";
     AllowedHttpMethod["POST"] = "post";
 })(AllowedHttpMethod || (exports.AllowedHttpMethod = AllowedHttpMethod = {}));
-function sendHttpRequest(params) {
+function sendHttpRequest(request) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { url, method, body, headers, waitForResponse } = params;
+        const { url, method, params, headers, waitForResponse } = request;
         const effectiveMethod = method.toLowerCase();
+        let effectiveUrl = url;
+        if (effectiveMethod === AllowedHttpMethod.GET && params) {
+            const queryParams = new url_1.URLSearchParams();
+            Object.entries(params).forEach(([key, value]) => {
+                queryParams.append(key, String(value));
+            });
+            effectiveUrl = `${url}${url.includes("?") ? "&" : "?"}${queryParams.toString()}`;
+        }
         const options = {
-            method,
-            headers: Object.assign({ "Content-Type": "application/json" }, headers),
-            body: effectiveMethod === "post" ? JSON.stringify(body) : undefined
+            method: effectiveMethod,
+            headers: Object.assign(Object.assign({}, headers), { accept: "application/json", "content-type": "application/json" }),
+            body: effectiveMethod === AllowedHttpMethod.POST
+                ? JSON.stringify(params)
+                : undefined
         };
-        logger.silly(`sending request to ${url}`, {
-            body,
+        logger.silly(`sending request to ${effectiveUrl}`, {
+            params,
             method: effectiveMethod
         });
-        if (waitForResponse && effectiveMethod === "post") {
-            setTimeout(() => fetch(url, options), 0);
-            return { result: "request sent" };
+        if (!waitForResponse && effectiveMethod === AllowedHttpMethod.POST) {
+            setTimeout(() => fetch(effectiveUrl, options), 0);
+            return { result: "success" };
         }
         else {
-            const response = yield fetch(url, options);
+            const response = yield fetch(effectiveUrl, options);
             const data = yield response.json();
             try {
                 return responseSchema.parse(data);

package/dist/validators/identity.d.ts

@@ -182,10 +182,13 @@ declare const verifyCodeRequestSchema: z.ZodObject<{
 }>;
 declare const sendResetPasswordCodeRequestSchema: z.ZodObject<{
     username: z.ZodString;
+    resetPasswordUrl: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     username?: string;
+    resetPasswordUrl?: string;
 }, {
     username?: string;
+    resetPasswordUrl?: string;
 }>;
 declare const resetPasswordRequestSchema: z.ZodObject<{
     username: z.ZodString;

package/dist/validators/identity.js

@@ -133,7 +133,8 @@ exports.verifyCodeRequestSchema = verifyCodeRequestSchema;
 const sendResetPasswordCodeRequestSchema = zod_1.z.object({
     username: zod_1.z
         .string()
-        .email({ message: "Invalid username. Must be an email address" })
+        .email({ message: "Invalid username. Must be an email address" }),
+    resetPasswordUrl: zod_1.z.string()
 });
 exports.sendResetPasswordCodeRequestSchema = sendResetPasswordCodeRequestSchema;
 const resetPasswordRequestSchema = zod_1.z.object({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonoster/common",
-  "version": "0.12.15",
+  "version": "0.13.0",
   "description": "Common library for Fonoster projects",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/fonoster#readme",
@@ -18,7 +18,7 @@
     "clean": "rimraf ./dist node_modules tsconfig.tsbuildinfo"
   },
   "dependencies": {
-    "@fonoster/logger": "^0.12.6",
+    "@fonoster/logger": "^0.13.0",
     "@grpc/grpc-js": "~1.10.6",
     "@grpc/proto-loader": "^0.7.12",
     "@influxdata/influxdb-client": "^1.35.0",
@@ -49,5 +49,5 @@
   "devDependencies": {
     "@types/nodemailer": "^6.4.14"
   },
-  "gitHead": "30cdb9b4a04b427eef2d35701ec1c4b62f6fad4d"
+  "gitHead": "1bbd25f403d05c2340676f8e29b9e00cd4db4bdb"
 }