@boneframework/native-components 1.0.13 → 1.0.15

package/components/SessionProvider.tsx

@@ -4,21 +4,18 @@ import AuthContext from "../contexts/auth";
 import useAuth from "../hooks/useAuth";
 
 function SessionProvider(props: object) {
-    const [user, setUser] = useState(null);
-    const auth = useAuth();
-    setUser(auth.user);
+    const {login, logout, updateUser, user, isLoading} = useAuth();
 
     return (
         <AuthContext.Provider
             value={{
                 signIn: async (authToken: string) => {
-                    auth.login(authToken);
-                    setUser(auth.user);
+                    login(authToken);
                 },
                 signOut: () => {
-                    auth.logout();
-                    setUser(null);
+                    logout();
                 },
+                update: data => updateUser(data),
                 user,
             }}>
             {props.children}
@@ -26,6 +23,4 @@ function SessionProvider(props: object) {
     )
 }
 
-
-
 export default SessionProvider;

package/contexts/auth.ts

@@ -0,0 +1,17 @@
+import { createContext } from "react";
+
+const AuthContext = createContext<{
+    login: () => void;
+    logout: () => void;
+    updateUser: () => void;
+    user?: object | null;
+    isLoading: boolean;
+}>({
+    login: () => null,
+    logout: () => null,
+    updateUser: () => null,
+    user: null,
+    isLoading: false,
+});
+
+export default AuthContext;

package/hooks/{useAuth.js → useAuth.ts}

@@ -1,4 +1,4 @@
-import {useContext} from "react";
+import {useContext, useState} from "react";
 
 import AuthContext from "../contexts/auth";
 import authStorage from "../utilities/authStorage";
@@ -8,23 +8,27 @@ import usersApi from "../api/users";
 export default useAuth = () => {
     const profileApi = useApi(usersApi.getProfile);
     const {user, setUser} = useContext(AuthContext);
+    const {isLoading, setIsLoading} = useState(false);
 
     const login = async authToken => {
-        // possibly don't wait here?
+        setIsLoading(true);
         await authStorage.storeAuthToken(authToken).then(async () => {
             const user = await profileApi.request(authToken);
             authStorage.storeUser(user.data);
             user.data.authToken = authToken;
             setUser(user.data);
+            setIsLoading(false);
         });
     }
 
     const updateUser = async user => {
+        setIsLoading(true);
         const authToken = user.authToken;
         await delete user.authToken;
         authStorage.storeUser(user);
         user.authToken = authToken;
         setUser({...user});
+        setIsLoading(false);
     }
 
     const logout = () => {
@@ -33,5 +37,5 @@ export default useAuth = () => {
         authStorage.removeUser();
     }
 
-    return {login, logout, updateUser, user};
+    return {login, logout, updateUser, user, isLoading};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boneframework/native-components",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "Expo Components for Bone Framework",
   "main": "src/Bone.ts",
   "scripts": {

package/contexts/auth.js

@@ -1,5 +0,0 @@
-import React from "react";
-
-const AuthContext = React.createContext();
-
-export default AuthContext;