@leancodepl/kratos 7.1.6 → 7.2.1

package/index.cjs.js

@@ -7,7 +7,6 @@ var axios = require('axios');
 var jsxRuntime = require('react/jsx-runtime');
 var _ = require('lodash');
 var rxjs = require('rxjs');
-var ajax = require('rxjs/ajax');
 var react = require('react');
 var reactHookForm = require('react-hook-form');
 var reactRouter = require('react-router');
@@ -120,7 +119,7 @@ var BaseSessionManager = /*#__PURE__*/ function() {
     function BaseSessionManager(authUrl, signInRoute) {
         var _this = this;
         _class_call_check(this, BaseSessionManager);
-        _define_property$3(this, "apiUrl", void 0);
+        _define_property$3(this, "authUrl", void 0);
         _define_property$3(this, "signInRoute", void 0);
         _define_property$3(this, "session$", new rxjs.ReplaySubject(1));
         _define_property$3(this, "isSignedIn$", this.session$.pipe(rxjs.map(function(session) {
@@ -138,13 +137,12 @@ var BaseSessionManager = /*#__PURE__*/ function() {
         _define_property$3(this, "checkIfSignedIn", function() {
             var fetchSubject = new rxjs.Subject();
             fetchSubject.pipe(rxjs.switchMap(function() {
-                return ajax.ajax({
-                    url: "".concat(_this.apiUrl, "/sessions/whoami"),
+                return rxjs.from(fetch("".concat(_this.authUrl, "/sessions/whoami"), {
                     method: "GET",
-                    responseType: "json",
-                    withCredentials: true
-                }).pipe(rxjs.map(function(param) {
-                    var response = param.response;
+                    credentials: "include"
+                })).pipe(rxjs.switchMap(function(response) {
+                    return rxjs.from(response.json());
+                }), rxjs.map(function(response) {
                     var returnTo = new URLSearchParams(window.location.search).get(returnToParameterName);
                     if (returnTo) {
                         window.location.href = returnTo;
@@ -180,14 +178,14 @@ var BaseSessionManager = /*#__PURE__*/ function() {
             var fetchSubject = new rxjs.Subject();
             var signOutSubject = new rxjs.Subject();
             fetchSubject.pipe(rxjs.exhaustMap(function() {
-                return ajax.ajax({
-                    url: "".concat(_this.apiUrl, "/sessions/logout"),
+                return rxjs.from(fetch("".concat(_this.authUrl, "/sessions/logout"), {
                     method: "GET",
-                    responseType: "json",
-                    withCredentials: true
-                });
-            }), rxjs.catchError(function() {
-                return rxjs.of(undefined);
+                    credentials: "include"
+                })).pipe(rxjs.switchMap(function() {
+                    return rxjs.of(undefined);
+                }), rxjs.catchError(function() {
+                    return rxjs.of(undefined);
+                }));
             })).subscribe({
                 next: function() {
                     _this.session$.next(undefined);
@@ -199,7 +197,7 @@ var BaseSessionManager = /*#__PURE__*/ function() {
                 return rxjs.firstValueFrom(signOutSubject);
             };
         }());
-        this.apiUrl = authUrl;
+        this.authUrl = authUrl;
         this.signInRoute = signInRoute;
         this.checkIfSignedIn();
     }

package/index.esm.js

@@ -2,8 +2,7 @@ import { FrontendApi, Configuration } from '@ory/kratos-client';
 import axios from 'axios';
 import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 import _, { set, omit } from 'lodash';
-import { ReplaySubject, map, shareReplay, Subject, switchMap, catchError, of, exhaustMap, firstValueFrom } from 'rxjs';
-import { ajax } from 'rxjs/ajax';
+import { ReplaySubject, map, shareReplay, Subject, switchMap, from, catchError, of, exhaustMap, firstValueFrom } from 'rxjs';
 import { useMemo, useEffect, useState, useCallback } from 'react';
 import { useFormContext, useForm, FormProvider } from 'react-hook-form';
 import { useLocation, useNavigate } from 'react-router';
@@ -110,7 +109,7 @@ var BaseSessionManager = /*#__PURE__*/ function() {
     function BaseSessionManager(authUrl, signInRoute) {
         var _this = this;
         _class_call_check(this, BaseSessionManager);
-        _define_property$3(this, "apiUrl", void 0);
+        _define_property$3(this, "authUrl", void 0);
         _define_property$3(this, "signInRoute", void 0);
         _define_property$3(this, "session$", new ReplaySubject(1));
         _define_property$3(this, "isSignedIn$", this.session$.pipe(map(function(session) {
@@ -128,13 +127,12 @@ var BaseSessionManager = /*#__PURE__*/ function() {
         _define_property$3(this, "checkIfSignedIn", function() {
             var fetchSubject = new Subject();
             fetchSubject.pipe(switchMap(function() {
-                return ajax({
-                    url: "".concat(_this.apiUrl, "/sessions/whoami"),
+                return from(fetch("".concat(_this.authUrl, "/sessions/whoami"), {
                     method: "GET",
-                    responseType: "json",
-                    withCredentials: true
-                }).pipe(map(function(param) {
-                    var response = param.response;
+                    credentials: "include"
+                })).pipe(switchMap(function(response) {
+                    return from(response.json());
+                }), map(function(response) {
                     var returnTo = new URLSearchParams(window.location.search).get(returnToParameterName);
                     if (returnTo) {
                         window.location.href = returnTo;
@@ -170,14 +168,14 @@ var BaseSessionManager = /*#__PURE__*/ function() {
             var fetchSubject = new Subject();
             var signOutSubject = new Subject();
             fetchSubject.pipe(exhaustMap(function() {
-                return ajax({
-                    url: "".concat(_this.apiUrl, "/sessions/logout"),
+                return from(fetch("".concat(_this.authUrl, "/sessions/logout"), {
                     method: "GET",
-                    responseType: "json",
-                    withCredentials: true
-                });
-            }), catchError(function() {
-                return of(undefined);
+                    credentials: "include"
+                })).pipe(switchMap(function() {
+                    return of(undefined);
+                }), catchError(function() {
+                    return of(undefined);
+                }));
             })).subscribe({
                 next: function() {
                     _this.session$.next(undefined);
@@ -189,7 +187,7 @@ var BaseSessionManager = /*#__PURE__*/ function() {
                 return firstValueFrom(signOutSubject);
             };
         }());
-        this.apiUrl = authUrl;
+        this.authUrl = authUrl;
         this.signInRoute = signInRoute;
         this.checkIfSignedIn();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leancodepl/kratos",
-  "version": "7.1.6",
+  "version": "7.2.1",
   "license": "Apache-2.0",
   "type": "commonjs",
   "main": "./index.cjs.js",

package/src/lib/sessionManager/baseSessionManager.d.ts

@@ -1,7 +1,7 @@
 import { Session } from "@ory/kratos-client";
 import { Subject } from "rxjs";
 export declare class BaseSessionManager {
-    apiUrl: string;
+    authUrl: string;
     signInRoute: string;
     session$: Subject<Session | undefined>;
     isSignedIn$: import("rxjs").Observable<boolean>;