pocketbase-react 0.1.26 → 0.1.28

package/es/store/types/index.d.ts

@@ -4,8 +4,8 @@ export declare const ADD_RECORDS = "ADD_RECORDS";
 export declare const UPDATE_RECORD = "UPDATE_RECORD";
 export declare const DELETE_RECORD = "DELETE_RECORD";
 export declare const DELETE_RECORDS = "DELETE_RECORDS";
-export declare type RecordTypes = typeof SET_RECORDS | typeof ADD_RECORD | typeof ADD_RECORDS | typeof UPDATE_RECORD | typeof DELETE_RECORD | typeof DELETE_RECORDS;
+export type RecordTypes = typeof SET_RECORDS | typeof ADD_RECORD | typeof ADD_RECORDS | typeof UPDATE_RECORD | typeof DELETE_RECORD | typeof DELETE_RECORDS;
 export declare const SET_SUBSCRIPTIONS = "SET_SUBSCRIPTIONS";
 export declare const ADD_SUBSCRIPTION = "ADD_SUBSCRIPTION";
 export declare const DELETE_SUBSCRIPTION = "DELETE_SUBSCRIPTION";
-export declare type SubscriptionsTypes = typeof SET_SUBSCRIPTIONS | typeof ADD_SUBSCRIPTION | typeof DELETE_SUBSCRIPTION;
+export type SubscriptionsTypes = typeof SET_SUBSCRIPTIONS | typeof ADD_SUBSCRIPTION | typeof DELETE_SUBSCRIPTION;

package/lib/context/Pocketbase.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.PocketbaseContext = exports.Pocketbase = void 0;
 var React = _interopRequireWildcard(require("react"));
-var _pocketbase = _interopRequireDefault(require("@tobicrain/pocketbase"));
+var _pocketbase = _interopRequireDefault(require("pocketbase"));
 var _reactRedux = require("react-redux");
 var _react2 = require("redux-persist/integration/react");
 var _store = require("../store/store");

package/lib/context/auth.js

