@mattrglobal/verifier-sdk-web 1.1.1-unstable.170 → 1.1.1-unstable.172

package/dist/lib/verifier-js-no-deps.cjs.js

@@ -263,7 +263,7 @@ var MessageEventDataType;
 const OpenId4vpConfigSameDeviceOptionsValidator = v__namespace.object({
     walletProviderId: v__namespace.optional(v__namespace.string()),
     mode: v__namespace.literal(exports.Mode.SameDevice),
-    redirectUri: v__namespace.string()
+    redirectUri: v__namespace.pipe(v__namespace.string(), v__namespace.nonEmpty("Must not be empty"), v__namespace.url())
 });
 
 const OpenId4vpConfigCrossDeviceOptionsValidator = v__namespace.object({
@@ -273,7 +273,7 @@ const OpenId4vpConfigCrossDeviceOptionsValidator = v__namespace.object({
 
 const OpenId4vpConfigAutoDetectOptionsValidator = v__namespace.object({
     walletProviderId: v__namespace.optional(v__namespace.string()),
-    redirectUri: v__namespace.string(),
+    redirectUri: v__namespace.pipe(v__namespace.string(), v__namespace.nonEmpty("Must not be empty"), v__namespace.url()),
     mode: v__namespace.optional(v__namespace.picklist([ exports.Mode.CrossDevice, exports.Mode.SameDevice ]))
 });
 
@@ -318,7 +318,7 @@ var AbortSessionErrorMessage;
 })(AbortSessionErrorMessage || (AbortSessionErrorMessage = {}));
 
 const InitializeOptionsValidator = v__namespace.object({
-    apiBaseUrl: v__namespace.pipe(v__namespace.string(), v__namespace.nonEmpty("Must not be empty")),
+    apiBaseUrl: v__namespace.pipe(v__namespace.string(), v__namespace.nonEmpty("Must not be empty"), v__namespace.url()),
     applicationId: v__namespace.pipe(v__namespace.string(), v__namespace.nonEmpty("Must not be empty"))
 });
 
@@ -343,10 +343,29 @@ const safeFetch = async (input, init) => {
         const response = await fetch(input, Object.assign(Object.assign({}, init), {
             headers: headers
         }));
+        const defaultHttpErrorMessage = `HTTP error, status = ${response.status}`;
+        if (response.status >= 400 && response.status < 500) {
+            try {
+                const errorBody = await response.json();
+                if (typeof (errorBody === null || errorBody === void 0 ? void 0 : errorBody.message) === "string") {
+                    return neverthrow.err({
+                        type: SafeFetchErrorType.HttpError,
+                        message: errorBody.message,
+                        status: response.status
+                    });
+                }
+            } catch (_a) {
+                return neverthrow.err({
+                    type: SafeFetchErrorType.HttpError,
+                    message: defaultHttpErrorMessage,
+                    status: response.status
+                });
+            }
+        }
         if (response.status > 299 || response.status < 200) {
             return neverthrow.err({
                 type: SafeFetchErrorType.HttpError,
-                message: `HTTP error, status = ${response.status}`,
+                message: defaultHttpErrorMessage,
                 status: response.status
             });
         }
@@ -370,7 +389,12 @@ var InitializeErrorMessage;
 
 const initialize = options => {
     assertType(InitializeOptionsValidator, "Invalid initialize options")(options);
-    initializeOptions = options;
+    const {apiBaseUrl: apiBaseUrl} = options;
+    const trimmedApiBaseUrl = apiBaseUrl.trim();
+    initializeOptions = {
+        apiBaseUrl: trimmedApiBaseUrl,
+        applicationId: options.applicationId
+    };
 };
 
 const getInitializeOptions = () => initializeOptions;
@@ -994,7 +1018,7 @@ const deriveOpenId4vpRedirectUri = openid4vpConfiguration => {
         detectedMode = isMobileDetect(navigator.userAgent) ? exports.Mode.SameDevice : exports.Mode.CrossDevice;
     }
     if (detectedMode === exports.Mode.SameDevice && !isType(OpenId4vpConfigCrossDeviceOptionsValidator)(openid4vpConfiguration) && openid4vpConfiguration.redirectUri) {
-        return openid4vpConfiguration.redirectUri;
+        return openid4vpConfiguration.redirectUri.trim();
     }
     return undefined;
 };