valtech-components 4.0.42 → 4.0.43
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/lib/services/auth/oauth-callback.component.mjs +53 -5
- package/esm2022/lib/version.mjs +2 -2
- package/fesm2022/valtech-components.mjs +49 -4
- package/fesm2022/valtech-components.mjs.map +1 -1
- package/lib/services/auth/oauth-callback.component.d.ts +21 -1
- package/lib/version.d.ts +1 -1
- package/package.json +1 -1
|
@@ -1,7 +1,10 @@
|
|
|
1
|
-
import { Component } from '@angular/core';
|
|
1
|
+
import { Component, Inject, Optional } from '@angular/core';
|
|
2
2
|
import { CommonModule } from '@angular/common';
|
|
3
|
+
import { VALTECH_AUTH_CONFIG } from './config';
|
|
3
4
|
import { SplashComponent } from '../../components/atoms/splash/splash.component';
|
|
4
5
|
import * as i0 from "@angular/core";
|
|
6
|
+
import * as i1 from "@angular/router";
|
|
7
|
+
import * as i2 from "./auth.service";
|
|
5
8
|
/**
|
|
6
9
|
* Componente de callback para OAuth.
|
|
7
10
|
*
|
|
@@ -26,7 +29,10 @@ import * as i0 from "@angular/core";
|
|
|
26
29
|
* `/auth/oauth/callback?error=INVALID_CODE&error_description=...`
|
|
27
30
|
*/
|
|
28
31
|
export class OAuthCallbackComponent {
|
|
29
|
-
constructor() {
|
|
32
|
+
constructor(router, authService, config) {
|
|
33
|
+
this.router = router;
|
|
34
|
+
this.authService = authService;
|
|
35
|
+
this.config = config;
|
|
30
36
|
this.message = 'Procesando autenticación...';
|
|
31
37
|
/**
|
|
32
38
|
* Nonce que el opener generó y pasó por el flujo (round-trip backend). Se
|
|
@@ -38,6 +44,36 @@ export class OAuthCallbackComponent {
|
|
|
38
44
|
ngOnInit() {
|
|
39
45
|
this.processCallback();
|
|
40
46
|
}
|
|
47
|
+
/**
|
|
48
|
+
* Indica si este callback corre como la VENTANA PRINCIPAL (flujo redirect),
|
|
49
|
+
* no como popup. El popup se abre con window.name 'oauth'/'oauth-link'
|
|
50
|
+
* (OAuthService), nombre que persiste aunque COOP anule window.opener tras el
|
|
51
|
+
* bounce cross-origin. En la ventana principal nadie consume el localStorage,
|
|
52
|
+
* así que el callback debe instalar la sesión y navegar él mismo.
|
|
53
|
+
*/
|
|
54
|
+
isMainWindow() {
|
|
55
|
+
if (window.name === 'oauth' || window.name === 'oauth-link')
|
|
56
|
+
return false;
|
|
57
|
+
return !window.opener && window.parent === window;
|
|
58
|
+
}
|
|
59
|
+
/**
|
|
60
|
+
* Completa el login en la ventana principal: instala la sesión desde los
|
|
61
|
+
* tokens del callback y navega al home.
|
|
62
|
+
*/
|
|
63
|
+
completeInMainWindow(result) {
|
|
64
|
+
if (!this.authService)
|
|
65
|
+
return false;
|
|
66
|
+
this.authService.setExternalAuth({
|
|
67
|
+
accessToken: result.accessToken,
|
|
68
|
+
refreshToken: result.refreshToken,
|
|
69
|
+
firebaseToken: result.firebaseToken,
|
|
70
|
+
expiresIn: result.expiresIn,
|
|
71
|
+
roles: result.roles,
|
|
72
|
+
permissions: result.permissions,
|
|
73
|
+
});
|
|
74
|
+
this.router.navigateByUrl(this.config?.homeRoute || '/', { replaceUrl: true });
|
|
75
|
+
return true;
|
|
76
|
+
}
|
|
41
77
|
processCallback() {
|
|
42
78
|
const params = new URLSearchParams(window.location.search);
|
|
43
79
|
this.clientNonce = params.get('client_nonce');
|
|
@@ -135,6 +171,11 @@ export class OAuthCallbackComponent {
|
|
|
135
171
|
type: 'oauth-callback',
|
|
136
172
|
tokens: result,
|
|
137
173
|
});
|
|
174
|
+
// Flujo redirect (ventana principal, sin opener que consuma el localStorage):
|
|
175
|
+
// instalar la sesión acá mismo y navegar al home, en vez de quedar pegado.
|
|
176
|
+
if (this.isMainWindow() && this.completeInMainWindow(result)) {
|
|
177
|
+
return;
|
|
178
|
+
}
|
|
138
179
|
this.message = 'Autenticación exitosa';
|
|
139
180
|
this.closeAfterDelay();
|
|
140
181
|
}
|
|
@@ -180,7 +221,7 @@ export class OAuthCallbackComponent {
|
|
|
180
221
|
}
|
|
181
222
|
}, 500);
|
|
182
223
|
}
|
|
183
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: OAuthCallbackComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
|
|
224
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: OAuthCallbackComponent, deps: [{ token: i1.Router }, { token: i2.AuthService, optional: true }, { token: VALTECH_AUTH_CONFIG, optional: true }], target: i0.ɵɵFactoryTarget.Component }); }
|
|
184
225
|
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.2.14", type: OAuthCallbackComponent, isStandalone: true, selector: "val-oauth-callback", ngImport: i0, template: `<val-splash />`, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "component", type: SplashComponent, selector: "val-splash", inputs: ["logoLight", "logoDark", "alt"] }] }); }
|
|
185
226
|
}
|
|
186
227
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: OAuthCallbackComponent, decorators: [{
|
|
@@ -193,5 +234,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.14", ngImpo
|
|
|
193
234
|
// casi-duplicado: el callback OAuth es una carga fundamental y debe verse igual.
|
|
194
235
|
template: `<val-splash />`,
|
|
195
236
|
}]
|
|
196
|
-
}] }
|
|
197
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"oauth-callback.component.js","sourceRoot":"","sources":["../../../../../../src/lib/services/auth/oauth-callback.component.ts"],"names":[],"mappings":"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","sourcesContent":["import { Component, OnInit } from '@angular/core';\nimport { CommonModule } from '@angular/common';\nimport { MFAMethod, OAuthCallbackData, OAuthResult, OAuthError } from './types';\nimport { SplashComponent } from '../../components/atoms/splash/splash.component';\n\n/**\n * Componente de callback para OAuth.\n *\n * Este componente procesa la respuesta del servidor OAuth y envía\n * los tokens a la ventana padre via postMessage.\n *\n * Debe agregarse a las rutas de la aplicación:\n * ```typescript\n * // app.routes.ts\n * import { OAuthCallbackComponent } from 'valtech-components';\n *\n * export const routes: Routes = [\n *   { path: 'auth/oauth/callback', component: OAuthCallbackComponent },\n *   // ... otras rutas\n * ];\n * ```\n *\n * El backend redirige a esta ruta con los tokens en query params:\n * `/auth/oauth/callback?access_token=xxx&refresh_token=xxx&expires_in=900`\n *\n * O con error:\n * `/auth/oauth/callback?error=INVALID_CODE&error_description=...`\n */\n@Component({\n  selector: 'val-oauth-callback',\n  standalone: true,\n  imports: [CommonModule, SplashComponent],\n  // Mismo splash de arranque de la app (logo + pulse) en vez de un loader propio\n  // casi-duplicado: el callback OAuth es una carga fundamental y debe verse igual.\n  template: `<val-splash />`,\n})\nexport class OAuthCallbackComponent implements OnInit {\n  message = 'Procesando autenticación...';\n\n  /**\n   * Nonce que el opener generó y pasó por el flujo (round-trip backend). Se\n   * reenvía al opener en cada mensaje para que verifique el origen del callback\n   * y rechace un oauth_callback_data forjado en localStorage por XSS (M-07).\n   */\n  private clientNonce: string | null = null;\n\n  ngOnInit(): void {\n    this.processCallback();\n  }\n\n  private processCallback(): void {\n    const params = new URLSearchParams(window.location.search);\n    this.clientNonce = params.get('client_nonce');\n\n    // DEBUG: Log all received params\n    console.log('[OAuthCallback] URL params received:', {\n      url: window.location.href,\n      hasAccessToken: params.has('access_token'),\n      hasRefreshToken: params.has('refresh_token'),\n      hasFirebaseToken: params.has('firebase_token'),\n      firebaseTokenLength: params.get('firebase_token')?.length || 0,\n      error: params.get('error'),\n    });\n\n    // Verificar si hay error\n    const error = params.get('error');\n    if (error) {\n      this.sendToParent({\n        type: 'oauth-callback',\n        error: {\n          code: error,\n          message: params.get('error_description') || 'Error de autenticación',\n        } as OAuthError,\n      });\n      this.message = 'Error de autenticación';\n      this.closeAfterDelay();\n      return;\n    }\n\n    // MFA requerido — el backend redirige sin tokens, con mfa_token. El flujo\n    // continúa con el challenge MFA (AuthService.setMFAPending → modal verify).\n    if (params.get('mfa_required') === 'true') {\n      this.sendToParent({\n        type: 'oauth-callback',\n        tokens: {\n          accessToken: '',\n          refreshToken: '',\n          expiresIn: 0,\n          mfaRequired: true,\n          mfaToken: params.get('mfa_token') || undefined,\n          mfaMethod: (params.get('mfa_method') as MFAMethod) || undefined,\n        },\n      });\n      this.message = 'Verificación adicional requerida';\n      this.closeAfterDelay();\n      return;\n    }\n\n    // Extraer tokens\n    const accessToken = params.get('access_token');\n    const refreshToken = params.get('refresh_token');\n    const expiresIn = params.get('expires_in');\n    const firebaseToken = params.get('firebase_token');\n\n    if (!accessToken || !refreshToken) {\n      this.sendToParent({\n        type: 'oauth-callback',\n        error: {\n          code: 'MISSING_TOKENS',\n          message: 'No se recibieron los tokens de autenticación',\n        } as OAuthError,\n      });\n      this.message = 'Error: tokens no recibidos';\n      this.closeAfterDelay();\n      return;\n    }\n\n    // Extraer roles y permisos (pueden venir como JSON en base64)\n    let roles: string[] | undefined;\n    let permissions: string[] | undefined;\n\n    const rolesParam = params.get('roles');\n    const permissionsParam = params.get('permissions');\n\n    if (rolesParam) {\n      try {\n        roles = JSON.parse(atob(rolesParam));\n      } catch {\n        roles = rolesParam.split(',');\n      }\n    }\n\n    if (permissionsParam) {\n      try {\n        permissions = JSON.parse(atob(permissionsParam));\n      } catch {\n        permissions = permissionsParam.split(',');\n      }\n    }\n\n    // Enviar tokens a la ventana padre\n    const result: OAuthResult = {\n      accessToken,\n      refreshToken,\n      expiresIn: expiresIn ? parseInt(expiresIn, 10) : 900,\n      firebaseToken: firebaseToken || undefined,\n      roles,\n      permissions,\n      isNewUser: params.get('is_new_user') === 'true',\n      linked: params.get('linked') === 'true',\n    };\n\n    this.sendToParent({\n      type: 'oauth-callback',\n      tokens: result,\n    });\n\n    this.message = 'Autenticación exitosa';\n    this.closeAfterDelay();\n  }\n\n  private sendToParent(data: OAuthCallbackData): void {\n    // Adjuntar el nonce del opener (M-07) a TODO mensaje (success, MFA, error)\n    // para que el opener verifique que el callback es de su propio flujo.\n    if (this.clientNonce) {\n      data.nonce = this.clientNonce;\n    }\n\n    // Siempre guardar en localStorage como fallback (para COOP issues)\n    try {\n      localStorage.setItem('oauth_callback_data', JSON.stringify(data));\n      localStorage.setItem('oauth_callback_timestamp', Date.now().toString());\n      console.log('[OAuthCallback] Saved to localStorage as fallback');\n    } catch (e) {\n      console.warn('[OAuthCallback] Could not save to localStorage:', e);\n    }\n\n    // Intentar postMessage (puede fallar por COOP)\n    try {\n      if (window.opener && !window.opener.closed) {\n        window.opener.postMessage(data, window.location.origin);\n        console.log('[OAuthCallback] postMessage sent to opener');\n      } else if (window.parent !== window) {\n        window.parent.postMessage(data, window.location.origin);\n        console.log('[OAuthCallback] postMessage sent to parent');\n      } else {\n        console.log('[OAuthCallback] No opener/parent available, using localStorage only');\n      }\n    } catch (e) {\n      // COOP blocks postMessage - localStorage fallback already saved\n      console.warn('[OAuthCallback] postMessage blocked (COOP), using localStorage fallback:', e);\n    }\n  }\n\n  private closeAfterDelay(): void {\n    // Dar tiempo para que el mensaje se envíe antes de cerrar\n    setTimeout(() => {\n      if (window.opener) {\n        window.close();\n      }\n    }, 500);\n  }\n}\n"]}
|
|
237
|
+
}], ctorParameters: () => [{ type: i1.Router }, { type: i2.AuthService, decorators: [{
|
|
238
|
+
type: Optional
|
|
239
|
+
}] }, { type: undefined, decorators: [{
|
|
240
|
+
type: Optional
|
|
241
|
+
}, {
|
|
242
|
+
type: Inject,
|
|
243
|
+
args: [VALTECH_AUTH_CONFIG]
|
|
244
|
+
}] }] });
|
|
245
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"oauth-callback.component.js","sourceRoot":"","sources":["../../../../../../src/lib/services/auth/oauth-callback.component.ts"],"names":[],"mappings":"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","sourcesContent":["import { Component, Inject, OnInit, Optional } from '@angular/core';\nimport { CommonModule } from '@angular/common';\nimport { Router } from '@angular/router';\nimport { MFAMethod, OAuthCallbackData, OAuthResult, OAuthError, ValtechAuthConfig } from './types';\nimport { VALTECH_AUTH_CONFIG } from './config';\nimport { AuthService } from './auth.service';\nimport { SplashComponent } from '../../components/atoms/splash/splash.component';\n\n/**\n * Componente de callback para OAuth.\n *\n * Este componente procesa la respuesta del servidor OAuth y envía\n * los tokens a la ventana padre via postMessage.\n *\n * Debe agregarse a las rutas de la aplicación:\n * ```typescript\n * // app.routes.ts\n * import { OAuthCallbackComponent } from 'valtech-components';\n *\n * export const routes: Routes = [\n *   { path: 'auth/oauth/callback', component: OAuthCallbackComponent },\n *   // ... otras rutas\n * ];\n * ```\n *\n * El backend redirige a esta ruta con los tokens en query params:\n * `/auth/oauth/callback?access_token=xxx&refresh_token=xxx&expires_in=900`\n *\n * O con error:\n * `/auth/oauth/callback?error=INVALID_CODE&error_description=...`\n */\n@Component({\n  selector: 'val-oauth-callback',\n  standalone: true,\n  imports: [CommonModule, SplashComponent],\n  // Mismo splash de arranque de la app (logo + pulse) en vez de un loader propio\n  // casi-duplicado: el callback OAuth es una carga fundamental y debe verse igual.\n  template: `<val-splash />`,\n})\nexport class OAuthCallbackComponent implements OnInit {\n  message = 'Procesando autenticación...';\n\n  /**\n   * Nonce que el opener generó y pasó por el flujo (round-trip backend). Se\n   * reenvía al opener en cada mensaje para que verifique el origen del callback\n   * y rechace un oauth_callback_data forjado en localStorage por XSS (M-07).\n   */\n  private clientNonce: string | null = null;\n\n  constructor(\n    private router: Router,\n    @Optional() private authService: AuthService | null,\n    @Optional() @Inject(VALTECH_AUTH_CONFIG) private config: ValtechAuthConfig | null\n  ) {}\n\n  ngOnInit(): void {\n    this.processCallback();\n  }\n\n  /**\n   * Indica si este callback corre como la VENTANA PRINCIPAL (flujo redirect),\n   * no como popup. El popup se abre con window.name 'oauth'/'oauth-link'\n   * (OAuthService), nombre que persiste aunque COOP anule window.opener tras el\n   * bounce cross-origin. En la ventana principal nadie consume el localStorage,\n   * así que el callback debe instalar la sesión y navegar él mismo.\n   */\n  private isMainWindow(): boolean {\n    if (window.name === 'oauth' || window.name === 'oauth-link') return false;\n    return !window.opener && window.parent === window;\n  }\n\n  /**\n   * Completa el login en la ventana principal: instala la sesión desde los\n   * tokens del callback y navega al home.\n   */\n  private completeInMainWindow(result: OAuthResult): boolean {\n    if (!this.authService) return false;\n    this.authService.setExternalAuth({\n      accessToken: result.accessToken,\n      refreshToken: result.refreshToken,\n      firebaseToken: result.firebaseToken,\n      expiresIn: result.expiresIn,\n      roles: result.roles,\n      permissions: result.permissions,\n    });\n    this.router.navigateByUrl(this.config?.homeRoute || '/', { replaceUrl: true });\n    return true;\n  }\n\n  private processCallback(): void {\n    const params = new URLSearchParams(window.location.search);\n    this.clientNonce = params.get('client_nonce');\n\n    // DEBUG: Log all received params\n    console.log('[OAuthCallback] URL params received:', {\n      url: window.location.href,\n      hasAccessToken: params.has('access_token'),\n      hasRefreshToken: params.has('refresh_token'),\n      hasFirebaseToken: params.has('firebase_token'),\n      firebaseTokenLength: params.get('firebase_token')?.length || 0,\n      error: params.get('error'),\n    });\n\n    // Verificar si hay error\n    const error = params.get('error');\n    if (error) {\n      this.sendToParent({\n        type: 'oauth-callback',\n        error: {\n          code: error,\n          message: params.get('error_description') || 'Error de autenticación',\n        } as OAuthError,\n      });\n      this.message = 'Error de autenticación';\n      this.closeAfterDelay();\n      return;\n    }\n\n    // MFA requerido — el backend redirige sin tokens, con mfa_token. El flujo\n    // continúa con el challenge MFA (AuthService.setMFAPending → modal verify).\n    if (params.get('mfa_required') === 'true') {\n      this.sendToParent({\n        type: 'oauth-callback',\n        tokens: {\n          accessToken: '',\n          refreshToken: '',\n          expiresIn: 0,\n          mfaRequired: true,\n          mfaToken: params.get('mfa_token') || undefined,\n          mfaMethod: (params.get('mfa_method') as MFAMethod) || undefined,\n        },\n      });\n      this.message = 'Verificación adicional requerida';\n      this.closeAfterDelay();\n      return;\n    }\n\n    // Extraer tokens\n    const accessToken = params.get('access_token');\n    const refreshToken = params.get('refresh_token');\n    const expiresIn = params.get('expires_in');\n    const firebaseToken = params.get('firebase_token');\n\n    if (!accessToken || !refreshToken) {\n      this.sendToParent({\n        type: 'oauth-callback',\n        error: {\n          code: 'MISSING_TOKENS',\n          message: 'No se recibieron los tokens de autenticación',\n        } as OAuthError,\n      });\n      this.message = 'Error: tokens no recibidos';\n      this.closeAfterDelay();\n      return;\n    }\n\n    // Extraer roles y permisos (pueden venir como JSON en base64)\n    let roles: string[] | undefined;\n    let permissions: string[] | undefined;\n\n    const rolesParam = params.get('roles');\n    const permissionsParam = params.get('permissions');\n\n    if (rolesParam) {\n      try {\n        roles = JSON.parse(atob(rolesParam));\n      } catch {\n        roles = rolesParam.split(',');\n      }\n    }\n\n    if (permissionsParam) {\n      try {\n        permissions = JSON.parse(atob(permissionsParam));\n      } catch {\n        permissions = permissionsParam.split(',');\n      }\n    }\n\n    // Enviar tokens a la ventana padre\n    const result: OAuthResult = {\n      accessToken,\n      refreshToken,\n      expiresIn: expiresIn ? parseInt(expiresIn, 10) : 900,\n      firebaseToken: firebaseToken || undefined,\n      roles,\n      permissions,\n      isNewUser: params.get('is_new_user') === 'true',\n      linked: params.get('linked') === 'true',\n    };\n\n    this.sendToParent({\n      type: 'oauth-callback',\n      tokens: result,\n    });\n\n    // Flujo redirect (ventana principal, sin opener que consuma el localStorage):\n    // instalar la sesión acá mismo y navegar al home, en vez de quedar pegado.\n    if (this.isMainWindow() && this.completeInMainWindow(result)) {\n      return;\n    }\n\n    this.message = 'Autenticación exitosa';\n    this.closeAfterDelay();\n  }\n\n  private sendToParent(data: OAuthCallbackData): void {\n    // Adjuntar el nonce del opener (M-07) a TODO mensaje (success, MFA, error)\n    // para que el opener verifique que el callback es de su propio flujo.\n    if (this.clientNonce) {\n      data.nonce = this.clientNonce;\n    }\n\n    // Siempre guardar en localStorage como fallback (para COOP issues)\n    try {\n      localStorage.setItem('oauth_callback_data', JSON.stringify(data));\n      localStorage.setItem('oauth_callback_timestamp', Date.now().toString());\n      console.log('[OAuthCallback] Saved to localStorage as fallback');\n    } catch (e) {\n      console.warn('[OAuthCallback] Could not save to localStorage:', e);\n    }\n\n    // Intentar postMessage (puede fallar por COOP)\n    try {\n      if (window.opener && !window.opener.closed) {\n        window.opener.postMessage(data, window.location.origin);\n        console.log('[OAuthCallback] postMessage sent to opener');\n      } else if (window.parent !== window) {\n        window.parent.postMessage(data, window.location.origin);\n        console.log('[OAuthCallback] postMessage sent to parent');\n      } else {\n        console.log('[OAuthCallback] No opener/parent available, using localStorage only');\n      }\n    } catch (e) {\n      // COOP blocks postMessage - localStorage fallback already saved\n      console.warn('[OAuthCallback] postMessage blocked (COOP), using localStorage fallback:', e);\n    }\n  }\n\n  private closeAfterDelay(): void {\n    // Dar tiempo para que el mensaje se envíe antes de cerrar\n    setTimeout(() => {\n      if (window.opener) {\n        window.close();\n      }\n    }, 500);\n  }\n}\n"]}
|
package/esm2022/lib/version.mjs
CHANGED
|
@@ -2,5 +2,5 @@
|
|
|
2
2
|
* Current version of valtech-components.
|
|
3
3
|
* This is automatically updated during the publish process.
|
|
4
4
|
*/
|
|
5
|
-
export const VERSION = '4.0.
|
|
6
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
5
|
+
export const VERSION = '4.0.43';
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9saWIvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7O0dBR0c7QUFDSCxNQUFNLENBQUMsTUFBTSxPQUFPLEdBQUcsUUFBUSxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBDdXJyZW50IHZlcnNpb24gb2YgdmFsdGVjaC1jb21wb25lbnRzLlxuICogVGhpcyBpcyBhdXRvbWF0aWNhbGx5IHVwZGF0ZWQgZHVyaW5nIHRoZSBwdWJsaXNoIHByb2Nlc3MuXG4gKi9cbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gJzQuMC40Myc7XG4iXX0=
|
|
@@ -56,7 +56,7 @@ import { BrowserMultiFormatReader } from '@zxing/browser';
|
|
|
56
56
|
* Current version of valtech-components.
|
|
57
57
|
* This is automatically updated during the publish process.
|
|
58
58
|
*/
|
|
59
|
-
const VERSION = '4.0.
|
|
59
|
+
const VERSION = '4.0.43';
|
|
60
60
|
|
|
61
61
|
// Control de estado de refresco (singleton a nivel de módulo)
|
|
62
62
|
let isRefreshing = false;
|
|
@@ -33036,7 +33036,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.14", ngImpo
|
|
|
33036
33036
|
* `/auth/oauth/callback?error=INVALID_CODE&error_description=...`
|
|
33037
33037
|
*/
|
|
33038
33038
|
class OAuthCallbackComponent {
|
|
33039
|
-
constructor() {
|
|
33039
|
+
constructor(router, authService, config) {
|
|
33040
|
+
this.router = router;
|
|
33041
|
+
this.authService = authService;
|
|
33042
|
+
this.config = config;
|
|
33040
33043
|
this.message = 'Procesando autenticación...';
|
|
33041
33044
|
/**
|
|
33042
33045
|
* Nonce que el opener generó y pasó por el flujo (round-trip backend). Se
|
|
@@ -33048,6 +33051,36 @@ class OAuthCallbackComponent {
|
|
|
33048
33051
|
ngOnInit() {
|
|
33049
33052
|
this.processCallback();
|
|
33050
33053
|
}
|
|
33054
|
+
/**
|
|
33055
|
+
* Indica si este callback corre como la VENTANA PRINCIPAL (flujo redirect),
|
|
33056
|
+
* no como popup. El popup se abre con window.name 'oauth'/'oauth-link'
|
|
33057
|
+
* (OAuthService), nombre que persiste aunque COOP anule window.opener tras el
|
|
33058
|
+
* bounce cross-origin. En la ventana principal nadie consume el localStorage,
|
|
33059
|
+
* así que el callback debe instalar la sesión y navegar él mismo.
|
|
33060
|
+
*/
|
|
33061
|
+
isMainWindow() {
|
|
33062
|
+
if (window.name === 'oauth' || window.name === 'oauth-link')
|
|
33063
|
+
return false;
|
|
33064
|
+
return !window.opener && window.parent === window;
|
|
33065
|
+
}
|
|
33066
|
+
/**
|
|
33067
|
+
* Completa el login en la ventana principal: instala la sesión desde los
|
|
33068
|
+
* tokens del callback y navega al home.
|
|
33069
|
+
*/
|
|
33070
|
+
completeInMainWindow(result) {
|
|
33071
|
+
if (!this.authService)
|
|
33072
|
+
return false;
|
|
33073
|
+
this.authService.setExternalAuth({
|
|
33074
|
+
accessToken: result.accessToken,
|
|
33075
|
+
refreshToken: result.refreshToken,
|
|
33076
|
+
firebaseToken: result.firebaseToken,
|
|
33077
|
+
expiresIn: result.expiresIn,
|
|
33078
|
+
roles: result.roles,
|
|
33079
|
+
permissions: result.permissions,
|
|
33080
|
+
});
|
|
33081
|
+
this.router.navigateByUrl(this.config?.homeRoute || '/', { replaceUrl: true });
|
|
33082
|
+
return true;
|
|
33083
|
+
}
|
|
33051
33084
|
processCallback() {
|
|
33052
33085
|
const params = new URLSearchParams(window.location.search);
|
|
33053
33086
|
this.clientNonce = params.get('client_nonce');
|
|
@@ -33145,6 +33178,11 @@ class OAuthCallbackComponent {
|
|
|
33145
33178
|
type: 'oauth-callback',
|
|
33146
33179
|
tokens: result,
|
|
33147
33180
|
});
|
|
33181
|
+
// Flujo redirect (ventana principal, sin opener que consuma el localStorage):
|
|
33182
|
+
// instalar la sesión acá mismo y navegar al home, en vez de quedar pegado.
|
|
33183
|
+
if (this.isMainWindow() && this.completeInMainWindow(result)) {
|
|
33184
|
+
return;
|
|
33185
|
+
}
|
|
33148
33186
|
this.message = 'Autenticación exitosa';
|
|
33149
33187
|
this.closeAfterDelay();
|
|
33150
33188
|
}
|
|
@@ -33190,7 +33228,7 @@ class OAuthCallbackComponent {
|
|
|
33190
33228
|
}
|
|
33191
33229
|
}, 500);
|
|
33192
33230
|
}
|
|
33193
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: OAuthCallbackComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
|
|
33231
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: OAuthCallbackComponent, deps: [{ token: i1$4.Router }, { token: AuthService, optional: true }, { token: VALTECH_AUTH_CONFIG, optional: true }], target: i0.ɵɵFactoryTarget.Component }); }
|
|
33194
33232
|
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.2.14", type: OAuthCallbackComponent, isStandalone: true, selector: "val-oauth-callback", ngImport: i0, template: `<val-splash />`, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "component", type: SplashComponent, selector: "val-splash", inputs: ["logoLight", "logoDark", "alt"] }] }); }
|
|
33195
33233
|
}
|
|
33196
33234
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: OAuthCallbackComponent, decorators: [{
|
|
@@ -33203,7 +33241,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.14", ngImpo
|
|
|
33203
33241
|
// casi-duplicado: el callback OAuth es una carga fundamental y debe verse igual.
|
|
33204
33242
|
template: `<val-splash />`,
|
|
33205
33243
|
}]
|
|
33206
|
-
}] }
|
|
33244
|
+
}], ctorParameters: () => [{ type: i1$4.Router }, { type: AuthService, decorators: [{
|
|
33245
|
+
type: Optional
|
|
33246
|
+
}] }, { type: undefined, decorators: [{
|
|
33247
|
+
type: Optional
|
|
33248
|
+
}, {
|
|
33249
|
+
type: Inject,
|
|
33250
|
+
args: [VALTECH_AUTH_CONFIG]
|
|
33251
|
+
}] }] });
|
|
33207
33252
|
|
|
33208
33253
|
/**
|
|
33209
33254
|
* Name of the query param that carries the handoff token. Apps may override
|