Skip to content

Commit a19c0d1

Browse files
brionmariobrionmario
authored
Merge pull request #80 from brionmario/next
Fix NPEs
2 parents b262ab1 + 3851019 commit a19c0d1

File tree

5 files changed

+48
-47
lines changed

5 files changed

+48
-47
lines changed

‎.changeset/olive-doodles-allow.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@asgardeo/nextjs': patch
3+
'@asgardeo/react': patch
4+
---
5+
6+
Fix NPEs

‎packages/browser/src/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,5 @@ export {default as hasAuthParamsInUrl} from './utils/hasAuthParamsInUrl';
4949

5050
export {default as AsgardeoBrowserClient} from './AsgardeoBrowserClient';
5151

52+
// Re-export everything from the JavaScript package
5253
export * from '@asgardeo/javascript';

‎packages/javascript/src/index.ts‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,20 @@ export {default as executeEmbeddedSignUpFlow} from './api/executeEmbeddedSignUpF
2727
export {default as getUserInfo} from './api/getUserInfo';
2828
export {default as getScim2Me, GetScim2MeConfig} from './api/getScim2Me';
2929
export {default as getSchemas, GetSchemasConfig} from './api/getSchemas';
30-
export {default as getAllOrganizations} from './api/getAllOrganizations';
31-
export {default as createOrganization} from './api/createOrganization';
32-
export {default as getMeOrganizations} from './api/getMeOrganizations';
33-
export {default as getOrganization} from './api/getOrganization';
34-
export {default as updateOrganization, createPatchOperations} from './api/updateOrganization';
35-
export {default as updateMeProfile} from './api/updateMeProfile';
36-
export type {PaginatedOrganizationsResponse, GetAllOrganizationsConfig} from './api/getAllOrganizations';
37-
export type {CreateOrganizationPayload, CreateOrganizationConfig} from './api/createOrganization';
38-
export type {GetMeOrganizationsConfig} from './api/getMeOrganizations';
39-
export type {OrganizationDetails, GetOrganizationConfig} from './api/getOrganization';
40-
export type {UpdateOrganizationConfig} from './api/updateOrganization';
41-
export type {UpdateMeProfileConfig} from './api/updateMeProfile';
30+
export {
31+
default as getAllOrganizations,
32+
PaginatedOrganizationsResponse,
33+
GetAllOrganizationsConfig,
34+
} from './api/getAllOrganizations';
35+
export {
36+
default as createOrganization,
37+
CreateOrganizationPayload,
38+
CreateOrganizationConfig,
39+
} from './api/createOrganization';
40+
export {default as getMeOrganizations, GetMeOrganizationsConfig} from './api/getMeOrganizations';
41+
export {default as getOrganization, OrganizationDetails, GetOrganizationConfig} from './api/getOrganization';
42+
export {default as updateOrganization, createPatchOperations, UpdateOrganizationConfig} from './api/updateOrganization';
43+
export {default as updateMeProfile, UpdateMeProfileConfig} from './api/updateMeProfile';
4244

4345
export {default as ApplicationNativeAuthenticationConstants} from './constants/ApplicationNativeAuthenticationConstants';
4446
export {default as TokenConstants} from './constants/TokenConstants';

