@asgardeo/auth-react 0.2.14 → 1.0.0

package/src/api.ts

@@ -21,8 +21,8 @@ import {
     AuthClientConfig,
     BasicUserInfo,
     Config,
-    CustomGrantConfig,
     DecodedIDTokenPayload,
+    FetchResponse,
     Hooks,
     HttpClientInstance,
     HttpRequestConfig,
@@ -30,6 +30,7 @@ import {
     OIDCEndpoints,
     SignInConfig
 } from "@asgardeo/auth-spa";
+import { SPACustomGrantConfig } from "@asgardeo/auth-spa/src/models/request-custom-grant";
 import { AuthStateInterface } from "./models";
 
 class AuthAPI {
@@ -168,7 +169,7 @@ class AuthAPI {
      *
      * @param {HttpRequestConfig} config -  The config object containing attributes necessary to send a request.
      *
-     * @return {Promise<HttpResponse>} - Returns a Promise that resolves with the response to the request.
+     * @return {Promise<FetchResponse>} - Returns a Promise that resolves with the response to the request.
      */
     public async httpRequest(config: HttpRequestConfig): Promise<HttpResponse<any>> {
         return this._client.httpRequest(config);
@@ -182,7 +183,7 @@ class AuthAPI {
      *
      * @param {HttpRequestConfig[]} config -  The config object containing attributes necessary to send a request.
      *
-     * @return {Promise<HttpResponse[]>} - Returns a Promise that resolves with the responses to the requests.
+     * @return {Promise<FetchResponse[]>} - Returns a Promise that resolves with the responses to the requests.
      */
     public async httpRequestAll(configs: HttpRequestConfig[]): Promise<HttpResponse<any>[]> {
         return this._client.httpRequestAll(configs);
@@ -193,17 +194,17 @@ class AuthAPI {
      *
      * @param {CustomGrantRequestParams} config - The request parameters.
      *
-     * @return {Promise<HttpResponse<any> | SignInResponse>} - A Promise that resolves with
+     * @return {Promise<FetchResponse<any> | SignInResponse>} - A Promise that resolves with
      * the value returned by the custom grant request.
      */
     public requestCustomGrant(
-        config: CustomGrantConfig,
-        callback: (response: BasicUserInfo | HttpResponse<any>) => void,
+        config: SPACustomGrantConfig,
+        callback: (response: BasicUserInfo | FetchResponse<any>) => void,
         dispatch: (state: AuthStateInterface) => void
-    ): Promise<BasicUserInfo | HttpResponse<any>> {
+    ): Promise<BasicUserInfo | FetchResponse<any>> {
         return this._client
             .requestCustomGrant(config)
-            .then((response: BasicUserInfo | HttpResponse<any>) => {
+            .then((response: BasicUserInfo | FetchResponse<any>) => {
                 if (!response) {
                     return;
                 }
@@ -351,15 +352,7 @@ class AuthAPI {
      */
     public on(hook: Hooks.CustomGrant, callback: (response?: any) => void, id: string): Promise<void>;
     public on(
-        hook:
-            | Hooks.RevokeAccessToken
-            | Hooks.HttpRequestError
-            | Hooks.HttpRequestFinish
-            | Hooks.HttpRequestStart
-            | Hooks.HttpRequestSuccess
-            | Hooks.Initialize
-            | Hooks.SignIn
-            | Hooks.SignOut,
+        hook: Exclude<Hooks, Hooks.CustomGrant>,
         callback: (response?: any) => void
     ): Promise<void>;
     public on(hook: Hooks, callback: (response?: any) => void, id?: string): Promise<void> {
@@ -405,9 +398,9 @@ class AuthAPI {
                         email: basicUserInfo.email,
                         isAuthenticated: true,
                         isLoading: false,
-                        username: basicUserInfo.username,
                         isSigningOut: false,
-                        sub: basicUserInfo.sub
+                        sub: basicUserInfo.sub,
+                        username: basicUserInfo.username
                     };
 
                     this.updateState(stateToUpdate);
@@ -429,8 +422,8 @@ AuthAPI.DEFAULT_STATE = {
     email: "",
     isAuthenticated: false,
     isLoading: true,
-    username: "",
-    sub: ""
+    sub: "",
+    username: ""
 };
 
 export default AuthAPI;

package/src/authenticate.tsx

@@ -19,22 +19,22 @@
 import {
     AuthClientConfig,
     BasicUserInfo,
-    CustomGrantConfig,
+    FetchResponse,
     Hooks,
     HttpRequestConfig,
-    HttpResponse,
-    SignInConfig,
-    SPAUtils
+    SPAUtils,
+    SignInConfig
 } from "@asgardeo/auth-spa";
+import { SPACustomGrantConfig } from "@asgardeo/auth-spa/src/models/request-custom-grant";
 import React, {
     FunctionComponent,
     PropsWithChildren,
+    ReactNode,
     createContext,
     useContext,
     useEffect,
     useMemo,
-    useState,
-    ReactNode
+    useState
 } from "react";
 import { AuthParams, ReactConfig } from ".";
 import AuthAPI from "./api";
@@ -44,7 +44,7 @@ import { AuthContextInterface, AuthReactConfig, AuthStateInterface } from "./mod
  * Default `AuthReactConfig` config.
  */
 const defaultConfig: Partial<ReactConfig> = {
-    disableTrySignInSilently: false
+    disableTrySignInSilently: true
 };
 
 const AuthClient = new AuthAPI();
@@ -88,8 +88,8 @@ const AuthProvider: FunctionComponent<PropsWithChildren<AuthProviderPropsInterfa
     const httpRequest = (config: HttpRequestConfig) => AuthClient.httpRequest(config);
     const httpRequestAll = (configs: HttpRequestConfig[]) => AuthClient.httpRequestAll(configs);
     const requestCustomGrant = (
-        config: CustomGrantConfig,
-        callback?: (response: BasicUserInfo | HttpResponse<any>) => void
+        config: SPACustomGrantConfig,
+        callback?: (response: BasicUserInfo | FetchResponse<any>) => void
     ) => AuthClient.requestCustomGrant(config, callback, dispatch);
     const revokeAccessToken = () => AuthClient.revokeAccessToken(dispatch);
     const getOIDCServiceEndpoints = () => AuthClient.getOIDCServiceEndpoints();
@@ -148,9 +148,12 @@ const AuthProvider: FunctionComponent<PropsWithChildren<AuthProviderPropsInterfa
                     authParams = await getAuthParams();
                 }
 
-                if (SPAUtils.hasAuthSearchParamsInURL()
+                const url = new URL(location.href);
+
+                if ((SPAUtils.hasAuthSearchParamsInURL()
+                    && new URL(url.origin + url.pathname).toString() === new URL(config?.signInRedirectURL).toString())
                     || authParams?.authorizationCode
-                    || new URL(location.href).searchParams.get("error") )
+                    || url.searchParams.get("error") )
                 {
                     await signIn({ callOnlyOnRedirect: true }, authParams?.authorizationCode, authParams?.sessionState)
                         .then(() => {
@@ -178,7 +181,7 @@ const AuthProvider: FunctionComponent<PropsWithChildren<AuthProviderPropsInterfa
             // This uses the RP iframe to get the session. Hence, will not work if 3rd party cookies are disabled.
             // If the browser has these cookies disabled, we'll not be able to retrieve the session on refreshes.
             await trySignInSilently()
-                .then((_: BasicUserInfo | boolean) => {
+                .then(() => {
                     // TODO: Add logs when a logger is available.
                     // Tracked here https://github.com/asgardeo/asgardeo-auth-js-sdk/issues/151.
                 })

package/src/models.ts

@@ -23,6 +23,7 @@ import {
     Config,
     CustomGrantConfig,
     DecodedIDTokenPayload,
+    FetchResponse,
     Hooks,
     HttpClientInstance,
     HttpRequestConfig,
@@ -95,7 +96,7 @@ export interface AuthContextInterface {
     httpRequestAll(configs: HttpRequestConfig[]): Promise<HttpResponse<any>[]>;
     requestCustomGrant(
         config: CustomGrantConfig,
-        callback?: (response: BasicUserInfo | HttpResponse<any>) => void
+        callback?: (response: BasicUserInfo | FetchResponse<any>) => void
     ): void;
     revokeAccessToken(): Promise<boolean>;
     getOIDCServiceEndpoints(): Promise<OIDCEndpoints>;
@@ -111,15 +112,7 @@ export interface AuthContextInterface {
     trySignInSilently: () => Promise<boolean | BasicUserInfo>;
     on(hook: Hooks.CustomGrant, callback: (response?: any) => void, id: string): void;
     on(
-        hook:
-            | Hooks.RevokeAccessToken
-            | Hooks.HttpRequestError
-            | Hooks.HttpRequestFinish
-            | Hooks.HttpRequestStart
-            | Hooks.HttpRequestSuccess
-            | Hooks.Initialize
-            | Hooks.SignIn
-            | Hooks.SignOut,
+        hook: Exclude<Hooks, Hooks.CustomGrant>,
         callback: (response?: any) => void
     ): void;
     on(hook: Hooks, callback: (response?: any) => void, id?: string): void;

package/src/secure-app.tsx

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-import React, { Suspense, FunctionComponent, PropsWithChildren, ReactElement, useEffect } from "react";
+import React, { FunctionComponent, PropsWithChildren, ReactElement, Suspense, useEffect } from "react";
 import { useAuthContext } from "./authenticate";
 import { AuthenticatedComponent } from "./authenticated-component";