Skip to content

fix(client): apply access token before analytics module init #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yoavf merged 1 commit into from
May 12, 2026
Merged

fix(client): apply access token before analytics module init #171

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 11 additions & 9 deletions src/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,17 @@ export function createClient(config: CreateClientConfig): Base44Client {
}
);

// Apply the access token before any module that may issue authenticated
// requests during construction (notably analytics, which fires an init
// event whose flush calls auth.me()). Without this, the first User/me
// request is built before setToken runs and goes out unauthenticated.
if (typeof window !== "undefined") {
const accessToken = token || getAccessToken();
if (accessToken) {
userAuthModule.setToken(accessToken);
}
}

const userModules = {
entities: createEntitiesModule({
axios: axiosClient,
Expand Down Expand Up @@ -230,15 +241,6 @@ export function createClient(config: CreateClientConfig): Base44Client {
},
};

// Always try to get token from localStorage or URL parameters
if (typeof window !== "undefined") {
// Get token from URL or localStorage
const accessToken = token || getAccessToken();
if (accessToken) {
userModules.auth.setToken(accessToken);
}
}

// If authentication is required, verify token and redirect to login if needed
if (requiresAuth && typeof window !== "undefined") {
// We perform this check asynchronously to not block client creation
Expand Down
Loading