‎packages/react/src/components/presentation/SignIn/BaseSignIn.tsx‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ const BaseSignInContent: FC<BaseSignInProps> = ({
424424
*/
425425
const handleRedirectionIfNeeded = (response: EmbeddedSignInFlowHandleResponse): boolean => {
426426
if (
427-
'nextStep' in response &&
427+
response && 'nextStep' in response &&
428428
response.nextStep &&
429429
(response.nextStep as any).stepType === EmbeddedSignInFlowStepType.AuthenticatorPrompt &&
430430
(response.nextStep as any).authenticators &&
@@ -563,7 +563,7 @@ const BaseSignInContent: FC<BaseSignInProps> = ({
563563

564564
onFlowChange?.(response);
565565

566-
if (response.flowStatus === EmbeddedSignInFlowStatus.SuccessCompleted) {
566+
if (response?.flowStatus === EmbeddedSignInFlowStatus.SuccessCompleted) {
567567
onSuccess?.(response.authData);
568568
}
569569
}
@@ -618,14 +618,14 @@ const BaseSignInContent: FC<BaseSignInProps> = ({
618618
});
619619
onFlowChange?.(response);
620620

621-
if (response.flowStatus === EmbeddedSignInFlowStatus.SuccessCompleted) {
621+
if (response?.flowStatus === EmbeddedSignInFlowStatus.SuccessCompleted) {
622622
onSuccess?.(response.authData);
623623
return;
624624
}
625625

626626
if (
627-
response.flowStatus === EmbeddedSignInFlowStatus.FailCompleted ||
628-
response.flowStatus === EmbeddedSignInFlowStatus.FailIncomplete
627+
response?.flowStatus === EmbeddedSignInFlowStatus.FailCompleted ||
628+
response?.flowStatus === EmbeddedSignInFlowStatus.FailIncomplete
629629
) {
630630
setError(t('errors.sign.in.flow.completion.failure'));
631631
return;
@@ -636,7 +636,7 @@ const BaseSignInContent: FC<BaseSignInProps> = ({
636636
return;
637637
}
638638

639-
if ('flowId' in response && 'nextStep' in response) {
639+
if (response && 'flowId' in response && 'nextStep' in response) {
640640
const nextStepResponse = response as any;
641641
setCurrentFlow(nextStepResponse);
642642

@@ -718,21 +718,21 @@ const BaseSignInContent: FC<BaseSignInProps> = ({
718718
});
719719
onFlowChange?.(response);
720720

721-
if (response.flowStatus === EmbeddedSignInFlowStatus.SuccessCompleted) {
721+
if (response?.flowStatus === EmbeddedSignInFlowStatus.SuccessCompleted) {
722722
onSuccess?.(response.authData);
723723
return;
724724
}
725725

726726
if (
727-
response.flowStatus === EmbeddedSignInFlowStatus.FailCompleted ||
728-
response.flowStatus === EmbeddedSignInFlowStatus.FailIncomplete
727+
response?.flowStatus === EmbeddedSignInFlowStatus.FailCompleted ||
728+
response?.flowStatus === EmbeddedSignInFlowStatus.FailIncomplete
729729
) {
730730
setError(t('errors.sign.in.flow.passkeys.completion.failure'));
731731
return;
732732
}
733733

734734
// Handle next step if authentication is not complete
735-
if ('flowId' in response && 'nextStep' in response) {
735+
if (response && 'flowId' in response && 'nextStep' in response) {
736736
const nextStepResponse = response as any;
737737
setCurrentFlow(nextStepResponse);
738738

@@ -795,7 +795,7 @@ const BaseSignInContent: FC<BaseSignInProps> = ({
795795
});
796796
onFlowChange?.(response);
797797

798-
if (response.flowStatus === EmbeddedSignInFlowStatus.SuccessCompleted) {
798+
if (response?.flowStatus === EmbeddedSignInFlowStatus.SuccessCompleted) {
799799
onSuccess?.(response.authData);
800800
return;
801801
}
@@ -823,14 +823,14 @@ const BaseSignInContent: FC<BaseSignInProps> = ({
823823
});
824824
onFlowChange?.(response);
825825

826-
if (response.flowStatus === EmbeddedSignInFlowStatus.SuccessCompleted) {
826+
if (response?.flowStatus === EmbeddedSignInFlowStatus.SuccessCompleted) {
827827
onSuccess?.(response.authData);
828828
return;
829829
}
830830

831831
if (
832-
response.flowStatus === EmbeddedSignInFlowStatus.FailCompleted ||
833-
response.flowStatus === EmbeddedSignInFlowStatus.FailIncomplete
832+
response?.flowStatus === EmbeddedSignInFlowStatus.FailCompleted ||
833+
response?.flowStatus === EmbeddedSignInFlowStatus.FailIncomplete
834834
) {
835835
setError('Authentication failed. Please check your credentials and try again.');
836836
return;
@@ -841,7 +841,7 @@ const BaseSignInContent: FC<BaseSignInProps> = ({
841841
return;
842842
}
843843

844-
if ('flowId' in response && 'nextStep' in response) {
844+
if (response && 'flowId' in response && 'nextStep' in response) {
845845
const nextStepResponse = response as any;
846846
setCurrentFlow(nextStepResponse);
847847

@@ -894,14 +894,14 @@ const BaseSignInContent: FC<BaseSignInProps> = ({
894894
});
895895
onFlowChange?.(response);
896896

897-
if (response.flowStatus === EmbeddedSignInFlowStatus.SuccessCompleted) {
897+
if (response?.flowStatus === EmbeddedSignInFlowStatus.SuccessCompleted) {
898898
onSuccess?.(response.authData);
899899
return;
900900
}
901901

902902
if (
903-
response.flowStatus === EmbeddedSignInFlowStatus.FailCompleted ||
904-
response.flowStatus === EmbeddedSignInFlowStatus.FailIncomplete
903+
response?.flowStatus === EmbeddedSignInFlowStatus.FailCompleted ||
904+
response?.flowStatus === EmbeddedSignInFlowStatus.FailIncomplete
905905
) {
906906
setError('Authentication failed. Please try again.');
907907
return;
@@ -912,7 +912,7 @@ const BaseSignInContent: FC<BaseSignInProps> = ({
912912
return;
913913
}
914914

915-
if ('flowId' in response && 'nextStep' in response) {
915+
if (response && 'flowId' in response && 'nextStep' in response) {
916916
const nextStepResponse = response as any;
917917
setCurrentFlow(nextStepResponse);
918918

@@ -952,7 +952,7 @@ const BaseSignInContent: FC<BaseSignInProps> = ({
952952
}
953953
}
954954
} catch (err) {
955-
const errorMessage = err instanceof AsgardeoAPIError ? err.message : 'Authenticator selection failed';
955+
const errorMessage = err instanceof AsgardeoAPIError ? err?.message : 'Authenticator selection failed';
956956
setError(errorMessage);
957957
onError?.(err as Error);
958958
} finally {

‎packages/react/src/index.ts‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -243,20 +243,12 @@ export type {FlowStep, FlowMessage, FlowContextValue} from './contexts/Flow/Flow
243243

244244
export type {FlowProviderProps} from './contexts/Flow/FlowProvider';
245245

246-
247-
export {default as getAllOrganizations} from './api/getAllOrganizations';
248-
export {default as createOrganization} from './api/createOrganization';
249-
export {default as getMeOrganizations} from './api/getMeOrganizations';
250-
export {default as getOrganization} from './api/getOrganization';
251-
export {default as updateOrganization, createPatchOperations} from './api/updateOrganization';
252-
export {default as getSchemas} from './api/getSchemas';
253-
export {default as updateMeProfile} from './api/updateMeProfile';
254-
export type {GetAllOrganizationsConfig} from './api/getAllOrganizations';
255-
export type {CreateOrganizationConfig} from './api/createOrganization';
256-
export type {GetMeOrganizationsConfig} from './api/getMeOrganizations';
257-
export type {GetOrganizationConfig} from './api/getOrganization';
258-
export type {UpdateOrganizationConfig} from './api/updateOrganization';
259-
export type {GetSchemasConfig} from './api/getSchemas';
260-
export type {UpdateMeProfileConfig} from './api/updateMeProfile';
246+
export {default as getAllOrganizations, GetAllOrganizationsConfig} from './api/getAllOrganizations';
247+
export {default as createOrganization, CreateOrganizationConfig} from './api/createOrganization';
248+
export {default as getMeOrganizations, GetMeOrganizationsConfig} from './api/getMeOrganizations';
249+
export {default as getOrganization, GetOrganizationConfig} from './api/getOrganization';
250+
export {default as updateOrganization, createPatchOperations, UpdateOrganizationConfig} from './api/updateOrganization';
251+
export {default as getSchemas, GetSchemasConfig} from './api/getSchemas';
252+
export {default as updateMeProfile, UpdateMeProfileConfig} from './api/updateMeProfile';
261253
export {default as getMeProfile} from './api/getScim2Me';
262254
export * from './api/getScim2Me';

0 commit comments

Comments
 (0)