pushwave-client 0.3.4 → 0.3.5

package/dist/register/registerPushWave.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerPushWave = registerPushWave;
-const fetch_1 = require("../utils/fetch");
 const expoToken_1 = require("../utils/expoToken");
 const react_native_1 = require("react-native");
 const pwLogger_1 = require("../utils/pwLogger");
 const apiKeyCheck_1 = require("../utils/apiKeyCheck");
 const index_1 = require("../attestation/index");
+const fetch_1 = require("../utils/fetch");
 async function registerPushWave({ apiKey }) {
     const OS = react_native_1.Platform.OS;
     if ((0, apiKeyCheck_1.isSecretKey)(apiKey)) {
@@ -34,7 +34,7 @@ async function registerPushWave({ apiKey }) {
         environment: __DEV__ ? "development" : "production"
     };
     try {
-        const res = await (0, fetch_1.fetchApiPost)(path, options);
+        const res = await (0, fetch_1.fetchApi)("PUT", path, { data: options });
         return {
             success: true,
             message: res.message,

package/dist/utils/fetch.d.ts

@@ -1,2 +1,8 @@
-export declare function fetchApiPost<TResponse>(path: string, data?: Record<string, any>): Promise<TResponse>;
-export declare function fetchApiGet<TResponse>(path: string, params?: Record<string, string | number | boolean | undefined>): Promise<TResponse>;
+type FetchMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
+type FetchParams = Record<string, string | number | boolean | undefined>;
+type FetchData = Record<string, any>;
+export declare function fetchApi<TResponse>(method: FetchMethod, path: string, { params, data }?: {
+    params?: FetchParams;
+    data?: FetchData;
+}): Promise<TResponse>;
+export {};

package/dist/utils/fetch.js

@@ -1,33 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchApiPost = fetchApiPost;
-exports.fetchApiGet = fetchApiGet;
+exports.fetchApi = fetchApi;
 const BASE_URL = "https://api.pushwave.dev/v1/public/";
-async function fetchApiPost(path, data = {}) {
-    const url = BASE_URL + path;
-    const res = await fetch(url, {
-        method: "POST",
-        headers: {
-            "Content-Type": "application/json",
-        },
-        body: JSON.stringify(data),
-    });
-    const text = await res.text();
-    let json = null;
-    try {
-        json = text ? JSON.parse(text) : null;
-    }
-    catch (err) {
-        // JSON empty/invalid
-    }
-    if (!res.ok) {
-        const apiError = (json?.error ?? json?.message ?? "");
-        const message = `(${res.status}) ${apiError}`.trim();
-        throw new Error(message);
-    }
-    return json;
-}
-async function fetchApiGet(path, params) {
+async function fetchApi(method, path, { params, data } = {}) {
     const search = params
         ? new URLSearchParams(Object.entries(params).reduce((acc, [key, value]) => {
             if (value === undefined)
@@ -36,8 +11,18 @@ async function fetchApiGet(path, params) {
             return acc;
         }, {})).toString()
         : "";
+    console.log("Go fetch !");
     const url = BASE_URL + path + (search ? `?${search}` : "");
-    const res = await fetch(url);
+    const headers = {};
+    const body = data !== undefined && method !== "GET" ? JSON.stringify(data) : undefined;
+    if (body) {
+        headers["Content-Type"] = "application/json";
+    }
+    const res = await fetch(url, {
+        method,
+        headers,
+        body,
+    });
     const text = await res.text();
     let json = null;
     try {

package/dist/utils/pushwaveSettings.js

@@ -6,7 +6,7 @@ const fetch_1 = require("./fetch");
 const pwLogger_1 = require("./pwLogger");
 const pushwaveSettingsPromise = (async () => {
     try {
-        return await (0, fetch_1.fetchApiGet)("pushwave-config", { platform: react_native_1.Platform.OS });
+        return await (0, fetch_1.fetchApi)("GET", "pushwave-config", { params: { platform: react_native_1.Platform.OS } });
     }
     catch (e) {
         // log si besoin

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushwave-client",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "PushWave Client, Expo Push Notifications SaaS SDK",
   "homepage": "https://github.com/luruk-hai/pushwave-client#readme",
   "bugs": {

package/src/register/registerPushWave.ts

@@ -1,10 +1,10 @@
-import { fetchApiPost } from "../utils/fetch";
 import { getExpoToken } from "../utils/expoToken";
 import { Platform } from "react-native";
 import { PWLogger } from "../utils/pwLogger";
 import { isSecretKey } from "../utils/apiKeyCheck";
 import { RegisterPushWaveClient, RegisterPushWaveDTO, RegisterPushWaveResponse } from "./registerPushWave.dto";
 import { getApplicationAttestation } from "../attestation/index";
+import { fetchApi } from "../utils/fetch";
 
 export async function registerPushWave(
     { apiKey }: RegisterPushWaveClient
@@ -46,7 +46,7 @@ export async function registerPushWave(
     }
 
     try {
-        const res: RegisterPushWaveResponse = await fetchApiPost(path, options)
+        const res: RegisterPushWaveResponse = await fetchApi("PUT", path, { data: options })
 
         return {
             success: true,

package/src/utils/fetch.ts

@@ -1,57 +1,39 @@
 const BASE_URL = "https://api.pushwave.dev/v1/public/";
 
-export async function fetchApiPost<TResponse>(
-  path: string,
-  data: Record<string, any> = {}
-): Promise<TResponse> {
-
-  const url = BASE_URL + path;
-
-  const res = await fetch(url, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify(data),
-  });
-
-  const text = await res.text();
-  let json: any = null;
-
-  try {
-    json = text ? JSON.parse(text) : null;
-  } catch (err) {
-    // JSON empty/invalid
-  }
+type FetchMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
+type FetchParams = Record<string, string | number | boolean | undefined>;
+type FetchData = Record<string, any>;
 
-  if (!res.ok) {
-    const apiError = (json?.error ?? json?.message ?? "") as string;
-
-    const message = `(${res.status}) ${apiError}`.trim();
-
-    throw new Error(message);
-  }
-
-  return json as TResponse;
-}
-
-export async function fetchApiGet<TResponse>(
+export async function fetchApi<TResponse>(
+  method: FetchMethod,
   path: string,
-  params?: Record<string, string | number | boolean | undefined>
+  { params, data }: { params?: FetchParams; data?: FetchData } = {}
 ): Promise<TResponse> {
   const search = params
     ? new URLSearchParams(
-      Object.entries(params).reduce<Record<string, string>>((acc, [key, value]) => {
-        if (value === undefined) return acc;
-        acc[key] = String(value);
-        return acc;
-      }, {})
-    ).toString()
+        Object.entries(params).reduce<Record<string, string>>((acc, [key, value]) => {
+          if (value === undefined) return acc;
+          acc[key] = String(value);
+          return acc;
+        }, {})
+      ).toString()
     : "";
 
+    console.log("Go fetch !");
+
   const url = BASE_URL + path + (search ? `?${search}` : "");
 
-  const res = await fetch(url);
+  const headers: Record<string, string> = {};
+  const body = data !== undefined && method !== "GET" ? JSON.stringify(data) : undefined;
+  if (body) {
+    headers["Content-Type"] = "application/json";
+  }
+
+  const res = await fetch(url, {
+    method,
+    headers,
+    body,
+  });
 
   const text = await res.text();
   let json: any = null;

package/src/utils/pushwaveSettings.ts

@@ -1,5 +1,5 @@
 import { Platform } from "react-native";
-import { fetchApiGet } from "./fetch";
+import { fetchApi } from "./fetch";
 import { PWLogger } from "./pwLogger";
 
 export type PushwaveSettings = {
@@ -9,7 +9,7 @@ export type PushwaveSettings = {
 
 const pushwaveSettingsPromise: Promise<PushwaveSettings> = (async () => {
     try {
-        return await fetchApiGet("pushwave-config", { platform: Platform.OS });
+        return await fetchApi("GET", "pushwave-config", { params: { platform: Platform.OS } });
     } catch (e) {
         // log si besoin
         PWLogger.warn(`Unable to load PushWave configuration: ${e}`)

package/dist/attestation/getAndroidSignature.js

@@ -1 +0,0 @@
-"use strict";

package/dist/attestation/getApplicationSignature.d.ts

@@ -1 +0,0 @@
-export default function getApplicationSignature(): void;

package/dist/attestation/getApplicationSignature.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = getApplicationSignature;
-function getApplicationSignature() {
-}
-function getAndroidSignature() {
-}
-function getIosDeviceCheck() {
-}

package/dist/attestation/getIosDeviceCheck.d.ts

@@ -1 +0,0 @@
-export default function (): any;

package/dist/attestation/getIosDeviceCheck.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/registerPushWave.d.ts

@@ -1,15 +0,0 @@
-export interface RegisterPushWaveClient {
-    apiKey: string;
-}
-export interface RegisterPushWaveResponse {
-    success: boolean;
-    message?: string;
-}
-export interface RegisterPushWaveDTO {
-    apiKey: string;
-    expoToken: string;
-    platform: string;
-    appAttestation?: any;
-    environment: "development" | "production";
-}
-export default function registerPushWave({ apiKey }: RegisterPushWaveClient): Promise<RegisterPushWaveResponse>;

package/dist/registerPushWave.js

@@ -1,53 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = registerPushWave;
-const fetch_1 = require("./utils/fetch");
-const expoToken_1 = require("./utils/expoToken");
-const getApplicationAttestation_1 = __importDefault(require("./attestation/getApplicationAttestation"));
-const react_native_1 = require("react-native");
-const pwLogger_1 = require("./utils/pwLogger");
-const apiKeyCheck_1 = require("./utils/apiKeyCheck");
-async function registerPushWave({ apiKey }) {
-    if ((0, apiKeyCheck_1.isSecretKey)(apiKey)) {
-        const warn = `\x1b[0m You are using your SECRET API key in a client environment. This key must NEVER be embedded in a mobile app.`;
-        pwLogger_1.PWLogger.warn(warn);
-    }
-    const expoToken = await (0, expoToken_1.getExpoToken)();
-    if (!expoToken) {
-        const message = "could not get ExpoToken";
-        pwLogger_1.PWLogger.error(message);
-        return {
-            success: false,
-            message: "[PushWaveClient] Error: " + message
-        };
-    }
-    const appAttestation = await (0, getApplicationAttestation_1.default)(apiKey);
-    if (appAttestation.status === "disabled")
-        pwLogger_1.PWLogger.warn(`(${react_native_1.Platform.OS}) could not get attestation: ${appAttestation.reason}`);
-    const path = "/v1/expo-tokens";
-    const options = {
-        apiKey: apiKey,
-        expoToken: expoToken,
-        platform: react_native_1.Platform.OS,
-        appAttestation: appAttestation,
-        environment: __DEV__ ? "development" : "production"
-    };
-    try {
-        const res = await (0, fetch_1.fetchApi)(path, options);
-        return {
-            success: true,
-            message: res.message,
-        };
-    }
-    catch (err) {
-        const e = err;
-        pwLogger_1.PWLogger.error(e.message);
-        return {
-            success: false,
-            message: e.message,
-        };
-    }
-}

package/dist/utils/validation.js

@@ -1 +0,0 @@
-"use strict";