Start integrating the onboarding flow with backend 6
This commit is contained in:
@@ -40,7 +40,7 @@ export interface AuthState {
|
||||
canAccess: (resource: string, action: string) => boolean;
|
||||
}
|
||||
|
||||
import { authService } from '../services/api/auth.service';
|
||||
import { authService } from '../api';
|
||||
|
||||
export const useAuthStore = create<AuthState>()(
|
||||
persist(
|
||||
@@ -60,11 +60,11 @@ export const useAuthStore = create<AuthState>()(
|
||||
|
||||
const response = await authService.login({ email, password });
|
||||
|
||||
if (response.success && response.data) {
|
||||
if (response && response.access_token) {
|
||||
set({
|
||||
user: response.data.user || null,
|
||||
token: response.data.access_token,
|
||||
refreshToken: response.data.refresh_token || null,
|
||||
user: response.user || null,
|
||||
token: response.access_token,
|
||||
refreshToken: response.refresh_token || null,
|
||||
isAuthenticated: true,
|
||||
isLoading: false,
|
||||
error: null,
|
||||
@@ -91,11 +91,11 @@ export const useAuthStore = create<AuthState>()(
|
||||
|
||||
const response = await authService.register(userData);
|
||||
|
||||
if (response.success && response.data) {
|
||||
if (response && response.access_token) {
|
||||
set({
|
||||
user: response.data.user || null,
|
||||
token: response.data.access_token,
|
||||
refreshToken: response.data.refresh_token || null,
|
||||
user: response.user || null,
|
||||
token: response.access_token,
|
||||
refreshToken: response.refresh_token || null,
|
||||
isAuthenticated: true,
|
||||
isLoading: false,
|
||||
error: null,
|
||||
@@ -138,10 +138,10 @@ export const useAuthStore = create<AuthState>()(
|
||||
|
||||
const response = await authService.refreshToken(refreshToken);
|
||||
|
||||
if (response.success && response.data) {
|
||||
if (response && response.access_token) {
|
||||
set({
|
||||
token: response.data.access_token,
|
||||
refreshToken: response.data.refresh_token || refreshToken,
|
||||
token: response.access_token,
|
||||
refreshToken: response.refresh_token || refreshToken,
|
||||
isLoading: false,
|
||||
error: null,
|
||||
});
|
||||
@@ -224,7 +224,7 @@ export const useAuthStore = create<AuthState>()(
|
||||
onRehydrateStorage: () => (state) => {
|
||||
// Initialize API client with stored token when store rehydrates
|
||||
if (state?.token) {
|
||||
import('../services/api/client').then(({ apiClient }) => {
|
||||
import('../api').then(({ apiClient }) => {
|
||||
apiClient.setAuthToken(state.token!);
|
||||
|
||||
if (state.user?.tenant_id) {
|
||||
|
||||
Reference in New Issue
Block a user