Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions examples/base/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
node_modules/
dist/
yarn.lock
package-lock.json
10 changes: 0 additions & 10 deletions examples/base/index.tsx

This file was deleted.

16 changes: 8 additions & 8 deletions examples/base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
"preview": "vite preview --host"
},
"dependencies": {
"@forward-software/react-auth": "2.0.3",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"@forward-software/react-auth": "2.1.0",
"react": "^19.2.4",
"react-dom": "^19.2.4"
},
"devDependencies": {
"@types/react": "^18.2.21",
"@types/react-dom": "^18.2.7",
"@vitejs/plugin-react": "^4.0.0",
"typescript": "^5.1.6",
"vite": "^5.0.0"
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"@vitejs/plugin-react": "^6.0.0",
"typescript": "^6.0.0",
"vite": "^8.0.3"
}
}
13 changes: 8 additions & 5 deletions examples/base/src/Content.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { useCallback, useState } from 'react';
import React, { useCallback, useState } from 'react';
import type { DependencyList } from 'react';

import { useAuthClient } from './auth';

Expand Down Expand Up @@ -56,14 +57,16 @@ export const Content: React.FC = () => {

function useAsyncCallback<T extends (...args: never[]) => Promise<unknown>>(
callback: T,
deps: React.DependencyList
deps: DependencyList
): [T, boolean] {
const [isLoading, setLoading] = useState(false);
const cb = useCallback(async (...argsx: never[]) => {
setLoading(true);
const res = await callback(...argsx);
setLoading(false);
return res;
try {
return await callback(...argsx);
} finally {
setLoading(false);
}
}, deps) as T;

return [cb, isLoading];
Expand Down
6 changes: 3 additions & 3 deletions examples/expo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
},
"dependencies": {
"@expo/vector-icons": "^15.0.2",
"@forward-software/react-auth": "2.0.3",
"@forward-software/react-auth": "2.1.0",
"@react-navigation/bottom-tabs": "^7.4.0",
"@react-navigation/elements": "^2.6.3",
"@react-navigation/native": "^7.1.8",
"axios": "^1.12.2",
"axios": "^1.14.0",
"expo": "~54.0.12",
"expo-constants": "~18.0.9",
"expo-dev-client": "~6.0.13",
Expand Down Expand Up @@ -46,7 +46,7 @@
"babel-plugin-module-resolver": "^5.0.2",
"eslint": "^9.25.0",
"eslint-config-expo": "~10.0.0",
"typescript": "^5.1.6"
"typescript": "^6.0.0"
},
"private": true
}
4 changes: 2 additions & 2 deletions examples/expo/src/auth/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class MyAuthClient implements AuthClient<AuthTokens, AuthCredentials> {

async onLogin(credentials?: AuthCredentials): Promise<AuthTokens> {
if (!this.axiosAuthClient) {
return Promise.reject('axios client not initialized!');
return Promise.reject(new Error('axios client not initialized!'));
}

// Replace auth/login with your url without the domain
Expand All @@ -54,7 +54,7 @@ class MyAuthClient implements AuthClient<AuthTokens, AuthCredentials> {

async onRefresh(currentTokens: AuthTokens): Promise<AuthTokens> {
if (!this.axiosAuthClient) {
return Promise.reject('axios client not initialized!');
return Promise.reject(new Error('axios client not initialized!'));
}

if (
Expand Down
8 changes: 5 additions & 3 deletions examples/expo/src/hooks/useAsyncCallback.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ export function useAsyncCallback<

const cb = useCallback(async (...argsx: never[]) => {
setLoading(true);
const res = await callback(...argsx);
setLoading(false);
return res;
try {
return await callback(...argsx);
} finally {
setLoading(false);
}
}, deps) as T;

return [cb, isLoading];
Expand Down
3 changes: 3 additions & 0 deletions examples/refresh-token/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
node_modules/
dist/
yarn.lock
package-lock.json
10 changes: 0 additions & 10 deletions examples/refresh-token/index.tsx

This file was deleted.

18 changes: 9 additions & 9 deletions examples/refresh-token/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
"preview": "vite preview --host"
},
"dependencies": {
"@forward-software/react-auth": "2.0.3",
"axios": "1.13.5",
"@forward-software/react-auth": "2.1.0",
"axios": "^1.14.0",
"jwt-check-expiry": "^1.0.10",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react": "^19.2.4",
"react-dom": "^19.2.4"
},
"devDependencies": {
"@types/react": "^18.2.21",
"@types/react-dom": "^18.2.7",
"@vitejs/plugin-react": "^4.0.0",
"typescript": "^5.1.6",
"vite": "^5.0.0"
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"@vitejs/plugin-react": "^6.0.0",
"typescript": "^6.0.0",
"vite": "^8.0.3"
}
}
4 changes: 3 additions & 1 deletion examples/refresh-token/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import React from 'react';

import AppContent from './AppContent';
import { AuthProvider } from './auth';

export const App = () => {
export const App: React.FC = () => {
return (
<AuthProvider>
<AppContent />
Expand Down
12 changes: 7 additions & 5 deletions examples/refresh-token/src/AppContent.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { DependencyList, FC, useCallback, useState } from 'react';
import React, { FC, useCallback, useState } from 'react';
import type { DependencyList } from 'react';
import { useAuthClient } from './auth';

function useUserCredentials() {
Expand Down Expand Up @@ -35,9 +35,11 @@ function useAsyncCallback<T extends (...args: never[]) => Promise<unknown>>(

const cb = useCallback(async (...argsx: never[]) => {
setLoading(true);
const res = await callback(...argsx);
setLoading(false);
return res;
try {
return await callback(...argsx);
} finally {
setLoading(false);
}
}, deps) as T;

return [cb, isLoading];
Expand Down
4 changes: 2 additions & 2 deletions examples/refresh-token/src/auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class MyAuthClient implements AuthClient<Tokens, Credentials> {

async onLogin(credentials?: Credentials): Promise<Tokens> {
if (!this.axiosAuthClient) {
return Promise.reject("axios client not initialized!");
return Promise.reject(new Error("axios client not initialized!"));
}

// Replace auth/login with your url without the domain
Expand All @@ -51,7 +51,7 @@ class MyAuthClient implements AuthClient<Tokens, Credentials> {

async onRefresh(currentTokens: Tokens): Promise<Tokens> {
if (!this.axiosAuthClient) {
return Promise.reject("axios client not initialized!");
return Promise.reject(new Error("axios client not initialized!"));
}

if (!!currentTokens.accessToken && !isJwtTokenExpired(currentTokens.accessToken)) {
Expand Down
3 changes: 3 additions & 0 deletions examples/reqres/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
node_modules/
dist/
yarn.lock
package-lock.json
10 changes: 0 additions & 10 deletions examples/reqres/index.tsx

This file was deleted.

18 changes: 9 additions & 9 deletions examples/reqres/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
"preview": "vite preview --host"
},
"dependencies": {
"@forward-software/react-auth": "2.0.3",
"axios": "^1.12.2",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"@forward-software/react-auth": "2.1.0",
"axios": "^1.14.0",
"react": "^19.2.4",
"react-dom": "^19.2.4"
},
"devDependencies": {
"@types/react": "^18.2.21",
"@types/react-dom": "^18.2.7",
"@vitejs/plugin-react": "^4.0.0",
"typescript": "^5.1.6",
"vite": "^5.0.0"
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"@vitejs/plugin-react": "^6.0.0",
"typescript": "^6.0.0",
"vite": "^8.0.3"
}
}
2 changes: 1 addition & 1 deletion examples/reqres/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as React from 'react';
import React from 'react';

import { AuthProvider } from './auth';
import { Content } from './Content';
Expand Down
13 changes: 7 additions & 6 deletions examples/reqres/src/Content.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import * as React from 'react';
import { useCallback, useState } from 'react';
import { DependencyList } from 'react';
import React, { useCallback, useState } from 'react';
import type { DependencyList } from 'react';

import { useAuthClient } from './auth';

Expand Down Expand Up @@ -110,9 +109,11 @@ function useAsyncCallback<T extends (...args: never[]) => Promise<unknown>>(
const [isLoading, setLoading] = useState(false);
const cb = useCallback(async (...argsx: never[]) => {
setLoading(true);
const res = await callback(...argsx);
setLoading(false);
return res;
try {
return await callback(...argsx);
} finally {
setLoading(false);
}
}, deps) as T;

return [cb, isLoading];
Expand Down
Loading