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

package/dist/typings/verifier/types/verifier-web-sdk.d.ts

@@ -63,7 +63,7 @@ export type OpenId4vpConfigurationSameDeviceOptions = {
 export declare const OpenId4vpConfigSameDeviceOptionsValidator: v.ObjectSchema<{
     readonly walletProviderId: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
     readonly mode: v.LiteralSchema<Mode.SameDevice, undefined>;
-    readonly redirectUri: v.StringSchema<undefined>;
+    readonly redirectUri: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.NonEmptyAction<string, "Must not be empty">, v.UrlAction<string, undefined>]>;
 }, undefined>;
 /**
  * Options for openid4vpConfiguration to request credentials with cross device
@@ -103,7 +103,7 @@ export type OpenId4vpConfigurationAutoDetectOptions = {
 };
 export declare const OpenId4vpConfigAutoDetectOptionsValidator: v.ObjectSchema<{
     readonly walletProviderId: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
-    readonly redirectUri: v.StringSchema<undefined>;
+    readonly redirectUri: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.NonEmptyAction<string, "Must not be empty">, v.UrlAction<string, undefined>]>;
     readonly mode: v.OptionalSchema<v.PicklistSchema<[Mode.CrossDevice, Mode.SameDevice], undefined>, undefined>;
 }, undefined>;
 /**
@@ -137,13 +137,13 @@ export declare const RequestCredentialsOptionsValidator: v.ObjectSchema<{
     readonly openid4vpConfiguration: v.OptionalSchema<v.UnionSchema<[v.ObjectSchema<{
         readonly walletProviderId: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
         readonly mode: v.LiteralSchema<Mode.SameDevice, undefined>;
-        readonly redirectUri: v.StringSchema<undefined>;
+        readonly redirectUri: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.NonEmptyAction<string, "Must not be empty">, v.UrlAction<string, undefined>]>;
     }, undefined>, v.ObjectSchema<{
         readonly walletProviderId: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
         readonly mode: v.LiteralSchema<Mode.CrossDevice, undefined>;
     }, undefined>, v.ObjectSchema<{
         readonly walletProviderId: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
-        readonly redirectUri: v.StringSchema<undefined>;
+        readonly redirectUri: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.NonEmptyAction<string, "Must not be empty">, v.UrlAction<string, undefined>]>;
         readonly mode: v.OptionalSchema<v.PicklistSchema<[Mode.CrossDevice, Mode.SameDevice], undefined>, undefined>;
     }, undefined>], undefined>, undefined>;
 }, undefined>;
@@ -226,7 +226,7 @@ export type InitializeOptions = {
     applicationId: string;
 };
 export declare const InitializeOptionsValidator: v.ObjectSchema<{
-    readonly apiBaseUrl: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.NonEmptyAction<string, "Must not be empty">]>;
+    readonly apiBaseUrl: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.NonEmptyAction<string, "Must not be empty">, v.UrlAction<string, undefined>]>;
     readonly applicationId: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.NonEmptyAction<string, "Must not be empty">]>;
 }, undefined>;
 /**

package/dist/verifier-js.development.js

@@ -658,6 +658,30 @@
             }
         };
     }
+    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;
     }
@@ -1473,7 +1497,7 @@
     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({
         walletProviderId: optional(string()),
@@ -1481,7 +1505,7 @@
     });
     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 ]))
     });
     const RequestCredentialsOptionsValidator = object({
@@ -1516,7 +1540,7 @@
         AbortSessionErrorMessage["FailedToAbortSession"] = "Failed to abort session";
     })(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"))
     });
     var SafeFetchCommonResponseErrorType;
@@ -1536,10 +1560,29 @@
             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
                 });
             }
@@ -1559,7 +1602,12 @@
     })(InitializeErrorMessage || (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;
     let sessionAbortController = undefined;
@@ -2162,7 +2210,7 @@
             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;
     };