Skip to content

Commit 6b7e03b

Browse files
committed
chore: improve error handling and configuration management in Asgardeo components
1 parent e4ecf2e commit 6b7e03b

File tree

6 files changed

+24
-25
lines changed

6 files changed

+24
-25
lines changed

packages/javascript/src/api/createOrganization.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ const createOrganization = async ({
195195

196196
return (await response.json()) as Organization;
197197
} catch (error) {
198-
console.log('[JS][createOrganization] Error creating organization:', error);
199198
if (error instanceof AsgardeoAPIError) {
200199
throw error;
201200
}

packages/nextjs/src/AsgardeoNextClient.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class AsgardeoNextClient<T extends AsgardeoNextConfig = AsgardeoNextConfig> exte
109109
let resolvedOrganizationHandle: string | undefined = organizationHandle;
110110

111111
if (!resolvedOrganizationHandle) {
112-
resolvedOrganizationHandle = deriveOrganizationHandleFromBaseUrl(config?.baseUrl);
112+
resolvedOrganizationHandle = deriveOrganizationHandleFromBaseUrl(baseUrl);
113113
}
114114

115115
const origin: string = await getClientOrigin();

packages/nextjs/src/server/AsgardeoProvider.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,17 +110,17 @@ const AsgardeoServerProvider: FC<PropsWithChildren<AsgardeoServerProviderProps>>
110110

111111
return (
112112
<AsgardeoClientProvider
113-
organizationHandle={config.organizationHandle}
114-
applicationId={config.applicationId}
115-
baseUrl={config.baseUrl}
113+
organizationHandle={config?.organizationHandle}
114+
applicationId={config?.applicationId}
115+
baseUrl={config?.baseUrl}
116116
signIn={signInAction}
117117
signOut={signOutAction}
118118
signUp={signUpAction}
119119
handleOAuthCallback={handleOAuthCallbackAction}
120-
signInUrl={config.signInUrl}
121-
signUpUrl={config.signUpUrl}
122-
preferences={config.preferences}
123-
clientId={config.clientId}
120+
signInUrl={config?.signInUrl}
121+
signUpUrl={config?.signUpUrl}
122+
preferences={config?.preferences}
123+
clientId={config?.clientId}
124124
user={user}
125125
currentOrganization={currentOrganization}
126126
userProfile={userProfile}

packages/react/src/AsgardeoReactClient.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class AsgardeoReactClient<T extends AsgardeoReactConfig = AsgardeoReactConfig> e
6262
override initialize(config: AsgardeoReactConfig): Promise<boolean> {
6363
let resolvedOrganizationHandle: string | undefined = config?.organizationHandle;
6464

65-
if (!config?.organizationHandle) {
65+
if (!resolvedOrganizationHandle) {
6666
resolvedOrganizationHandle = deriveOrganizationHandleFromBaseUrl(config?.baseUrl);
6767
}
6868

packages/react/src/contexts/Asgardeo/AsgardeoProvider.tsx

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,25 +68,27 @@ const AsgardeoProvider: FC<PropsWithChildren<AsgardeoProviderProps>> = ({
6868

6969
const [userProfile, setUserProfile] = useState<UserProfile | null>(null);
7070
const [baseUrl, setBaseUrl] = useState<string>(_baseUrl);
71+
const [config, setConfig] = useState<AsgardeoReactConfig>({
72+
applicationId,
73+
organizationHandle,
74+
afterSignInUrl,
75+
afterSignOutUrl,
76+
baseUrl,
77+
clientId,
78+
scopes,
79+
signUpUrl,
80+
signInUrl,
81+
...rest,
82+
});
7183

7284
useEffect(() => {
7385
setBaseUrl(_baseUrl);
7486
}, [_baseUrl]);
7587

7688
useEffect(() => {
7789
(async (): Promise<void> => {
78-
await asgardeo.initialize({
79-
applicationId,
80-
organizationHandle,
81-
afterSignInUrl,
82-
afterSignOutUrl,
83-
baseUrl,
84-
clientId,
85-
scopes,
86-
signUpUrl,
87-
signInUrl,
88-
...rest,
89-
});
90+
await asgardeo.initialize(config);
91+
setConfig(await asgardeo.getConfiguration());
9092
})();
9193
}, []);
9294

@@ -263,7 +265,7 @@ const AsgardeoProvider: FC<PropsWithChildren<AsgardeoProviderProps>> = ({
263265
<AsgardeoContext.Provider
264266
value={{
265267
applicationId,
266-
organizationHandle,
268+
organizationHandle: config?.organizationHandle,
267269
signInUrl,
268270
signUpUrl,
269271
afterSignInUrl,

samples/teamspace-nextjs/app/profile/page.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ export default function ProfilePage() {
4949
}
5050

5151
const handleSave = () => {
52-
// In a real app, you'd save to your backend
53-
console.log('Saving profile:', formData);
5452
setIsEditing(false);
5553
};
5654

0 commit comments

Comments
 (0)