pushwave-client 0.2.2 → 0.2.4

package/dist/attestation/getApplicationAttestation.d.ts

@@ -1,16 +1,23 @@
 export interface AndroidAttestationPayload {
+    status: "ok";
+    platform: "android";
     nonce: string;
     timestamp: number;
     integrityToken: string;
 }
 export interface IosAttestationPayload {
+    status: "ok";
+    platform: "ios";
     nonce: string;
     timestamp: number;
     deviceCheckToken: string;
 }
 export interface DisabledAttestation {
-    attestationDisabled: true;
+    status: "disabled";
     reason: string;
 }
-export type ApplicationAttestation = AndroidAttestationPayload | IosAttestationPayload | DisabledAttestation | true;
+export interface SkippedAttestation {
+    status: "skipped";
+}
+export type ApplicationAttestation = AndroidAttestationPayload | IosAttestationPayload | DisabledAttestation | SkippedAttestation;
 export default function getApplicationAttestation(apiKey: string): Promise<ApplicationAttestation>;

package/dist/attestation/getApplicationAttestation.js

@@ -6,7 +6,7 @@ const react_native_1 = require("react-native");
 const native_1 = require("./native");
 async function getApplicationAttestation(apiKey) {
     if (!requiresAttestation(apiKey))
-        return true;
+        return { status: "skipped" };
     const { nonce, timestamp } = createNonce();
     try {
         if (react_native_1.Platform.OS === "android")
@@ -16,9 +16,9 @@ async function getApplicationAttestation(apiKey) {
     }
     catch (err) {
         const reason = err?.message ?? "attestation-error";
-        return { attestationDisabled: true, reason };
+        return { status: "disabled", reason };
     }
-    return { attestationDisabled: true, reason: "platform-unsupported" };
+    return { status: "disabled", reason: "platform-unsupported" };
 }
 function requiresAttestation(apiKey) {
     return apiKey.startsWith("pw_pub_");
@@ -43,14 +43,14 @@ function base64UrlEncode(input) {
 async function getAndroidSignature(nonce, timestamp) {
     const integrityToken = await (0, native_1.getAndroidIntegrityToken)(nonce);
     if (!integrityToken) {
-        return { attestationDisabled: true, reason: "play-integrity-unavailable" };
+        return { status: "disabled", reason: "play-integrity-unavailable" };
     }
-    return { nonce, timestamp, integrityToken };
+    return { status: "ok", platform: "android", nonce, timestamp, integrityToken };
 }
 async function getIosDeviceCheck(nonce, timestamp) {
     const deviceCheckToken = await (0, native_1.getDeviceCheckToken)(nonce);
     if (!deviceCheckToken) {
-        return { attestationDisabled: true, reason: "devicecheck-unavailable" };
+        return { status: "disabled", reason: "devicecheck-unavailable" };
     }
-    return { nonce, timestamp, deviceCheckToken };
+    return { status: "ok", platform: "ios", nonce, timestamp, deviceCheckToken };
 }

package/dist/registerPushWave.js

@@ -25,14 +25,8 @@ async function registerPushWave({ apiKey }) {
         };
     }
     const appAttestation = await (0, getApplicationAttestation_1.default)(apiKey);
-    if (!appAttestation) {
-        const message = `could not get ${react_native_1.Platform.OS} attestation.`;
-        pwLogger_1.PWLogger.error(message);
-        return {
-            success: false,
-            message: `[PushWaveClient] Error: ` + message
-        };
-    }
+    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,

package/package.json

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

package/react-native.config.js

@@ -6,7 +6,7 @@ module.exports = {
       },
       android: {
         sourceDir: "android",
-        packageImportPath: "import com.pushwaveclient.PushwaveAttestationPackage",
+        packageImportPath: "import com.pushwaveclient.PushwaveAttestationPackage;",
         packageInstance: "new PushwaveAttestationPackage()",
       },
     },

package/src/attestation/getApplicationAttestation.ts

@@ -3,30 +3,38 @@ import { Platform } from "react-native";
 import { getAndroidIntegrityToken, getDeviceCheckToken } from "./native";
 
 export interface AndroidAttestationPayload {
+    status: "ok";
+    platform: "android";
     nonce: string;
     timestamp: number;
     integrityToken: string;
 }
 
 export interface IosAttestationPayload {
+    status: "ok";
+    platform: "ios";
     nonce: string;
     timestamp: number;
     deviceCheckToken: string;
 }
 
 export interface DisabledAttestation {
-    attestationDisabled: true;
+    status: "disabled";
     reason: string;
 }
 
+export interface SkippedAttestation {
+    status: "skipped";
+}
+
 export type ApplicationAttestation =
     | AndroidAttestationPayload
     | IosAttestationPayload
     | DisabledAttestation
-    | true;
+    | SkippedAttestation;
 
 export default async function getApplicationAttestation(apiKey: string): Promise<ApplicationAttestation> {
-    if (!requiresAttestation(apiKey)) return true;
+    if (!requiresAttestation(apiKey)) return { status: "skipped" };
 
     const { nonce, timestamp } = createNonce();
 
@@ -35,10 +43,10 @@ export default async function getApplicationAttestation(apiKey: string): Promise
         if (Platform.OS === "ios") return await getIosDeviceCheck(nonce, timestamp);
     } catch (err) {
         const reason = (err as Error)?.message ?? "attestation-error";
-        return { attestationDisabled: true, reason };
+        return { status: "disabled", reason };
     }
 
-    return { attestationDisabled: true, reason: "platform-unsupported" };
+    return { status: "disabled", reason: "platform-unsupported" };
 }
 
 function requiresAttestation(apiKey: string) {
@@ -72,10 +80,10 @@ async function getAndroidSignature(
     const integrityToken = await getAndroidIntegrityToken(nonce);
 
     if (!integrityToken) {
-        return { attestationDisabled: true, reason: "play-integrity-unavailable" };
+        return { status: "disabled", reason: "play-integrity-unavailable" };
     }
 
-    return { nonce, timestamp, integrityToken };
+    return { status: "ok", platform: "android", nonce, timestamp, integrityToken };
 }
 
 async function getIosDeviceCheck(
@@ -85,8 +93,8 @@ async function getIosDeviceCheck(
     const deviceCheckToken = await getDeviceCheckToken(nonce);
 
     if (!deviceCheckToken) {
-        return { attestationDisabled: true, reason: "devicecheck-unavailable" };
+        return { status: "disabled", reason: "devicecheck-unavailable" };
     }
 
-    return { nonce, timestamp, deviceCheckToken };
+    return { status: "ok", platform: "ios", nonce, timestamp, deviceCheckToken };
 }

package/src/registerPushWave.ts

@@ -19,6 +19,7 @@ export interface RegisterPushWaveOptions {
     expoToken: string;
     platform: string;
     appAttestation?: any;
+    environment: "development" | "production"
 }
 
 export default async function registerPushWave(
@@ -46,17 +47,8 @@ export default async function registerPushWave(
 
     const appAttestation = await getApplicationAttestation(apiKey);
 
-    if (!appAttestation) {
-
-        const message = `could not get ${Platform.OS} attestation.`;
-
-        PWLogger.error(message);
-
-        return {
-            success: false,
-            message: `[PushWaveClient] Error: ` + message
-        }
-    }
+    if (appAttestation.status === "disabled")
+        PWLogger.warn(`(${Platform.OS}) could not get attestation: ${appAttestation.reason}`);
 
     const path = "/v1/expo-tokens"
 
@@ -64,7 +56,8 @@ export default async function registerPushWave(
         apiKey: apiKey,
         expoToken: expoToken,
         platform: Platform.OS,
-        appAttestation: appAttestation
+        appAttestation: appAttestation,
+        environment: __DEV__ ? "development" : "production"
     }
 
     try {