@supabase/auth-js 2.78.0 → 2.78.1-canary.0

package/dist/module/GoTrueClient.js

@@ -21,6 +21,7 @@ const DEFAULT_OPTIONS = {
     flowType: 'implicit',
     debug: false,
     hasCustomAuthorizationHeader: false,
+    throwOnError: false,
 };
 async function lockNoOp(name, acquireTimeout, fn) {
     return await fn();
@@ -108,6 +109,7 @@ class GoTrueClient {
         this.detectSessionInUrl = settings.detectSessionInUrl;
         this.flowType = settings.flowType;
         this.hasCustomAuthorizationHeader = settings.hasCustomAuthorizationHeader;
+        this.throwOnError = settings.throwOnError;
         if (settings.lock) {
             this.lock = settings.lock;
         }
@@ -171,6 +173,23 @@ class GoTrueClient {
         }
         this.initialize();
     }
+    /**
+     * Returns whether error throwing mode is enabled for this client.
+     */
+    isThrowOnErrorEnabled() {
+        return this.throwOnError;
+    }
+    /**
+     * Centralizes return handling with optional error throwing. When `throwOnError` is enabled
+     * and the provided result contains a non-nullish error, the error is thrown instead of
+     * being returned. This ensures consistent behavior across all public API methods.
+     */
+    _returnResult(result) {
+        if (this.throwOnError && result && result.error) {
+            throw result.error;
+        }
+        return result;
+    }
     _debug(...args) {
         if (this.logDebugMessages) {
             this.logger(`GoTrueClient@${this.instanceID} (${version}) ${new Date().toISOString()}`, ...args);
@@ -202,13 +221,16 @@ class GoTrueClient {
     async _initialize() {
         var _a;
         try {
-            const params = parseParametersFromURL(window.location.href);
+            let params = {};
             let callbackUrlType = 'none';
-            if (this._isImplicitGrantCallback(params)) {
-                callbackUrlType = 'implicit';
-            }
-            else if (await this._isPKCECallback(params)) {
-                callbackUrlType = 'pkce';
+            if (isBrowser()) {
+                params = parseParametersFromURL(window.location.href);
+                if (this._isImplicitGrantCallback(params)) {
+                    callbackUrlType = 'implicit';
+                }
+                else if (await this._isPKCECallback(params)) {
+                    callbackUrlType = 'pkce';
+                }
             }
             /**
              * Attempt to get the session from the URL only if these conditions are fulfilled
@@ -252,11 +274,11 @@ class GoTrueClient {
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { error };
+                return this._returnResult({ error });
             }
-            return {
+            return this._returnResult({
                 error: new AuthUnknownError('Unexpected error during initialization', error),
-            };
+            });
         }
         finally {
             await this._handleVisibilityChange();
@@ -281,7 +303,7 @@ class GoTrueClient {
             });
             const { data, error } = res;
             if (error || !data) {
-                return { data: { user: null, session: null }, error: error };
+                return this._returnResult({ data: { user: null, session: null }, error: error });
             }
             const session = data.session;
             const user = data.user;
@@ -289,11 +311,11 @@ class GoTrueClient {
                 await this._saveSession(data.session);
                 await this._notifyAllSubscribers('SIGNED_IN', session);
             }
-            return { data: { user, session }, error: null };
+            return this._returnResult({ data: { user, session }, error: null });
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: { user: null, session: null }, error };
+                return this._returnResult({ data: { user: null, session: null }, error });
             }
             throw error;
         }
@@ -353,7 +375,7 @@ class GoTrueClient {
             }
             const { data, error } = res;
             if (error || !data) {
-                return { data: { user: null, session: null }, error: error };
+                return this._returnResult({ data: { user: null, session: null }, error: error });
             }
             const session = data.session;
             const user = data.user;
@@ -361,11 +383,11 @@ class GoTrueClient {
                 await this._saveSession(data.session);
                 await this._notifyAllSubscribers('SIGNED_IN', session);
             }
-            return { data: { user, session }, error: null };
+            return this._returnResult({ data: { user, session }, error: null });
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: { user: null, session: null }, error };
+                return this._returnResult({ data: { user: null, session: null }, error });
             }
             throw error;
         }
@@ -410,23 +432,24 @@ class GoTrueClient {
             }
             const { data, error } = res;
             if (error) {
-                return { data: { user: null, session: null }, error };
+                return this._returnResult({ data: { user: null, session: null }, error });
             }
             else if (!data || !data.session || !data.user) {
-                return { data: { user: null, session: null }, error: new AuthInvalidTokenResponseError() };
+                const invalidTokenError = new AuthInvalidTokenResponseError();
+                return this._returnResult({ data: { user: null, session: null }, error: invalidTokenError });
             }
             if (data.session) {
                 await this._saveSession(data.session);
                 await this._notifyAllSubscribers('SIGNED_IN', data.session);
             }
-            return {
+            return this._returnResult({
                 data: Object.assign({ user: data.user, session: data.session }, (data.weak_password ? { weakPassword: data.weak_password } : null)),
                 error,
-            };
+            });
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: { user: null, session: null }, error };
+                return this._returnResult({ data: { user: null, session: null }, error });
             }
             throw error;
         }
@@ -558,20 +581,18 @@ class GoTrueClient {
                 throw error;
             }
             if (!data || !data.session || !data.user) {
-                return {
-                    data: { user: null, session: null },
-                    error: new AuthInvalidTokenResponseError(),
-                };
+                const invalidTokenError = new AuthInvalidTokenResponseError();
+                return this._returnResult({ data: { user: null, session: null }, error: invalidTokenError });
             }
             if (data.session) {
                 await this._saveSession(data.session);
                 await this._notifyAllSubscribers('SIGNED_IN', data.session);
             }
-            return { data: Object.assign({}, data), error };
+            return this._returnResult({ data: Object.assign({}, data), error });
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: { user: null, session: null }, error };
+                return this._returnResult({ data: { user: null, session: null }, error });
             }
             throw error;
         }
@@ -698,20 +719,18 @@ class GoTrueClient {
                 throw error;
             }
             if (!data || !data.session || !data.user) {
-                return {
-                    data: { user: null, session: null },
-                    error: new AuthInvalidTokenResponseError(),
-                };
+                const invalidTokenError = new AuthInvalidTokenResponseError();
+                return this._returnResult({ data: { user: null, session: null }, error: invalidTokenError });
             }
             if (data.session) {
                 await this._saveSession(data.session);
                 await this._notifyAllSubscribers('SIGNED_IN', data.session);
             }
-            return { data: Object.assign({}, data), error };
+            return this._returnResult({ data: Object.assign({}, data), error });
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: { user: null, session: null }, error };
+                return this._returnResult({ data: { user: null, session: null }, error });
             }
             throw error;
         }
@@ -733,20 +752,24 @@ class GoTrueClient {
                 throw error;
             }
             if (!data || !data.session || !data.user) {
-                return {
+                const invalidTokenError = new AuthInvalidTokenResponseError();
+                return this._returnResult({
                     data: { user: null, session: null, redirectType: null },
-                    error: new AuthInvalidTokenResponseError(),
-                };
+                    error: invalidTokenError,
+                });
             }
             if (data.session) {
                 await this._saveSession(data.session);
                 await this._notifyAllSubscribers('SIGNED_IN', data.session);
             }
-            return { data: Object.assign(Object.assign({}, data), { redirectType: redirectType !== null && redirectType !== void 0 ? redirectType : null }), error };
+            return this._returnResult({ data: Object.assign(Object.assign({}, data), { redirectType: redirectType !== null && redirectType !== void 0 ? redirectType : null }), error });
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: { user: null, session: null, redirectType: null }, error };
+                return this._returnResult({
+                    data: { user: null, session: null, redirectType: null },
+                    error,
+                });
             }
             throw error;
         }
@@ -771,23 +794,21 @@ class GoTrueClient {
             });
             const { data, error } = res;
             if (error) {
-                return { data: { user: null, session: null }, error };
+                return this._returnResult({ data: { user: null, session: null }, error });
             }
             else if (!data || !data.session || !data.user) {
-                return {
-                    data: { user: null, session: null },
-                    error: new AuthInvalidTokenResponseError(),
-                };
+                const invalidTokenError = new AuthInvalidTokenResponseError();
+                return this._returnResult({ data: { user: null, session: null }, error: invalidTokenError });
             }
             if (data.session) {
                 await this._saveSession(data.session);
                 await this._notifyAllSubscribers('SIGNED_IN', data.session);
             }
-            return { data, error };
+            return this._returnResult({ data, error });
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: { user: null, session: null }, error };
+                return this._returnResult({ data: { user: null, session: null }, error });
             }
             throw error;
         }
@@ -832,7 +853,7 @@ class GoTrueClient {
                     },
                     redirectTo: options === null || options === void 0 ? void 0 : options.emailRedirectTo,
                 });
-                return { data: { user: null, session: null }, error };
+                return this._returnResult({ data: { user: null, session: null }, error });
             }
             if ('phone' in credentials) {
                 const { phone, options } = credentials;
@@ -846,13 +867,16 @@ class GoTrueClient {
                         channel: (_e = options === null || options === void 0 ? void 0 : options.channel) !== null && _e !== void 0 ? _e : 'sms',
                     },
                 });
-                return { data: { user: null, session: null, messageId: data === null || data === void 0 ? void 0 : data.message_id }, error };
+                return this._returnResult({
+                    data: { user: null, session: null, messageId: data === null || data === void 0 ? void 0 : data.message_id },
+                    error,
+                });
             }
             throw new AuthInvalidCredentialsError('You must provide either an email or phone number.');
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: { user: null, session: null }, error };
+                return this._returnResult({ data: { user: null, session: null }, error });
             }
             throw error;
         }
@@ -879,7 +903,8 @@ class GoTrueClient {
                 throw error;
             }
             if (!data) {
-                throw new Error('An error occurred on token verification.');
+                const tokenVerificationError = new Error('An error occurred on token verification.');
+                throw tokenVerificationError;
             }
             const session = data.session;
             const user = data.user;
@@ -887,11 +912,11 @@ class GoTrueClient {
                 await this._saveSession(session);
                 await this._notifyAllSubscribers(params.type == 'recovery' ? 'PASSWORD_RECOVERY' : 'SIGNED_IN', session);
             }
-            return { data: { user, session }, error: null };
+            return this._returnResult({ data: { user, session }, error: null });
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: { user: null, session: null }, error };
+                return this._returnResult({ data: { user: null, session: null }, error });
             }
             throw error;
         }
@@ -919,17 +944,18 @@ class GoTrueClient {
                 ;
                 [codeChallenge, codeChallengeMethod] = await getCodeChallengeAndMethod(this.storage, this.storageKey);
             }
-            return await _request(this.fetch, 'POST', `${this.url}/sso`, {
+            const result = await _request(this.fetch, 'POST', `${this.url}/sso`, {
                 body: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, ('providerId' in params ? { provider_id: params.providerId } : null)), ('domain' in params ? { domain: params.domain } : null)), { redirect_to: (_b = (_a = params.options) === null || _a === void 0 ? void 0 : _a.redirectTo) !== null && _b !== void 0 ? _b : undefined }), (((_c = params === null || params === void 0 ? void 0 : params.options) === null || _c === void 0 ? void 0 : _c.captchaToken)
                     ? { gotrue_meta_security: { captcha_token: params.options.captchaToken } }
                     : null)), { skip_http_redirect: true, code_challenge: codeChallenge, code_challenge_method: codeChallengeMethod }),
                 headers: this.headers,
                 xform: _ssoResponse,
             });
+            return this._returnResult(result);
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: null, error };
+                return this._returnResult({ data: null, error });
             }
             throw error;
         }
@@ -956,12 +982,12 @@ class GoTrueClient {
                     headers: this.headers,
                     jwt: session.access_token,
                 });
-                return { data: { user: null, session: null }, error };
+                return this._returnResult({ data: { user: null, session: null }, error });
             });
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: { user: null, session: null }, error };
+                return this._returnResult({ data: { user: null, session: null }, error });
             }
             throw error;
         }
@@ -983,7 +1009,7 @@ class GoTrueClient {
                     },
                     redirectTo: options === null || options === void 0 ? void 0 : options.emailRedirectTo,
                 });
-                return { data: { user: null, session: null }, error };
+                return this._returnResult({ data: { user: null, session: null }, error });
             }
             else if ('phone' in credentials) {
                 const { phone, type, options } = credentials;
@@ -995,13 +1021,16 @@ class GoTrueClient {
                         gotrue_meta_security: { captcha_token: options === null || options === void 0 ? void 0 : options.captchaToken },
                     },
                 });
-                return { data: { user: null, session: null, messageId: data === null || data === void 0 ? void 0 : data.message_id }, error };
+                return this._returnResult({
+                    data: { user: null, session: null, messageId: data === null || data === void 0 ? void 0 : data.message_id },
+                    error,
+                });
             }
             throw new AuthInvalidCredentialsError('You must provide either an email or phone number and a type');
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: { user: null, session: null }, error };
+                return this._returnResult({ data: { user: null, session: null }, error });
             }
             throw error;
         }
@@ -1160,9 +1189,9 @@ class GoTrueClient {
             }
             const { data: session, error } = await this._callRefreshToken(currentSession.refresh_token);
             if (error) {
-                return { data: { session: null }, error };
+                return this._returnResult({ data: { session: null }, error });
             }
-            return { data: { session }, error: null };
+            return this._returnResult({ data: { session }, error: null });
         }
         finally {
             this._debug('#__loadSession()', 'end');
@@ -1219,7 +1248,7 @@ class GoTrueClient {
                     await this._removeSession();
                     await removeItemAsync(this.storage, `${this.storageKey}-code-verifier`);
                 }
-                return { data: { user: null }, error };
+                return this._returnResult({ data: { user: null }, error });
             }
             throw error;
         }
@@ -1257,17 +1286,18 @@ class GoTrueClient {
                     jwt: session.access_token,
                     xform: _userResponse,
                 });
-                if (userError)
+                if (userError) {
                     throw userError;
+                }
                 session.user = data.user;
                 await this._saveSession(session);
                 await this._notifyAllSubscribers('USER_UPDATED', session);
-                return { data: { user: session.user }, error: null };
+                return this._returnResult({ data: { user: session.user }, error: null });
             });
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: { user: null }, error };
+                return this._returnResult({ data: { user: null }, error });
             }
             throw error;
         }
@@ -1300,7 +1330,7 @@ class GoTrueClient {
             if (hasExpired) {
                 const { data: refreshedSession, error } = await this._callRefreshToken(currentSession.refresh_token);
                 if (error) {
-                    return { data: { user: null, session: null }, error: error };
+                    return this._returnResult({ data: { user: null, session: null }, error: error });
                 }
                 if (!refreshedSession) {
                     return { data: { user: null, session: null }, error: null };
@@ -1323,11 +1353,11 @@ class GoTrueClient {
                 await this._saveSession(session);
                 await this._notifyAllSubscribers('SIGNED_IN', session);
             }
-            return { data: { user: session.user, session }, error: null };
+            return this._returnResult({ data: { user: session.user, session }, error: null });
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: { session: null, user: null }, error };
+                return this._returnResult({ data: { session: null, user: null }, error });
             }
             throw error;
         }
@@ -1360,17 +1390,17 @@ class GoTrueClient {
                 }
                 const { data: session, error } = await this._callRefreshToken(currentSession.refresh_token);
                 if (error) {
-                    return { data: { user: null, session: null }, error: error };
+                    return this._returnResult({ data: { user: null, session: null }, error: error });
                 }
                 if (!session) {
-                    return { data: { user: null, session: null }, error: null };
+                    return this._returnResult({ data: { user: null, session: null }, error: null });
                 }
-                return { data: { user: session.user, session }, error: null };
+                return this._returnResult({ data: { user: session.user, session }, error: null });
             });
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: { user: null, session: null }, error };
+                return this._returnResult({ data: { user: null, session: null }, error });
             }
             throw error;
         }
@@ -1456,11 +1486,11 @@ class GoTrueClient {
             // Remove tokens from URL
             window.location.hash = '';
             this._debug('#_getSessionFromURL()', 'clearing window.location.hash');
-            return { data: { session, redirectType: params.type }, error: null };
+            return this._returnResult({ data: { session, redirectType: params.type }, error: null });
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: { session: null, redirectType: null }, error };
+                return this._returnResult({ data: { session: null, redirectType: null }, error });
             }
             throw error;
         }
@@ -1497,7 +1527,7 @@ class GoTrueClient {
             var _a;
             const { data, error: sessionError } = result;
             if (sessionError) {
-                return { error: sessionError };
+                return this._returnResult({ error: sessionError });
             }
             const accessToken = (_a = data.session) === null || _a === void 0 ? void 0 : _a.access_token;
             if (accessToken) {
@@ -1507,7 +1537,7 @@ class GoTrueClient {
                     // ignore 401s since an invalid or expired JWT should sign out the current session
                     if (!(isAuthApiError(error) &&
                         (error.status === 404 || error.status === 401 || error.status === 403))) {
-                        return { error };
+                        return this._returnResult({ error });
                     }
                 }
             }
@@ -1515,7 +1545,7 @@ class GoTrueClient {
                 await this._removeSession();
                 await removeItemAsync(this.storage, `${this.storageKey}-code-verifier`);
             }
-            return { error: null };
+            return this._returnResult({ error: null });
         });
     }
     onAuthStateChange(callback) {
@@ -1584,7 +1614,7 @@ class GoTrueClient {
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: null, error };
+                return this._returnResult({ data: null, error });
             }
             throw error;
         }
@@ -1598,11 +1628,11 @@ class GoTrueClient {
             const { data, error } = await this.getUser();
             if (error)
                 throw error;
-            return { data: { identities: (_a = data.user.identities) !== null && _a !== void 0 ? _a : [] }, error: null };
+            return this._returnResult({ data: { identities: (_a = data.user.identities) !== null && _a !== void 0 ? _a : [] }, error: null });
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: null, error };
+                return this._returnResult({ data: null, error });
             }
             throw error;
         }
@@ -1637,11 +1667,14 @@ class GoTrueClient {
             if (isBrowser() && !((_a = credentials.options) === null || _a === void 0 ? void 0 : _a.skipBrowserRedirect)) {
                 window.location.assign(data === null || data === void 0 ? void 0 : data.url);
             }
-            return { data: { provider: credentials.provider, url: data === null || data === void 0 ? void 0 : data.url }, error: null };
+            return this._returnResult({
+                data: { provider: credentials.provider, url: data === null || data === void 0 ? void 0 : data.url },
+                error: null,
+            });
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: { provider: credentials.provider, url: null }, error };
+                return this._returnResult({ data: { provider: credentials.provider, url: null }, error });
             }
             throw error;
         }
@@ -1669,23 +1702,23 @@ class GoTrueClient {
                 });
                 const { data, error } = res;
                 if (error) {
-                    return { data: { user: null, session: null }, error };
+                    return this._returnResult({ data: { user: null, session: null }, error });
                 }
                 else if (!data || !data.session || !data.user) {
-                    return {
+                    return this._returnResult({
                         data: { user: null, session: null },
                         error: new AuthInvalidTokenResponseError(),
-                    };
+                    });
                 }
                 if (data.session) {
                     await this._saveSession(data.session);
                     await this._notifyAllSubscribers('USER_UPDATED', data.session);
                 }
-                return { data, error };
+                return this._returnResult({ data, error });
             }
             catch (error) {
                 if (isAuthError(error)) {
-                    return { data: { user: null, session: null }, error };
+                    return this._returnResult({ data: { user: null, session: null }, error });
                 }
                 throw error;
             }
@@ -1710,7 +1743,7 @@ class GoTrueClient {
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: null, error };
+                return this._returnResult({ data: null, error });
             }
             throw error;
         }
@@ -1746,7 +1779,7 @@ class GoTrueClient {
         catch (error) {
             this._debug(debugName, 'error', error);
             if (isAuthError(error)) {
-                return { data: { session: null, user: null }, error };
+                return this._returnResult({ data: { session: null, user: null }, error });
             }
             throw error;
         }
@@ -2231,7 +2264,7 @@ class GoTrueClient {
                 var _a;
                 const { data: sessionData, error: sessionError } = result;
                 if (sessionError) {
-                    return { data: null, error: sessionError };
+                    return this._returnResult({ data: null, error: sessionError });
                 }
                 return await _request(this.fetch, 'DELETE', `${this.url}/factors/${params.factorId}`, {
                     headers: this.headers,
@@ -2241,7 +2274,7 @@ class GoTrueClient {
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: null, error };
+                return this._returnResult({ data: null, error });
             }
             throw error;
         }
@@ -2252,7 +2285,7 @@ class GoTrueClient {
                 var _a, _b;
                 const { data: sessionData, error: sessionError } = result;
                 if (sessionError) {
-                    return { data: null, error: sessionError };
+                    return this._returnResult({ data: null, error: sessionError });
                 }
                 const body = Object.assign({ friendly_name: params.friendlyName, factor_type: params.factorType }, (params.factorType === 'phone'
                     ? { phone: params.phone }
@@ -2265,17 +2298,17 @@ class GoTrueClient {
                     jwt: (_a = sessionData === null || sessionData === void 0 ? void 0 : sessionData.session) === null || _a === void 0 ? void 0 : _a.access_token,
                 }));
                 if (error) {
-                    return { data: null, error };
+                    return this._returnResult({ data: null, error });
                 }
                 if (params.factorType === 'totp' && data.type === 'totp' && ((_b = data === null || data === void 0 ? void 0 : data.totp) === null || _b === void 0 ? void 0 : _b.qr_code)) {
                     data.totp.qr_code = `data:image/svg+xml;utf-8,${data.totp.qr_code}`;
                 }
-                return { data, error: null };
+                return this._returnResult({ data, error: null });
             });
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: null, error };
+                return this._returnResult({ data: null, error });
             }
             throw error;
         }
@@ -2287,7 +2320,7 @@ class GoTrueClient {
                     var _a;
                     const { data: sessionData, error: sessionError } = result;
                     if (sessionError) {
-                        return { data: null, error: sessionError };
+                        return this._returnResult({ data: null, error: sessionError });
                     }
                     const body = Object.assign({ challenge_id: params.challengeId }, ('webauthn' in params
                         ? {
@@ -2302,16 +2335,16 @@ class GoTrueClient {
                         jwt: (_a = sessionData === null || sessionData === void 0 ? void 0 : sessionData.session) === null || _a === void 0 ? void 0 : _a.access_token,
                     });
                     if (error) {
-                        return { data: null, error };
+                        return this._returnResult({ data: null, error });
                     }
                     await this._saveSession(Object.assign({ expires_at: Math.round(Date.now() / 1000) + data.expires_in }, data));
                     await this._notifyAllSubscribers('MFA_CHALLENGE_VERIFIED', data);
-                    return { data, error };
+                    return this._returnResult({ data, error });
                 });
             }
             catch (error) {
                 if (isAuthError(error)) {
-                    return { data: null, error };
+                    return this._returnResult({ data: null, error });
                 }
                 throw error;
             }
@@ -2324,7 +2357,7 @@ class GoTrueClient {
                     var _a;
                     const { data: sessionData, error: sessionError } = result;
                     if (sessionError) {
-                        return { data: null, error: sessionError };
+                        return this._returnResult({ data: null, error: sessionError });
                     }
                     const response = (await _request(this.fetch, 'POST', `${this.url}/factors/${params.factorId}/challenge`, {
                         body: params,
@@ -2354,7 +2387,7 @@ class GoTrueClient {
             }
             catch (error) {
                 if (isAuthError(error)) {
-                    return { data: null, error };
+                    return this._returnResult({ data: null, error });
                 }
                 throw error;
             }
@@ -2370,7 +2403,7 @@ class GoTrueClient {
             factorId: params.factorId,
         });
         if (challengeError) {
-            return { data: null, error: challengeError };
+            return this._returnResult({ data: null, error: challengeError });
         }
         return await this._verify({
             factorId: params.factorId,
@@ -2414,7 +2447,7 @@ class GoTrueClient {
         var _a, _b;
         const { data: { session }, error: sessionError, } = await this.getSession();
         if (sessionError) {
-            return { data: null, error: sessionError };
+            return this._returnResult({ data: null, error: sessionError });
         }
         if (!session) {
             return {
@@ -2448,10 +2481,10 @@ class GoTrueClient {
             return await this._useSession(async (result) => {
                 const { data: { session }, error: sessionError, } = result;
                 if (sessionError) {
-                    return { data: null, error: sessionError };
+                    return this._returnResult({ data: null, error: sessionError });
                 }
                 if (!session) {
-                    return { data: null, error: new AuthSessionMissingError() };
+                    return this._returnResult({ data: null, error: new AuthSessionMissingError() });
                 }
                 return await _request(this.fetch, 'GET', `${this.url}/oauth/authorizations/${authorizationId}`, {
                     headers: this.headers,
@@ -2462,7 +2495,7 @@ class GoTrueClient {
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: null, error };
+                return this._returnResult({ data: null, error });
             }
             throw error;
         }
@@ -2476,10 +2509,10 @@ class GoTrueClient {
             return await this._useSession(async (result) => {
                 const { data: { session }, error: sessionError, } = result;
                 if (sessionError) {
-                    return { data: null, error: sessionError };
+                    return this._returnResult({ data: null, error: sessionError });
                 }
                 if (!session) {
-                    return { data: null, error: new AuthSessionMissingError() };
+                    return this._returnResult({ data: null, error: new AuthSessionMissingError() });
                 }
                 const response = await _request(this.fetch, 'POST', `${this.url}/oauth/authorizations/${authorizationId}/consent`, {
                     headers: this.headers,
@@ -2498,7 +2531,7 @@ class GoTrueClient {
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: null, error };
+                return this._returnResult({ data: null, error });
             }
             throw error;
         }
@@ -2512,10 +2545,10 @@ class GoTrueClient {
             return await this._useSession(async (result) => {
                 const { data: { session }, error: sessionError, } = result;
                 if (sessionError) {
-                    return { data: null, error: sessionError };
+                    return this._returnResult({ data: null, error: sessionError });
                 }
                 if (!session) {
-                    return { data: null, error: new AuthSessionMissingError() };
+                    return this._returnResult({ data: null, error: new AuthSessionMissingError() });
                 }
                 const response = await _request(this.fetch, 'POST', `${this.url}/oauth/authorizations/${authorizationId}/consent`, {
                     headers: this.headers,
@@ -2534,7 +2567,7 @@ class GoTrueClient {
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: null, error };
+                return this._returnResult({ data: null, error });
             }
             throw error;
         }
@@ -2593,7 +2626,7 @@ class GoTrueClient {
             if (!token) {
                 const { data, error } = await this.getSession();
                 if (error || !data.session) {
-                    return { data: null, error };
+                    return this._returnResult({ data: null, error });
                 }
                 token = data.session.access_token;
             }
@@ -2646,7 +2679,7 @@ class GoTrueClient {
         }
         catch (error) {
             if (isAuthError(error)) {
-                return { data: null, error };
+                return this._returnResult({ data: null, error });
             }
             throw error;
         }