@nauth-toolkit/client-angular 0.1.59 → 0.1.60
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/esm2022/ngmodule/auth.service.mjs +25 -1
- package/esm2022/standalone/nauth-toolkit-client-angular-standalone.mjs +1 -1
- package/esm2022/standalone/public-api.mjs +6 -10
- package/fesm2022/nauth-toolkit-client-angular-standalone.mjs +5 -1253
- package/fesm2022/nauth-toolkit-client-angular-standalone.mjs.map +1 -1
- package/fesm2022/nauth-toolkit-client-angular.mjs +24 -0
- package/fesm2022/nauth-toolkit-client-angular.mjs.map +1 -1
- package/ngmodule/auth.service.d.ts +23 -1
- package/package.json +2 -2
- package/standalone/public-api.d.ts +4 -7
- package/esm2022/standalone/auth.guard.mjs +0 -102
- package/esm2022/standalone/auth.interceptor.mjs +0 -158
- package/esm2022/standalone/auth.service.mjs +0 -792
- package/esm2022/standalone/http-adapter.mjs +0 -127
- package/esm2022/standalone/social-redirect-callback.guard.mjs +0 -85
- package/esm2022/standalone/tokens.mjs +0 -6
- package/standalone/auth.guard.d.ts +0 -71
- package/standalone/auth.interceptor.d.ts +0 -15
- package/standalone/auth.service.d.ts +0 -593
- package/standalone/http-adapter.d.ts +0 -53
- package/standalone/social-redirect-callback.guard.d.ts +0 -25
- package/standalone/tokens.d.ts +0 -6
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Observable } from 'rxjs';
|
|
2
2
|
import { AngularHttpAdapter } from './http-adapter';
|
|
3
|
-
import { NAuthClient, NAuthClientConfig, ChallengeResponse, AuthResponse, TokenResponse, AuthUser, ConfirmForgotPasswordResponse, ForgotPasswordResponse, UpdateProfileRequest, GetChallengeDataResponse, GetSetupDataResponse, MFAStatus, MFADevice, AuthEvent, SocialProvider, SocialLoginOptions, LinkedAccountsResponse, SocialVerifyRequest, AuditHistoryResponse } from '@nauth-toolkit/client';
|
|
3
|
+
import { NAuthClient, NAuthClientConfig, ChallengeResponse, AuthResponse, TokenResponse, AuthUser, ConfirmForgotPasswordResponse, ForgotPasswordResponse, ResetPasswordWithCodeResponse, UpdateProfileRequest, GetChallengeDataResponse, GetSetupDataResponse, MFAStatus, MFADevice, AuthEvent, SocialProvider, SocialLoginOptions, LinkedAccountsResponse, SocialVerifyRequest, AuditHistoryResponse } from '@nauth-toolkit/client';
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
5
5
|
/**
|
|
6
6
|
* Angular wrapper around NAuthClient that provides promise-based auth methods and reactive state.
|
|
@@ -199,6 +199,28 @@ export declare class AuthService {
|
|
|
199
199
|
* ```
|
|
200
200
|
*/
|
|
201
201
|
confirmForgotPassword(identifier: string, code: string, newPassword: string): Promise<ConfirmForgotPasswordResponse>;
|
|
202
|
+
/**
|
|
203
|
+
* Reset password with code or token (generic method for both admin and user-initiated resets).
|
|
204
|
+
*
|
|
205
|
+
* Accepts either:
|
|
206
|
+
* - code: Short numeric code from email/SMS (6-10 digits)
|
|
207
|
+
* - token: Long hex token from reset link (64 chars)
|
|
208
|
+
*
|
|
209
|
+
* @param identifier - User identifier (email, username, phone)
|
|
210
|
+
* @param codeOrToken - Verification code OR token from link
|
|
211
|
+
* @param newPassword - New password
|
|
212
|
+
* @returns Promise with success response
|
|
213
|
+
*
|
|
214
|
+
* @example
|
|
215
|
+
* ```typescript
|
|
216
|
+
* // With code from email
|
|
217
|
+
* await this.auth.resetPasswordWithCode('user@example.com', '123456', 'NewPass123!');
|
|
218
|
+
*
|
|
219
|
+
* // With token from link
|
|
220
|
+
* await this.auth.resetPasswordWithCode('user@example.com', '64-char-token', 'NewPass123!');
|
|
221
|
+
* ```
|
|
222
|
+
*/
|
|
223
|
+
resetPasswordWithCode(identifier: string, codeOrToken: string, newPassword: string): Promise<ResetPasswordWithCodeResponse>;
|
|
202
224
|
/**
|
|
203
225
|
* Change user password (requires current password).
|
|
204
226
|
*
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nauth-toolkit/client-angular",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.60",
|
|
4
4
|
"description": "Angular adapter for nauth-toolkit client SDK",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"nauth",
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"peerDependencies": {
|
|
25
25
|
"@angular/common": ">=17.0.0",
|
|
26
26
|
"@angular/core": ">=17.0.0",
|
|
27
|
-
"@nauth-toolkit/client": "^0.1.
|
|
27
|
+
"@nauth-toolkit/client": "^0.1.60",
|
|
28
28
|
"rxjs": "^7.0.0 || ^8.0.0"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
@@ -3,11 +3,8 @@
|
|
|
3
3
|
*
|
|
4
4
|
* This entry point is for standalone component-based Angular apps (Angular 14+).
|
|
5
5
|
* For NgModule apps, use: @nauth-toolkit/client-angular
|
|
6
|
+
*
|
|
7
|
+
* NOTE: This simply re-exports the main entry point since both share the same code for now.
|
|
8
|
+
* The split allows future additions like `provideNAuth()` for standalone apps.
|
|
6
9
|
*/
|
|
7
|
-
export * from '@nauth-toolkit/client';
|
|
8
|
-
export * from './tokens';
|
|
9
|
-
export * from './auth.service';
|
|
10
|
-
export * from './http-adapter';
|
|
11
|
-
export * from './auth.interceptor';
|
|
12
|
-
export * from './auth.guard';
|
|
13
|
-
export * from './social-redirect-callback.guard';
|
|
10
|
+
export * from '@nauth-toolkit/client-angular';
|
|
@@ -1,102 +0,0 @@
|
|
|
1
|
-
import { __decorate, __param } from "tslib";
|
|
2
|
-
import { inject, Inject, Optional } from '@angular/core';
|
|
3
|
-
import { Router } from '@angular/router';
|
|
4
|
-
import { AuthService } from './auth.service';
|
|
5
|
-
import { NAUTH_CLIENT_CONFIG } from './tokens';
|
|
6
|
-
/**
|
|
7
|
-
* Functional route guard for authentication (Angular 17+).
|
|
8
|
-
*
|
|
9
|
-
* Protects routes by checking if user is authenticated.
|
|
10
|
-
* Redirects to configured session expired route (or login) if not authenticated.
|
|
11
|
-
*
|
|
12
|
-
* @param redirectTo - Optional path to redirect to if not authenticated. If not provided, uses `redirects.sessionExpired` from config (defaults to '/login')
|
|
13
|
-
* @returns CanActivateFn guard function
|
|
14
|
-
*
|
|
15
|
-
* @example
|
|
16
|
-
* ```typescript
|
|
17
|
-
* // In route configuration - uses config.redirects.sessionExpired
|
|
18
|
-
* const routes: Routes = [
|
|
19
|
-
* {
|
|
20
|
-
* path: 'home',
|
|
21
|
-
* component: HomeComponent,
|
|
22
|
-
* canActivate: [authGuard()]
|
|
23
|
-
* }
|
|
24
|
-
* ];
|
|
25
|
-
*
|
|
26
|
-
* // Override with custom route
|
|
27
|
-
* const routes: Routes = [
|
|
28
|
-
* {
|
|
29
|
-
* path: 'admin',
|
|
30
|
-
* component: AdminComponent,
|
|
31
|
-
* canActivate: [authGuard('/admin/login')]
|
|
32
|
-
* }
|
|
33
|
-
* ];
|
|
34
|
-
* ```
|
|
35
|
-
*/
|
|
36
|
-
export function authGuard(redirectTo) {
|
|
37
|
-
return () => {
|
|
38
|
-
const auth = inject(AuthService);
|
|
39
|
-
const router = inject(Router);
|
|
40
|
-
const config = inject(NAUTH_CLIENT_CONFIG, { optional: true });
|
|
41
|
-
if (auth.isAuthenticated()) {
|
|
42
|
-
return true;
|
|
43
|
-
}
|
|
44
|
-
// Use provided redirectTo, or config.redirects.sessionExpired, or default to '/login'
|
|
45
|
-
const redirectPath = redirectTo ?? config?.redirects?.sessionExpired ?? '/login';
|
|
46
|
-
return router.createUrlTree([redirectPath]);
|
|
47
|
-
};
|
|
48
|
-
}
|
|
49
|
-
/**
|
|
50
|
-
* Class-based authentication guard for NgModule compatibility.
|
|
51
|
-
*
|
|
52
|
-
* @example
|
|
53
|
-
* ```typescript
|
|
54
|
-
* // In route configuration (NgModule)
|
|
55
|
-
* const routes: Routes = [
|
|
56
|
-
* {
|
|
57
|
-
* path: 'home',
|
|
58
|
-
* component: HomeComponent,
|
|
59
|
-
* canActivate: [AuthGuard]
|
|
60
|
-
* }
|
|
61
|
-
* ];
|
|
62
|
-
*
|
|
63
|
-
* // In module providers
|
|
64
|
-
* @NgModule({
|
|
65
|
-
* providers: [AuthGuard]
|
|
66
|
-
* })
|
|
67
|
-
* ```
|
|
68
|
-
*/
|
|
69
|
-
let AuthGuard = class AuthGuard {
|
|
70
|
-
auth;
|
|
71
|
-
router;
|
|
72
|
-
config;
|
|
73
|
-
/**
|
|
74
|
-
* @param auth - Authentication service
|
|
75
|
-
* @param router - Angular router
|
|
76
|
-
* @param config - Optional client configuration (injected automatically)
|
|
77
|
-
*/
|
|
78
|
-
constructor(auth, router, config) {
|
|
79
|
-
this.auth = auth;
|
|
80
|
-
this.router = router;
|
|
81
|
-
this.config = config;
|
|
82
|
-
}
|
|
83
|
-
/**
|
|
84
|
-
* Check if route can be activated.
|
|
85
|
-
*
|
|
86
|
-
* @returns True if authenticated, otherwise redirects to configured session expired route (or '/login')
|
|
87
|
-
*/
|
|
88
|
-
canActivate() {
|
|
89
|
-
if (this.auth.isAuthenticated()) {
|
|
90
|
-
return true;
|
|
91
|
-
}
|
|
92
|
-
// Use config.redirects.sessionExpired or default to '/login'
|
|
93
|
-
const redirectPath = this.config?.redirects?.sessionExpired ?? '/login';
|
|
94
|
-
return this.router.createUrlTree([redirectPath]);
|
|
95
|
-
}
|
|
96
|
-
};
|
|
97
|
-
AuthGuard = __decorate([
|
|
98
|
-
__param(2, Optional()),
|
|
99
|
-
__param(2, Inject(NAUTH_CLIENT_CONFIG))
|
|
100
|
-
], AuthGuard);
|
|
101
|
-
export { AuthGuard };
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5ndWFyZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3N0YW5kYWxvbmUvYXV0aC5ndWFyZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3pELE9BQU8sRUFBaUIsTUFBTSxFQUFXLE1BQU0saUJBQWlCLENBQUM7QUFDakUsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQzdDLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLFVBQVUsQ0FBQztBQUcvQzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0E2Qkc7QUFDSCxNQUFNLFVBQVUsU0FBUyxDQUFDLFVBQW1CO0lBQzNDLE9BQU8sR0FBc0IsRUFBRTtRQUM3QixNQUFNLElBQUksR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDakMsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQzlCLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxtQkFBbUIsRUFBRSxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBRS9ELElBQUksSUFBSSxDQUFDLGVBQWUsRUFBRSxFQUFFLENBQUM7WUFDM0IsT0FBTyxJQUFJLENBQUM7UUFDZCxDQUFDO1FBRUQsc0ZBQXNGO1FBQ3RGLE1BQU0sWUFBWSxHQUNoQixVQUFVLElBQUksTUFBTSxFQUFFLFNBQVMsRUFBRSxjQUFjLElBQUksUUFBUSxDQUFDO1FBRTlELE9BQU8sTUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUM7SUFDOUMsQ0FBQyxDQUFDO0FBQ0osQ0FBQztBQUVEOzs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBbUJHO0FBQ0ksSUFBTSxTQUFTLEdBQWYsTUFBTSxTQUFTO0lBT1Y7SUFDQTtJQUN5QztJQVJuRDs7OztPQUlHO0lBQ0gsWUFDVSxJQUFpQixFQUNqQixNQUFjLEVBQzJCLE1BQTBCO1FBRm5FLFNBQUksR0FBSixJQUFJLENBQWE7UUFDakIsV0FBTSxHQUFOLE1BQU0sQ0FBUTtRQUMyQixXQUFNLEdBQU4sTUFBTSxDQUFvQjtJQUMxRSxDQUFDO0lBRUo7Ozs7T0FJRztJQUNILFdBQVc7UUFDVCxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLEVBQUUsQ0FBQztZQUNoQyxPQUFPLElBQUksQ0FBQztRQUNkLENBQUM7UUFFRCw2REFBNkQ7UUFDN0QsTUFBTSxZQUFZLEdBQUcsSUFBSSxDQUFDLE1BQU0sRUFBRSxTQUFTLEVBQUUsY0FBYyxJQUFJLFFBQVEsQ0FBQztRQUV4RSxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQztJQUNuRCxDQUFDO0NBQ0YsQ0FBQTtBQTNCWSxTQUFTO0lBU2pCLFdBQUEsUUFBUSxFQUFFLENBQUE7SUFBRSxXQUFBLE1BQU0sQ0FBQyxtQkFBbUIsQ0FBQyxDQUFBO0dBVC9CLFNBQVMsQ0EyQnJCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgaW5qZWN0LCBJbmplY3QsIE9wdGlvbmFsIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBDYW5BY3RpdmF0ZUZuLCBSb3V0ZXIsIFVybFRyZWUgfSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xuaW1wb3J0IHsgQXV0aFNlcnZpY2UgfSBmcm9tICcuL2F1dGguc2VydmljZSc7XG5pbXBvcnQgeyBOQVVUSF9DTElFTlRfQ09ORklHIH0gZnJvbSAnLi90b2tlbnMnO1xuaW1wb3J0IHR5cGUgeyBOQXV0aENsaWVudENvbmZpZyB9IGZyb20gJ0BuYXV0aC10b29sa2l0L2NsaWVudCc7XG5cbi8qKlxuICogRnVuY3Rpb25hbCByb3V0ZSBndWFyZCBmb3IgYXV0aGVudGljYXRpb24gKEFuZ3VsYXIgMTcrKS5cbiAqXG4gKiBQcm90ZWN0cyByb3V0ZXMgYnkgY2hlY2tpbmcgaWYgdXNlciBpcyBhdXRoZW50aWNhdGVkLlxuICogUmVkaXJlY3RzIHRvIGNvbmZpZ3VyZWQgc2Vzc2lvbiBleHBpcmVkIHJvdXRlIChvciBsb2dpbikgaWYgbm90IGF1dGhlbnRpY2F0ZWQuXG4gKlxuICogQHBhcmFtIHJlZGlyZWN0VG8gLSBPcHRpb25hbCBwYXRoIHRvIHJlZGlyZWN0IHRvIGlmIG5vdCBhdXRoZW50aWNhdGVkLiBJZiBub3QgcHJvdmlkZWQsIHVzZXMgYHJlZGlyZWN0cy5zZXNzaW9uRXhwaXJlZGAgZnJvbSBjb25maWcgKGRlZmF1bHRzIHRvICcvbG9naW4nKVxuICogQHJldHVybnMgQ2FuQWN0aXZhdGVGbiBndWFyZCBmdW5jdGlvblxuICpcbiAqIEBleGFtcGxlXG4gKiBgYGB0eXBlc2NyaXB0XG4gKiAvLyBJbiByb3V0ZSBjb25maWd1cmF0aW9uIC0gdXNlcyBjb25maWcucmVkaXJlY3RzLnNlc3Npb25FeHBpcmVkXG4gKiBjb25zdCByb3V0ZXM6IFJvdXRlcyA9IFtcbiAqICAge1xuICogICAgIHBhdGg6ICdob21lJyxcbiAqICAgICBjb21wb25lbnQ6IEhvbWVDb21wb25lbnQsXG4gKiAgICAgY2FuQWN0aXZhdGU6IFthdXRoR3VhcmQoKV1cbiAqICAgfVxuICogXTtcbiAqXG4gKiAvLyBPdmVycmlkZSB3aXRoIGN1c3RvbSByb3V0ZVxuICogY29uc3Qgcm91dGVzOiBSb3V0ZXMgPSBbXG4gKiAgIHtcbiAqICAgICBwYXRoOiAnYWRtaW4nLFxuICogICAgIGNvbXBvbmVudDogQWRtaW5Db21wb25lbnQsXG4gKiAgICAgY2FuQWN0aXZhdGU6IFthdXRoR3VhcmQoJy9hZG1pbi9sb2dpbicpXVxuICogICB9XG4gKiBdO1xuICogYGBgXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBhdXRoR3VhcmQocmVkaXJlY3RUbz86IHN0cmluZyk6IENhbkFjdGl2YXRlRm4ge1xuICByZXR1cm4gKCk6IGJvb2xlYW4gfCBVcmxUcmVlID0+IHtcbiAgICBjb25zdCBhdXRoID0gaW5qZWN0KEF1dGhTZXJ2aWNlKTtcbiAgICBjb25zdCByb3V0ZXIgPSBpbmplY3QoUm91dGVyKTtcbiAgICBjb25zdCBjb25maWcgPSBpbmplY3QoTkFVVEhfQ0xJRU5UX0NPTkZJRywgeyBvcHRpb25hbDogdHJ1ZSB9KTtcblxuICAgIGlmIChhdXRoLmlzQXV0aGVudGljYXRlZCgpKSB7XG4gICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9XG5cbiAgICAvLyBVc2UgcHJvdmlkZWQgcmVkaXJlY3RUbywgb3IgY29uZmlnLnJlZGlyZWN0cy5zZXNzaW9uRXhwaXJlZCwgb3IgZGVmYXVsdCB0byAnL2xvZ2luJ1xuICAgIGNvbnN0IHJlZGlyZWN0UGF0aCA9XG4gICAgICByZWRpcmVjdFRvID8/IGNvbmZpZz8ucmVkaXJlY3RzPy5zZXNzaW9uRXhwaXJlZCA/PyAnL2xvZ2luJztcblxuICAgIHJldHVybiByb3V0ZXIuY3JlYXRlVXJsVHJlZShbcmVkaXJlY3RQYXRoXSk7XG4gIH07XG59XG5cbi8qKlxuICogQ2xhc3MtYmFzZWQgYXV0aGVudGljYXRpb24gZ3VhcmQgZm9yIE5nTW9kdWxlIGNvbXBhdGliaWxpdHkuXG4gKlxuICogQGV4YW1wbGVcbiAqIGBgYHR5cGVzY3JpcHRcbiAqIC8vIEluIHJvdXRlIGNvbmZpZ3VyYXRpb24gKE5nTW9kdWxlKVxuICogY29uc3Qgcm91dGVzOiBSb3V0ZXMgPSBbXG4gKiAgIHtcbiAqICAgICBwYXRoOiAnaG9tZScsXG4gKiAgICAgY29tcG9uZW50OiBIb21lQ29tcG9uZW50LFxuICogICAgIGNhbkFjdGl2YXRlOiBbQXV0aEd1YXJkXVxuICogICB9XG4gKiBdO1xuICpcbiAqIC8vIEluIG1vZHVsZSBwcm92aWRlcnNcbiAqIEBOZ01vZHVsZSh7XG4gKiAgIHByb3ZpZGVyczogW0F1dGhHdWFyZF1cbiAqIH0pXG4gKiBgYGBcbiAqL1xuZXhwb3J0IGNsYXNzIEF1dGhHdWFyZCB7XG4gIC8qKlxuICAgKiBAcGFyYW0gYXV0aCAtIEF1dGhlbnRpY2F0aW9uIHNlcnZpY2VcbiAgICogQHBhcmFtIHJvdXRlciAtIEFuZ3VsYXIgcm91dGVyXG4gICAqIEBwYXJhbSBjb25maWcgLSBPcHRpb25hbCBjbGllbnQgY29uZmlndXJhdGlvbiAoaW5qZWN0ZWQgYXV0b21hdGljYWxseSlcbiAgICovXG4gIGNvbnN0cnVjdG9yKFxuICAgIHByaXZhdGUgYXV0aDogQXV0aFNlcnZpY2UsXG4gICAgcHJpdmF0ZSByb3V0ZXI6IFJvdXRlcixcbiAgICBAT3B0aW9uYWwoKSBASW5qZWN0KE5BVVRIX0NMSUVOVF9DT05GSUcpIHByaXZhdGUgY29uZmlnPzogTkF1dGhDbGllbnRDb25maWcsXG4gICkge31cblxuICAvKipcbiAgICogQ2hlY2sgaWYgcm91dGUgY2FuIGJlIGFjdGl2YXRlZC5cbiAgICpcbiAgICogQHJldHVybnMgVHJ1ZSBpZiBhdXRoZW50aWNhdGVkLCBvdGhlcndpc2UgcmVkaXJlY3RzIHRvIGNvbmZpZ3VyZWQgc2Vzc2lvbiBleHBpcmVkIHJvdXRlIChvciAnL2xvZ2luJylcbiAgICovXG4gIGNhbkFjdGl2YXRlKCk6IGJvb2xlYW4gfCBVcmxUcmVlIHtcbiAgICBpZiAodGhpcy5hdXRoLmlzQXV0aGVudGljYXRlZCgpKSB7XG4gICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9XG5cbiAgICAvLyBVc2UgY29uZmlnLnJlZGlyZWN0cy5zZXNzaW9uRXhwaXJlZCBvciBkZWZhdWx0IHRvICcvbG9naW4nXG4gICAgY29uc3QgcmVkaXJlY3RQYXRoID0gdGhpcy5jb25maWc/LnJlZGlyZWN0cz8uc2Vzc2lvbkV4cGlyZWQgPz8gJy9sb2dpbic7XG5cbiAgICByZXR1cm4gdGhpcy5yb3V0ZXIuY3JlYXRlVXJsVHJlZShbcmVkaXJlY3RQYXRoXSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -1,158 +0,0 @@
|
|
|
1
|
-
import { inject, PLATFORM_ID } from '@angular/core';
|
|
2
|
-
import { isPlatformBrowser } from '@angular/common';
|
|
3
|
-
import { HttpClient, HttpErrorResponse } from '@angular/common/http';
|
|
4
|
-
import { Router } from '@angular/router';
|
|
5
|
-
import { catchError, switchMap, throwError, filter, take, BehaviorSubject, from } from 'rxjs';
|
|
6
|
-
import { NAUTH_CLIENT_CONFIG } from './tokens';
|
|
7
|
-
import { AuthService } from './auth.service';
|
|
8
|
-
/**
|
|
9
|
-
* Refresh state management.
|
|
10
|
-
* BehaviorSubject pattern is the industry-standard for token refresh.
|
|
11
|
-
*/
|
|
12
|
-
let isRefreshing = false;
|
|
13
|
-
const refreshTokenSubject = new BehaviorSubject(null);
|
|
14
|
-
/**
|
|
15
|
-
* Track retried requests to prevent infinite loops.
|
|
16
|
-
*/
|
|
17
|
-
const retriedRequests = new WeakSet();
|
|
18
|
-
/**
|
|
19
|
-
* Get CSRF token from cookie.
|
|
20
|
-
*/
|
|
21
|
-
function getCsrfToken(cookieName) {
|
|
22
|
-
if (typeof document === 'undefined')
|
|
23
|
-
return null;
|
|
24
|
-
const match = document.cookie.match(new RegExp(`(^| )${cookieName}=([^;]+)`));
|
|
25
|
-
return match ? decodeURIComponent(match[2]) : null;
|
|
26
|
-
}
|
|
27
|
-
/**
|
|
28
|
-
* Angular HTTP interceptor for nauth-toolkit.
|
|
29
|
-
*
|
|
30
|
-
* Handles:
|
|
31
|
-
* - Cookies mode: withCredentials + CSRF tokens + refresh via POST
|
|
32
|
-
* - JSON mode: refresh via SDK, retry with new token
|
|
33
|
-
*/
|
|
34
|
-
export const authInterceptor = (req, next) => {
|
|
35
|
-
const config = inject(NAUTH_CLIENT_CONFIG);
|
|
36
|
-
const http = inject(HttpClient);
|
|
37
|
-
const authService = inject(AuthService);
|
|
38
|
-
const platformId = inject(PLATFORM_ID);
|
|
39
|
-
const router = inject(Router);
|
|
40
|
-
const isBrowser = isPlatformBrowser(platformId);
|
|
41
|
-
if (!isBrowser) {
|
|
42
|
-
return next(req);
|
|
43
|
-
}
|
|
44
|
-
const tokenDelivery = config.tokenDelivery;
|
|
45
|
-
const baseUrl = config.baseUrl;
|
|
46
|
-
const endpoints = config.endpoints ?? {};
|
|
47
|
-
const refreshPath = endpoints.refresh ?? '/refresh';
|
|
48
|
-
const loginPath = endpoints.login ?? '/login';
|
|
49
|
-
const signupPath = endpoints.signup ?? '/signup';
|
|
50
|
-
const socialExchangePath = endpoints.socialExchange ?? '/social/exchange';
|
|
51
|
-
const refreshUrl = `${baseUrl}${refreshPath}`;
|
|
52
|
-
const isAuthApiRequest = req.url.includes(baseUrl);
|
|
53
|
-
const isRefreshEndpoint = req.url.includes(refreshPath);
|
|
54
|
-
const isPublicEndpoint = req.url.includes(loginPath) || req.url.includes(signupPath) || req.url.includes(socialExchangePath);
|
|
55
|
-
// Build request with credentials (cookies mode only)
|
|
56
|
-
let authReq = req;
|
|
57
|
-
if (tokenDelivery === 'cookies') {
|
|
58
|
-
authReq = authReq.clone({ withCredentials: true });
|
|
59
|
-
if (['POST', 'PUT', 'PATCH', 'DELETE'].includes(req.method)) {
|
|
60
|
-
const csrfCookieName = config.csrf?.cookieName ?? 'nauth_csrf_token';
|
|
61
|
-
const csrfHeaderName = config.csrf?.headerName ?? 'x-csrf-token';
|
|
62
|
-
const csrfToken = getCsrfToken(csrfCookieName);
|
|
63
|
-
if (csrfToken) {
|
|
64
|
-
authReq = authReq.clone({ setHeaders: { [csrfHeaderName]: csrfToken } });
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
|
-
return next(authReq).pipe(catchError((error) => {
|
|
69
|
-
const shouldHandle = error instanceof HttpErrorResponse &&
|
|
70
|
-
error.status === 401 &&
|
|
71
|
-
isAuthApiRequest &&
|
|
72
|
-
!isRefreshEndpoint &&
|
|
73
|
-
!isPublicEndpoint &&
|
|
74
|
-
!retriedRequests.has(req);
|
|
75
|
-
if (!shouldHandle) {
|
|
76
|
-
return throwError(() => error);
|
|
77
|
-
}
|
|
78
|
-
if (config.debug) {
|
|
79
|
-
console.warn('[nauth-interceptor] 401 detected:', req.url);
|
|
80
|
-
}
|
|
81
|
-
if (!isRefreshing) {
|
|
82
|
-
isRefreshing = true;
|
|
83
|
-
refreshTokenSubject.next(null);
|
|
84
|
-
if (config.debug) {
|
|
85
|
-
console.warn('[nauth-interceptor] Starting refresh...');
|
|
86
|
-
}
|
|
87
|
-
// Refresh based on mode
|
|
88
|
-
const refresh$ = tokenDelivery === 'cookies'
|
|
89
|
-
? http.post(refreshUrl, {}, { withCredentials: true })
|
|
90
|
-
: from(authService.refresh());
|
|
91
|
-
return refresh$.pipe(switchMap((response) => {
|
|
92
|
-
if (config.debug) {
|
|
93
|
-
console.warn('[nauth-interceptor] Refresh successful');
|
|
94
|
-
}
|
|
95
|
-
isRefreshing = false;
|
|
96
|
-
// Get new token (JSON mode) or signal success (cookies mode)
|
|
97
|
-
const newToken = 'accessToken' in response ? response.accessToken : 'success';
|
|
98
|
-
refreshTokenSubject.next(newToken ?? 'success');
|
|
99
|
-
// Build retry request
|
|
100
|
-
const retryReq = buildRetryRequest(authReq, tokenDelivery, newToken);
|
|
101
|
-
retriedRequests.add(retryReq);
|
|
102
|
-
if (config.debug) {
|
|
103
|
-
console.warn('[nauth-interceptor] Retrying:', req.url);
|
|
104
|
-
}
|
|
105
|
-
return next(retryReq);
|
|
106
|
-
}), catchError((err) => {
|
|
107
|
-
if (config.debug) {
|
|
108
|
-
console.error('[nauth-interceptor] Refresh failed:', err);
|
|
109
|
-
}
|
|
110
|
-
isRefreshing = false;
|
|
111
|
-
refreshTokenSubject.next(null);
|
|
112
|
-
// Handle session expiration - redirect to configured URL
|
|
113
|
-
if (config.redirects?.sessionExpired) {
|
|
114
|
-
router.navigateByUrl(config.redirects.sessionExpired).catch((navError) => {
|
|
115
|
-
if (config.debug) {
|
|
116
|
-
console.error('[nauth-interceptor] Navigation failed:', navError);
|
|
117
|
-
}
|
|
118
|
-
});
|
|
119
|
-
}
|
|
120
|
-
return throwError(() => err);
|
|
121
|
-
}));
|
|
122
|
-
}
|
|
123
|
-
else {
|
|
124
|
-
// Wait for ongoing refresh
|
|
125
|
-
if (config.debug) {
|
|
126
|
-
console.warn('[nauth-interceptor] Waiting for refresh...');
|
|
127
|
-
}
|
|
128
|
-
return refreshTokenSubject.pipe(filter((token) => token !== null), take(1), switchMap((token) => {
|
|
129
|
-
if (config.debug) {
|
|
130
|
-
console.warn('[nauth-interceptor] Refresh done, retrying:', req.url);
|
|
131
|
-
}
|
|
132
|
-
const retryReq = buildRetryRequest(authReq, tokenDelivery, token);
|
|
133
|
-
retriedRequests.add(retryReq);
|
|
134
|
-
return next(retryReq);
|
|
135
|
-
}));
|
|
136
|
-
}
|
|
137
|
-
}));
|
|
138
|
-
};
|
|
139
|
-
/**
|
|
140
|
-
* Build retry request with appropriate auth.
|
|
141
|
-
*/
|
|
142
|
-
function buildRetryRequest(originalReq, tokenDelivery, newToken) {
|
|
143
|
-
if (tokenDelivery === 'json' && newToken && newToken !== 'success') {
|
|
144
|
-
return originalReq.clone({
|
|
145
|
-
setHeaders: { Authorization: `Bearer ${newToken}` },
|
|
146
|
-
});
|
|
147
|
-
}
|
|
148
|
-
return originalReq.clone();
|
|
149
|
-
}
|
|
150
|
-
/**
|
|
151
|
-
* Class-based interceptor for NgModule compatibility.
|
|
152
|
-
*/
|
|
153
|
-
export class AuthInterceptor {
|
|
154
|
-
intercept(req, next) {
|
|
155
|
-
return authInterceptor(req, next);
|
|
156
|
-
}
|
|
157
|
-
}
|
|
158
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth.interceptor.js","sourceRoot":"","sources":["../../../standalone/auth.interceptor.ts"],"names":[],"mappings":"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","sourcesContent":["import { inject, PLATFORM_ID } from '@angular/core';\nimport { isPlatformBrowser } from '@angular/common';\nimport { HttpHandlerFn, HttpInterceptorFn, HttpRequest, HttpClient, HttpErrorResponse } from '@angular/common/http';\nimport { Router } from '@angular/router';\nimport { catchError, switchMap, throwError, filter, take, BehaviorSubject, from } from 'rxjs';\nimport { NAUTH_CLIENT_CONFIG } from './tokens';\nimport { AuthService } from './auth.service';\n\n/**\n * Refresh state management.\n * BehaviorSubject pattern is the industry-standard for token refresh.\n */\nlet isRefreshing = false;\nconst refreshTokenSubject = new BehaviorSubject<string | null>(null);\n\n/**\n * Track retried requests to prevent infinite loops.\n */\nconst retriedRequests = new WeakSet<HttpRequest<unknown>>();\n\n/**\n * Get CSRF token from cookie.\n */\nfunction getCsrfToken(cookieName: string): string | null {\n  if (typeof document === 'undefined') return null;\n  const match = document.cookie.match(new RegExp(`(^| )${cookieName}=([^;]+)`));\n  return match ? decodeURIComponent(match[2]) : null;\n}\n\n/**\n * Angular HTTP interceptor for nauth-toolkit.\n *\n * Handles:\n * - Cookies mode: withCredentials + CSRF tokens + refresh via POST\n * - JSON mode: refresh via SDK, retry with new token\n */\nexport const authInterceptor: HttpInterceptorFn = (req: HttpRequest<unknown>, next: HttpHandlerFn) => {\n  const config = inject(NAUTH_CLIENT_CONFIG);\n  const http = inject(HttpClient);\n  const authService = inject(AuthService);\n  const platformId = inject(PLATFORM_ID);\n  const router = inject(Router);\n  const isBrowser = isPlatformBrowser(platformId);\n\n  if (!isBrowser) {\n    return next(req);\n  }\n\n  const tokenDelivery = config.tokenDelivery;\n  const baseUrl = config.baseUrl;\n  const endpoints = config.endpoints ?? {};\n  const refreshPath = endpoints.refresh ?? '/refresh';\n  const loginPath = endpoints.login ?? '/login';\n  const signupPath = endpoints.signup ?? '/signup';\n  const socialExchangePath = endpoints.socialExchange ?? '/social/exchange';\n  const refreshUrl = `${baseUrl}${refreshPath}`;\n\n  const isAuthApiRequest = req.url.includes(baseUrl);\n  const isRefreshEndpoint = req.url.includes(refreshPath);\n  const isPublicEndpoint =\n    req.url.includes(loginPath) || req.url.includes(signupPath) || req.url.includes(socialExchangePath);\n\n  // Build request with credentials (cookies mode only)\n  let authReq = req;\n  if (tokenDelivery === 'cookies') {\n    authReq = authReq.clone({ withCredentials: true });\n\n    if (['POST', 'PUT', 'PATCH', 'DELETE'].includes(req.method)) {\n      const csrfCookieName = config.csrf?.cookieName ?? 'nauth_csrf_token';\n      const csrfHeaderName = config.csrf?.headerName ?? 'x-csrf-token';\n      const csrfToken = getCsrfToken(csrfCookieName);\n      if (csrfToken) {\n        authReq = authReq.clone({ setHeaders: { [csrfHeaderName]: csrfToken } });\n      }\n    }\n  }\n\n  return next(authReq).pipe(\n    catchError((error: unknown) => {\n      const shouldHandle =\n        error instanceof HttpErrorResponse &&\n        error.status === 401 &&\n        isAuthApiRequest &&\n        !isRefreshEndpoint &&\n        !isPublicEndpoint &&\n        !retriedRequests.has(req);\n\n      if (!shouldHandle) {\n        return throwError(() => error);\n      }\n\n      if (config.debug) {\n        console.warn('[nauth-interceptor] 401 detected:', req.url);\n      }\n\n      if (!isRefreshing) {\n        isRefreshing = true;\n        refreshTokenSubject.next(null);\n\n        if (config.debug) {\n          console.warn('[nauth-interceptor] Starting refresh...');\n        }\n\n        // Refresh based on mode\n        const refresh$ =\n          tokenDelivery === 'cookies'\n            ? http.post<{ accessToken?: string }>(refreshUrl, {}, { withCredentials: true })\n            : from(authService.refresh());\n\n        return refresh$.pipe(\n          switchMap((response) => {\n            if (config.debug) {\n              console.warn('[nauth-interceptor] Refresh successful');\n            }\n            isRefreshing = false;\n\n            // Get new token (JSON mode) or signal success (cookies mode)\n            const newToken = 'accessToken' in response ? response.accessToken : 'success';\n            refreshTokenSubject.next(newToken ?? 'success');\n\n            // Build retry request\n            const retryReq = buildRetryRequest(authReq, tokenDelivery, newToken);\n            retriedRequests.add(retryReq);\n\n            if (config.debug) {\n              console.warn('[nauth-interceptor] Retrying:', req.url);\n            }\n            return next(retryReq);\n          }),\n          catchError((err) => {\n            if (config.debug) {\n              console.error('[nauth-interceptor] Refresh failed:', err);\n            }\n            isRefreshing = false;\n            refreshTokenSubject.next(null);\n\n            // Handle session expiration - redirect to configured URL\n            if (config.redirects?.sessionExpired) {\n              router.navigateByUrl(config.redirects.sessionExpired).catch((navError) => {\n                if (config.debug) {\n                  console.error('[nauth-interceptor] Navigation failed:', navError);\n                }\n              });\n            }\n\n            return throwError(() => err);\n          }),\n        );\n      } else {\n        // Wait for ongoing refresh\n        if (config.debug) {\n          console.warn('[nauth-interceptor] Waiting for refresh...');\n        }\n        return refreshTokenSubject.pipe(\n          filter((token): token is string => token !== null),\n          take(1),\n          switchMap((token) => {\n            if (config.debug) {\n              console.warn('[nauth-interceptor] Refresh done, retrying:', req.url);\n            }\n            const retryReq = buildRetryRequest(authReq, tokenDelivery, token);\n            retriedRequests.add(retryReq);\n            return next(retryReq);\n          }),\n        );\n      }\n    }),\n  );\n};\n\n/**\n * Build retry request with appropriate auth.\n */\nfunction buildRetryRequest(\n  originalReq: HttpRequest<unknown>,\n  tokenDelivery: string,\n  newToken?: string,\n): HttpRequest<unknown> {\n  if (tokenDelivery === 'json' && newToken && newToken !== 'success') {\n    return originalReq.clone({\n      setHeaders: { Authorization: `Bearer ${newToken}` },\n    });\n  }\n  return originalReq.clone();\n}\n\n/**\n * Class-based interceptor for NgModule compatibility.\n */\nexport class AuthInterceptor {\n  intercept(req: HttpRequest<unknown>, next: HttpHandlerFn) {\n    return authInterceptor(req, next);\n  }\n}\n"]}
|