@asgardeo/auth-react 1.1.3 → 1.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/main.js +2 -2
- package/dist/src/authenticate.d.ts.map +1 -1
- package/dist/src/models.d.ts +2 -1
- package/dist/src/models.d.ts.map +1 -1
- package/dist/tsconfig.tsbuildinfo +3 -3
- package/package.json +1 -1
- package/src/authenticate.tsx +56 -43
- package/src/models.ts +2 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticate.d.ts","sourceRoot":"","sources":["../../src/authenticate.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;
|
|
1
|
+
{"version":3,"file":"authenticate.d.ts","sourceRoot":"","sources":["../../src/authenticate.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAaH,OAAc,EACV,iBAAiB,EACjB,iBAAiB,EACjB,SAAS,EAMZ,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,UAAU,EAAe,MAAM,GAAG,CAAC;AAC5C,OAAO,OAAO,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAsB,MAAM,UAAU,CAAC;AASrF,QAAA,MAAM,UAAU,SAAgB,CAAC;AAOjC,UAAU,0BAA0B;IAChC,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;IAC1C,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;CAC1B;AAED,QAAA,MAAM,YAAY,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,0BAA0B,CAAC,CAsLlF,CAAC;AAEF,QAAA,MAAM,cAAc,QAAO,oBAE1B,CAAC;AAEF,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,cAAc,EAAE,CAAC"}
|
package/dist/src/models.d.ts
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
* specific language governing permissions and limitations
|
|
16
16
|
* under the License.
|
|
17
17
|
*/
|
|
18
|
-
import { AuthClientConfig, AuthSPAClientConfig, BasicUserInfo, Config, CustomGrantConfig, DecodedIDTokenPayload, FetchResponse, Hooks, HttpClientInstance, HttpRequestConfig, HttpResponse, OIDCEndpoints, SignInConfig } from "@asgardeo/auth-spa";
|
|
18
|
+
import { AsgardeoAuthException, AuthClientConfig, AuthSPAClientConfig, BasicUserInfo, Config, CustomGrantConfig, DecodedIDTokenPayload, FetchResponse, Hooks, HttpClientInstance, HttpRequestConfig, HttpResponse, OIDCEndpoints, SignInConfig } from "@asgardeo/auth-spa";
|
|
19
19
|
export interface ReactConfig {
|
|
20
20
|
/**
|
|
21
21
|
* The SDK's `AuthProvider` by default is listening to the URL changes to see
|
|
@@ -87,6 +87,7 @@ export interface AuthContextInterface {
|
|
|
87
87
|
on(hook: Exclude<Hooks, Hooks.CustomGrant>, callback: (response?: any) => void): void;
|
|
88
88
|
on(hook: Hooks, callback: (response?: any) => void, id?: string): void;
|
|
89
89
|
state: AuthStateInterface;
|
|
90
|
+
error: AsgardeoAuthException;
|
|
90
91
|
}
|
|
91
92
|
export interface SecureRouteInterface {
|
|
92
93
|
callback: () => void;
|
package/dist/src/models.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../src/models.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../src/models.ts"],"names":[],"mappings":"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"}
|
|
@@ -451,8 +451,8 @@
|
|
|
451
451
|
"affectsGlobalScope": false
|
|
452
452
|
},
|
|
453
453
|
"../src/models.ts": {
|
|
454
|
-
"version": "
|
|
455
|
-
"signature": "
|
|
454
|
+
"version": "2a11abad651952beaf6051d2e4e55bcf477917093613a7de545e0817d4141190",
|
|
455
|
+
"signature": "c9fec124a6c9771f154d651ce6d0121c5c7cff00824aaba5186277dda632ae28",
|
|
456
456
|
"affectsGlobalScope": false
|
|
457
457
|
},
|
|
458
458
|
"../src/api.ts": {
|
|
@@ -571,7 +571,7 @@
|
|
|
571
571
|
"affectsGlobalScope": false
|
|
572
572
|
},
|
|
573
573
|
"../src/authenticate.tsx": {
|
|
574
|
-
"version": "
|
|
574
|
+
"version": "066bd11a17aa256d6ab67679cb0890f21d15bcc5a72d14cff755569abf860980",
|
|
575
575
|
"signature": "336cb282ec49398aece02113130600346cc39c172377aad24e5cb639ce3d226b",
|
|
576
576
|
"affectsGlobalScope": false
|
|
577
577
|
},
|
package/package.json
CHANGED
package/src/authenticate.tsx
CHANGED
|
@@ -23,7 +23,8 @@ import {
|
|
|
23
23
|
Hooks,
|
|
24
24
|
HttpRequestConfig,
|
|
25
25
|
SPAUtils,
|
|
26
|
-
SignInConfig
|
|
26
|
+
SignInConfig,
|
|
27
|
+
AsgardeoAuthException
|
|
27
28
|
} from "@asgardeo/auth-spa";
|
|
28
29
|
import { SPACustomGrantConfig } from "@asgardeo/auth-spa/src/models/request-custom-grant";
|
|
29
30
|
import React, {
|
|
@@ -80,7 +81,19 @@ const AuthProvider: FunctionComponent<PropsWithChildren<AuthProviderPropsInterfa
|
|
|
80
81
|
authState?: string,
|
|
81
82
|
callback?: (response: BasicUserInfo) => void
|
|
82
83
|
): Promise<BasicUserInfo> => {
|
|
83
|
-
|
|
84
|
+
try {
|
|
85
|
+
return await AuthClient.signIn(
|
|
86
|
+
dispatch,
|
|
87
|
+
state,
|
|
88
|
+
config,
|
|
89
|
+
authorizationCode,
|
|
90
|
+
sessionState,
|
|
91
|
+
authState,
|
|
92
|
+
callback
|
|
93
|
+
);
|
|
94
|
+
} catch (error) {
|
|
95
|
+
return Promise.reject(error);
|
|
96
|
+
}
|
|
84
97
|
};
|
|
85
98
|
const signOut = (callback?: (response: boolean) => void): Promise<boolean> => {
|
|
86
99
|
return AuthClient.signOut(dispatch, state, callback);
|
|
@@ -111,6 +124,8 @@ const AuthProvider: FunctionComponent<PropsWithChildren<AuthProviderPropsInterfa
|
|
|
111
124
|
return AuthClient.on(hook, callback);
|
|
112
125
|
};
|
|
113
126
|
const trySignInSilently = () => AuthClient.trySignInSilently(state, dispatch);
|
|
127
|
+
|
|
128
|
+
const [ error, setError ] = useState<AsgardeoAuthException>();
|
|
114
129
|
|
|
115
130
|
useEffect(() => {
|
|
116
131
|
if (state.isAuthenticated) {
|
|
@@ -156,21 +171,18 @@ const AuthProvider: FunctionComponent<PropsWithChildren<AuthProviderPropsInterfa
|
|
|
156
171
|
|| authParams?.authorizationCode
|
|
157
172
|
|| url.searchParams.get("error") )
|
|
158
173
|
{
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
// Tracked here https://github.com/asgardeo/asgardeo-auth-js-sdk/issues/151.
|
|
172
|
-
throw error;
|
|
173
|
-
});
|
|
174
|
+
try{
|
|
175
|
+
await signIn(
|
|
176
|
+
{ callOnlyOnRedirect: true },
|
|
177
|
+
authParams?.authorizationCode,
|
|
178
|
+
authParams?.sessionState,
|
|
179
|
+
authParams?.state
|
|
180
|
+
);
|
|
181
|
+
} catch(error) {
|
|
182
|
+
if(error instanceof AsgardeoAuthException) {
|
|
183
|
+
setError(error);
|
|
184
|
+
}
|
|
185
|
+
}
|
|
174
186
|
}
|
|
175
187
|
}
|
|
176
188
|
|
|
@@ -204,32 +216,33 @@ const AuthProvider: FunctionComponent<PropsWithChildren<AuthProviderPropsInterfa
|
|
|
204
216
|
* Render state and special case actions
|
|
205
217
|
*/
|
|
206
218
|
return (
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
219
|
+
<AuthContext.Provider
|
|
220
|
+
value={ {
|
|
221
|
+
disableHttpHandler,
|
|
222
|
+
enableHttpHandler,
|
|
223
|
+
getAccessToken,
|
|
224
|
+
getBasicUserInfo,
|
|
225
|
+
getDecodedIDToken,
|
|
226
|
+
getHttpClient,
|
|
227
|
+
getIDToken,
|
|
228
|
+
getOIDCServiceEndpoints,
|
|
229
|
+
httpRequest,
|
|
230
|
+
httpRequestAll,
|
|
231
|
+
isAuthenticated,
|
|
232
|
+
on,
|
|
233
|
+
refreshAccessToken,
|
|
234
|
+
requestCustomGrant,
|
|
235
|
+
revokeAccessToken,
|
|
236
|
+
signIn,
|
|
237
|
+
signOut,
|
|
238
|
+
state,
|
|
239
|
+
trySignInSilently,
|
|
240
|
+
updateConfig,
|
|
241
|
+
error
|
|
242
|
+
} }
|
|
243
|
+
>
|
|
244
|
+
{ initialized ? children : fallback ?? null }
|
|
245
|
+
</AuthContext.Provider>
|
|
233
246
|
);
|
|
234
247
|
};
|
|
235
248
|
|
package/src/models.ts
CHANGED
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
*/
|
|
18
18
|
|
|
19
19
|
import {
|
|
20
|
+
AsgardeoAuthException,
|
|
20
21
|
AuthClientConfig,
|
|
21
22
|
AuthSPAClientConfig,
|
|
22
23
|
BasicUserInfo,
|
|
@@ -118,6 +119,7 @@ export interface AuthContextInterface {
|
|
|
118
119
|
): void;
|
|
119
120
|
on(hook: Hooks, callback: (response?: any) => void, id?: string): void;
|
|
120
121
|
state: AuthStateInterface;
|
|
122
|
+
error: AsgardeoAuthException;
|
|
121
123
|
}
|
|
122
124
|
|
|
123
125
|
export interface SecureRouteInterface {
|