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

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

@@ -705,6 +705,31 @@ function nonEmpty(message2) {
     };
 }
 
+function url(message2) {
+    return {
+        kind: "validation",
+        type: "url",
+        reference: url,
+        async: false,
+        expects: null,
+        requirement: function requirement(input) {
+            try {
+                new URL(input);
+                return true;
+            } catch (_unused) {
+                return false;
+            }
+        },
+        message: message2,
+        "~run": function run(dataset, config2) {
+            if (dataset.typed && !this.requirement(dataset.value)) {
+                _addIssue(this, "URL", dataset, config2);
+            }
+            return dataset;
+        }
+    };
+}
+
 function getFallback(schema, dataset, config2) {
     return typeof schema.fallback === "function" ? schema.fallback(dataset, config2) : schema.fallback;
 }
@@ -1573,7 +1598,7 @@ var MessageEventDataType;
 const OpenId4vpConfigSameDeviceOptionsValidator = object({
     walletProviderId: optional(string()),
     mode: literal(exports.Mode.SameDevice),
-    redirectUri: string()
+    redirectUri: pipe(string(), nonEmpty("Must not be empty"), url())
 });
 
 const OpenId4vpConfigCrossDeviceOptionsValidator = object({
@@ -1583,7 +1608,7 @@ const OpenId4vpConfigCrossDeviceOptionsValidator = object({
 
 const OpenId4vpConfigAutoDetectOptionsValidator = object({
     walletProviderId: optional(string()),
-    redirectUri: string(),
+    redirectUri: pipe(string(), nonEmpty("Must not be empty"), url()),
     mode: optional(picklist([ exports.Mode.CrossDevice, exports.Mode.SameDevice ]))
 });
 
@@ -1628,7 +1653,7 @@ var AbortSessionErrorMessage;
 })(AbortSessionErrorMessage || (AbortSessionErrorMessage = {}));
 
 const InitializeOptionsValidator = object({
-    apiBaseUrl: pipe(string(), nonEmpty("Must not be empty")),
+    apiBaseUrl: pipe(string(), nonEmpty("Must not be empty"), url()),
     applicationId: pipe(string(), nonEmpty("Must not be empty"))
 });
 
@@ -1653,10 +1678,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 err({
+                        type: SafeFetchErrorType.HttpError,
+                        message: errorBody.message,
+                        status: response.status
+                    });
+                }
+            } catch (_a) {
+                return err({
+                    type: SafeFetchErrorType.HttpError,
+                    message: defaultHttpErrorMessage,
+                    status: response.status
+                });
+            }
+        }
         if (response.status > 299 || response.status < 200) {
             return err({
                 type: SafeFetchErrorType.HttpError,
-                message: `HTTP error, status = ${response.status}`,
+                message: defaultHttpErrorMessage,
                 status: response.status
             });
         }
@@ -1680,7 +1724,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;
@@ -2335,7 +2384,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;
 };