Merge pull request #5 from cobuildlab/hotfix/queries-erros

Hotfix/queries erros

Author: jesusrodrz

README.md

@@ -4,6 +4,7 @@
   - Refresh Token
   - Auth0 Params
   - Clean Code
+  - Test Code
 
 
 Basic use: 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cobuildlab/react-native-auth0",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Todo",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",

src/constant.ts

@@ -1,15 +1,15 @@
 export const USER_QUERY = `
-  mutation UserSignUp($user: UserCreateInput!, $authProfileId: ID) {
-    userSignUpWithToken(user: $user, authProfileId: $authProfileId) {
+  query {
+    user{
       id
       email
     }
   }
 `;
 
 export const CREATE_USER_QUERY = (email: string, authProfileId: string): string => (`
-  mutation UserSignUp{
-    userSignUpWithToken(user: { email: ${email} }, authProfileId: ${authProfileId}) {
+  mutation{
+    userSignUpWithToken(user: { email: "${email}" }, authProfileId: "${authProfileId}") {
       id
       email
     }

src/provider.tsx

@@ -8,7 +8,7 @@ import { AuthProviderProps } from './types';
 
 
 export const AuthProvider: React.FC<AuthProviderProps> = ({ children, config }) => {
-  const { auth0, eichBaseEndpoint, eichBaseToken, eichBaseAuthProfileId, saveCredentials, getCredentials, removeCredentials  } = config;
+  const { auth0, eichBaseEndpoint, eichBaseAuthProfileId, saveCredentials, getCredentials, removeCredentials  } = config;
   const [credentials, setCredentials] = React.useState<Credentials>();
   const [userInfo, setUserInfo] = React.useState<UserInfo>();
   const [isAuthenticated, setAuthenticated] = React.useState(false);
@@ -77,16 +77,17 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ children, config })
     }
 
     const authorizeUserInfo = jwt_decode(authorizeResponse.idToken) as UserInfo;
+    const token =  authorizeResponse.idToken;
 
     const email = authorizeUserInfo?.email;
     try {
-      await fetchUser(eichBaseEndpoint, eichBaseToken);
+      await fetchUser(eichBaseEndpoint, token);
     } catch (error) {
       console.log('eichbase error', JSON.stringify(error));
       await createUser({ 
-        endpoint: eichBaseEndpoint, 
-        token: eichBaseToken, 
+        token, 
         email, 
+        endpoint: eichBaseEndpoint, 
         authProfileId: eichBaseAuthProfileId 
       });
     }
@@ -97,11 +98,12 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ children, config })
     setUserInfo(authorizeUserInfo);
     setAuthenticated(true);
     setLoading(false);
-  }, [eichBaseEndpoint, eichBaseToken, auth0, eichBaseAuthProfileId, onSaveToken]);
+  }, [eichBaseEndpoint, auth0, eichBaseAuthProfileId, onSaveToken]);
 
 
 
   const logout = React.useCallback(async () => {
+    setLoading(true);
     try {
       await auth0.webAuth.clearSession();
     } catch (error) {
@@ -126,8 +128,9 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ children, config })
         token: storedCredentials.accessToken,
       });
     } catch (error) {
-      console.error('Authenticate error', JSON.stringify(error));
+      console.warn('Authenticate error', JSON.stringify(error));
       removeToken();
+      return;
     }
 
     setCredentials(storedCredentials);

src/types.ts

@@ -17,7 +17,6 @@ export type UseAuthType = {
 export type AuthProviderConfig = {
   auth0: Auth0;
   eichBaseEndpoint: string;
-  eichBaseToken: string;
   eichBaseAuthProfileId: string;
   getCredentials: () => Promise< Credentials | null>;
   removeCredentials: () => Promise<void>;

src/utils.ts

@@ -2,7 +2,7 @@ import { User } from './types';
 import { USER_QUERY, CREATE_USER_QUERY } from './constant';
 
 
-export const fetchUser = async (endpoint: string, token: string): Promise<User> => {
+export const fetchUser = async (endpoint: string, token: string): Promise<User | null> => {
   const request = await fetch(endpoint, {
     method: "POST",
     headers: {
@@ -14,6 +14,10 @@ export const fetchUser = async (endpoint: string, token: string): Promise<User>
 
   const response = await request.json();
 
+  if(response?.errors){
+    throw new Error(JSON.stringify(response?.errors));
+  }
+
   return response as User;
 };
 
@@ -26,6 +30,7 @@ type createUserParams = {
 
 export const createUser = async (params: createUserParams): Promise<User> => {
   const { endpoint, token, email, authProfileId } = params;
+
   const request = await fetch(endpoint, {
     method: "POST",
     headers: {
@@ -39,5 +44,9 @@ export const createUser = async (params: createUserParams): Promise<User> => {
 
   const response = await request.json();
 
+  if(response?.errors){
+    throw new Error(JSON.stringify(response?.errors));
+  }
+
   return response as User;
 };