@@ -14,18 +14,18 @@ const AuthProvider = props => {
   const [authProviders, setAuthProviders] = React.useState();
   const actions = {
     registerWithEmail: async (email, password) => {
-      await (client == null ? void 0 : client.users.create({
+      await (client == null ? void 0 : client.collection('users').create({
         email: email,
         password: password,
         passwordConfirm: password
       }));
     },
     signInWithEmail: async (email, password) => {
-      await (client == null ? void 0 : client.users.authViaEmail(email, password));
+      await (client == null ? void 0 : client.collection('users').authWithPassword(email, password));
     },
     signInWithProvider: async provider => {
       const authProvider = authProviders == null ? void 0 : authProviders.find(p => p.name === provider);
-      const redirectURL = typeof window !== 'undefined' ? props.webRedirectUrl : props.mobileRedirectUrl;
+      const redirectURL = typeof document !== 'undefined' ? props.webRedirectUrl : props.mobileRedirectUrl;
       const url = (authProvider == null ? void 0 : authProvider.authUrl) + redirectURL;
       await _Storage.StorageService.set('provider', JSON.stringify(authProviders));
       await props.openURL(url);
@@ -39,7 +39,7 @@ const AuthProvider = props => {
         const providers = JSON.parse(providersString);
         const authProvider = providers == null ? void 0 : providers.find(p => p.state === state);
         if (authProvider && code) {
-          await (client == null ? void 0 : client.users.authViaOAuth2(authProvider.name, code, authProvider.codeVerifier, typeof window !== 'undefined' ? props.webRedirectUrl : props.mobileRedirectUrl));
+          await (client == null ? void 0 : client.collection('users').authWithOAuth2(authProvider.name, code, authProvider.codeVerifier, typeof document !== 'undefined' ? props.webRedirectUrl : props.mobileRedirectUrl));
         }
       }
     },
@@ -47,24 +47,24 @@ const AuthProvider = props => {
       client == null ? void 0 : client.authStore.clear();
     },
     sendPasswordResetEmail: async email => {
-      await (client == null ? void 0 : client.users.requestPasswordReset(email));
+      await (client == null ? void 0 : client.collection('users').requestPasswordReset(email));
     },
     sendEmailVerification: async email => {
-      await (client == null ? void 0 : client.users.requestVerification(email));
+      await (client == null ? void 0 : client.collection('users').requestVerification(email));
     },
     updateProfile: async (id, record) => {
-      await (client == null ? void 0 : client.records.update('profiles', id, record));
+      await (client == null ? void 0 : client.collection('profiles').update(id, record));
     },
     updateEmail: async email => {
-      await (client == null ? void 0 : client.users.requestEmailChange(email));
+      await (client == null ? void 0 : client.collection('users').requestEmailChange(email));
     },
     deleteUser: async id => {
-      await (client == null ? void 0 : client.users.delete(id));
+      await (client == null ? void 0 : client.collection('users').delete(id));
     }
   };
   React.useEffect(() => {
     (async () => {
-      const methods = await (client == null ? void 0 : client.users.listAuthMethods());
+      const methods = await (client == null ? void 0 : client.collection('users').listAuthMethods());
       setAuthProviders(methods == null ? void 0 : methods.authProviders);
     })();
   }, [props.webRedirectUrl, props.mobileRedirectUrl]);

package/lib/context/content.js

@@ -53,18 +53,18 @@ const ContentProvider = props => {
       }
     },
     fetch: async collectionName => {
-      await (client == null ? void 0 : client.records.getFullList(collectionName, 200).then(records => {
+      await (client == null ? void 0 : client.collection(collectionName).getFullList(200).then(records => {
         dispatch(_actions.recordsAction.setRecords(collectionName, records));
       }).catch(tempErrorHandler));
     },
     create: async (collectionName, record) => {
-      return await (client == null ? void 0 : client.records.create(collectionName, record).catch(tempErrorHandler));
+      return await (client == null ? void 0 : client.collection(collectionName).create(record).catch(tempErrorHandler));
     },
     update: async (collectionName, recordId, record) => {
-      return await (client == null ? void 0 : client.records.update(collectionName, recordId, record).catch(tempErrorHandler));
+      return await (client == null ? void 0 : client.collection(collectionName).update(recordId, record).catch(tempErrorHandler));
     },
     delete: async (collectionName, recordId) => {
-      return await (client == null ? void 0 : client.records.delete(collectionName, recordId).catch(tempErrorHandler));
+      return await (client == null ? void 0 : client.collection(collectionName).delete(recordId).catch(tempErrorHandler));
     }
   };
   (0, React.useEffect)(() => {

package/lib/service/Storage.js

@@ -6,17 +6,17 @@ exports.StorageService = void 0;
 var _asyncStorage = _interopRequireDefault(require("@react-native-async-storage/async-storage"));
 class StorageService {
   static async get(key) {
-    return typeof window !== 'undefined' ? localStorage.getItem(key) : await _asyncStorage.default.getItem(key);
+    return typeof document !== 'undefined' ? localStorage.getItem(key) : await _asyncStorage.default.getItem(key);
   }
   static async set(key, value) {
-    if (typeof window !== 'undefined') {
+    if (typeof document !== 'undefined') {
       return localStorage.setItem(key, value);
     } else {
       return await _asyncStorage.default.setItem(key, value);
     }
   }
   static async remove(key) {
-    if (typeof window !== 'undefined') {
+    if (typeof document !== 'undefined') {
       return localStorage.removeItem(key);
     } else {
       return await _asyncStorage.default.removeItem(key);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pocketbase-react",
-  "version": "0.1.26",
+  "version": "0.1.28",
   "description": "Unofficial React SDK (React, React Native, Expo) for interacting with the PocketBase JS SDK",
   "keywords": [
     "pocketbase",
@@ -45,7 +45,7 @@
     "prepublishOnly": "npm run build"
   },
   "peerDependencies": {
-    "@tobicrain/pocketbase": "^0.7.3"
+    "pocketbase": "0.8.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.12.1",
@@ -68,7 +68,7 @@
   "dependencies": {
     "@react-native-async-storage/async-storage": "^1.17.10",
     "@reduxjs/toolkit": "^1.8.5",
-    "@tobicrain/pocketbase": "^0.7.3",
+    "pocketbase": "0.8.1",
     "react-redux": "^8.0.4",
     "redux": "^4.2.0",
     "redux-persist": "^6.0.0"

package/src/context/Pocketbase.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { createContext, useEffect } from 'react';
-import PocketBase, { Admin, BaseAuthStore, LocalAuthStore, User } from '@tobicrain/pocketbase';
+import PocketBase from 'pocketbase';
 import { Provider } from 'react-redux';
 import { PersistGate } from 'redux-persist/integration/react';
 import { store, persistor } from '../store/store';

package/src/context/auth.tsx

@@ -1,3 +1,4 @@
+import { Collection } from 'pocketbase';
 import * as React from 'react';
 import { createContext } from 'react';
 import { useClientContext } from '../hooks/useClientContext';
@@ -51,19 +52,19 @@ export const AuthProvider = (props: AuthProviderProps) => {
 
   const actions: AuthActions = {
     registerWithEmail: async (email, password) => {
-      await client?.users.create({
+      await client?.collection('users').create({
         email: email,
         password: password,
         passwordConfirm: password,
       });
     },
     signInWithEmail: async (email: string, password: string) => {
-      await client?.users.authViaEmail(email, password);
+      await client?.collection('users').authWithPassword(email, password);
     },
     signInWithProvider: async (provider: string) => {
       const authProvider = authProviders?.find((p) => p.name === provider);
       const redirectURL =
-        typeof window !== 'undefined' ? props.webRedirectUrl : props.mobileRedirectUrl;
+        typeof document !== 'undefined' ? props.webRedirectUrl : props.mobileRedirectUrl;
       const url = authProvider?.authUrl + redirectURL;
       await StorageService.set('provider', JSON.stringify(authProviders));
       await props.openURL(url);
@@ -77,12 +78,14 @@ export const AuthProvider = (props: AuthProviderProps) => {
         const providers = JSON.parse(providersString) as AuthProviderInfo[];
         const authProvider = providers?.find((p) => p.state === state);
         if (authProvider && code) {
-          await client?.users.authViaOAuth2(
-            authProvider.name,
-            code,
-            authProvider.codeVerifier,
-            typeof window !== 'undefined' ? props.webRedirectUrl : props.mobileRedirectUrl
-          );
+          await client
+            ?.collection('users')
+            .authWithOAuth2(
+              authProvider.name,
+              code,
+              authProvider.codeVerifier,
+              typeof document !== 'undefined' ? props.webRedirectUrl : props.mobileRedirectUrl
+            );
         }
       }
     },
@@ -90,25 +93,25 @@ export const AuthProvider = (props: AuthProviderProps) => {
       client?.authStore.clear();
     },
     sendPasswordResetEmail: async (email: string) => {
-      await client?.users.requestPasswordReset(email);
+      await client?.collection('users').requestPasswordReset(email);
     },
     sendEmailVerification: async (email: string) => {
-      await client?.users.requestVerification(email);
+      await client?.collection('users').requestVerification(email);
     },
     updateProfile: async (id: string, record: {}) => {
-      await client?.records.update('profiles', id, record);
+      await client?.collection('profiles').update(id, record);
     },
     updateEmail: async (email: string) => {
-      await client?.users.requestEmailChange(email);
+      await client?.collection('users').requestEmailChange(email);
     },
     deleteUser: async (id: string) => {
-      await client?.users.delete(id);
+      await client?.collection('users').delete(id);
     },
   };
 
   React.useEffect(() => {
     (async () => {
-      const methods = await client?.users.listAuthMethods();
+      const methods = await client?.collection('users').listAuthMethods();
       setAuthProviders(methods?.authProviders);
     })();
   }, [props.webRedirectUrl, props.mobileRedirectUrl]);

package/src/context/client.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { createContext } from 'react';
-import PocketBase from '@tobicrain/pocketbase';
+import PocketBase from 'pocketbase';
 
 export const ClientContext = createContext<PocketBase | null>(null);
 

package/src/context/content.tsx

@@ -90,21 +90,31 @@ export const ContentProvider = (props: ContentProviderProps) => {
       }
     },
     fetch: async (collectionName: string) => {
-      await client?.records
-        .getFullList(collectionName, 200)
+      await client
+        ?.collection(collectionName)
+        .getFullList(200)
         .then((records) => {
           dispatch(recordsAction.setRecords(collectionName, records as Record[]));
         })
         .catch(tempErrorHandler);
     },
     create: async (collectionName: string, record: {}) => {
-      return await client?.records.create(collectionName, record).catch(tempErrorHandler);
+      return await client
+        ?.collection(collectionName)
+        .create(record)
+        .catch(tempErrorHandler);
     },
     update: async (collectionName: string, recordId: string, record: {}) => {
-      return await client?.records.update(collectionName, recordId, record).catch(tempErrorHandler);
+      return await client
+        ?.collection(collectionName)
+        .update(recordId, record)
+        .catch(tempErrorHandler);
     },
     delete: async (collectionName: string, recordId: string) => {
-      return await client?.records.delete(collectionName, recordId).catch(tempErrorHandler);
+      return await client
+        ?.collection(collectionName)
+        .delete(recordId)
+        .catch(tempErrorHandler);
     },
   };
 

package/src/hooks/useAuth.ts

@@ -1,4 +1,4 @@
-import { Admin, User } from '@tobicrain/pocketbase';
+import { Admin, Record } from 'pocketbase';
 import { useContext, useEffect, useState } from 'react';
 import { AuthActions, AuthContext } from '../context/auth';
 import { StorageService } from '../service/Storage';
@@ -7,14 +7,14 @@ import { useClientContext } from './useClientContext';
 export interface AuthContextInterface {
   actions: AuthActions;
   isSignedIn: boolean | null;
-  user: User | Admin | null;
+  user: Record | Admin | null;
 }
 
 export function useAuth(): AuthContextInterface {
   const client = useClientContext();
   const actions = useContext(AuthContext);
   const [isSignedIn, setIsSignedIn] = useState<boolean | null>(null);
-  const [user, setUser] = useState<User | Admin | null>(null);
+  const [user, setUser] = useState<Record | Admin | null>(null);
 
   function updateAuth() {
     setIsSignedIn(client?.authStore.token !== '');

package/src/service/Storage.ts

@@ -7,13 +7,13 @@ export class StorageService {
   };
 
   static async get(key: string): Promise<string | null> {
-    return typeof window !== 'undefined'
+    return typeof document !== 'undefined'
       ? localStorage.getItem(key)
       : await AsyncStorage.getItem(key);
   }
 
   static async set(key: string, value: string): Promise<void> {
-    if (typeof window !== 'undefined') {
+    if (typeof document !== 'undefined') {
       return localStorage.setItem(key, value);
     } else {
       return await AsyncStorage.setItem(key, value);
@@ -21,7 +21,7 @@ export class StorageService {
   }
 
   static async remove(key: string): Promise<void> {
-    if (typeof window !== 'undefined') {
+    if (typeof document !== 'undefined') {
       return localStorage.removeItem(key);
     } else {
       return await AsyncStorage.removeItem(key);