@sneat/auth-ui 0.27.43 → 0.27.44
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/pages/login-page/sneat-auth-with-telegram.service.js +29 -11
- package/esm2022/lib/pages/login-page/sneat-auth-with-telegram.service.js.map +1 -1
- package/lib/pages/login-page/auth-panel.component.d.ts +1 -1
- package/lib/pages/login-page/sneat-auth-with-telegram.service.d.ts +4 -2
- package/package.json +1 -1
- package/tsconfig.lib.prod.tsbuildinfo +1 -1
|
@@ -21,25 +21,41 @@ export class SneatAuthWithTelegramService {
|
|
|
21
21
|
initialState = state;
|
|
22
22
|
});
|
|
23
23
|
this.linkUserID =
|
|
24
|
-
initialState
|
|
24
|
+
initialState && this.isAuthenticatedReady(initialState)
|
|
25
25
|
? initialState.user?.uid
|
|
26
26
|
: undefined;
|
|
27
27
|
this.authService.authState
|
|
28
28
|
.pipe(takeUntilDestroyed(this.destroyRef))
|
|
29
29
|
.subscribe((state) => {
|
|
30
|
-
|
|
30
|
+
this.linkState = state;
|
|
31
|
+
if (!this.preservesLinkPrincipal(state)) {
|
|
31
32
|
// Never revive an old popup after an A -> B -> A account transition.
|
|
32
33
|
this.linkContextInvalidated = true;
|
|
33
34
|
}
|
|
34
35
|
});
|
|
35
36
|
}
|
|
36
|
-
|
|
37
|
+
isAuthenticatedReady(state) {
|
|
38
|
+
return (state.status === AuthStatuses.authenticated &&
|
|
39
|
+
!!state.user?.uid &&
|
|
40
|
+
!state.err &&
|
|
41
|
+
// Older public callers omit loadingPhase. An explicit pending phase is
|
|
42
|
+
// never ready, and the real auth service's ready state needs its token.
|
|
43
|
+
(state.loadingPhase === undefined ||
|
|
44
|
+
(state.loadingPhase === 'ready' && !!state.token)));
|
|
45
|
+
}
|
|
46
|
+
preservesLinkPrincipal(state) {
|
|
37
47
|
return (!!this.linkUserID &&
|
|
38
|
-
state.
|
|
39
|
-
state.
|
|
48
|
+
state.user?.uid === this.linkUserID &&
|
|
49
|
+
!state.err &&
|
|
50
|
+
(this.isAuthenticatedReady(state) ||
|
|
51
|
+
(state.status === AuthStatuses.authenticating &&
|
|
52
|
+
state.loadingPhase === 'getting-token')));
|
|
40
53
|
}
|
|
41
|
-
|
|
42
|
-
return
|
|
54
|
+
linkContextIsReady() {
|
|
55
|
+
return (!this.linkContextInvalidated &&
|
|
56
|
+
!!this.linkState &&
|
|
57
|
+
this.preservesLinkPrincipal(this.linkState) &&
|
|
58
|
+
this.isAuthenticatedReady(this.linkState));
|
|
43
59
|
}
|
|
44
60
|
/** Legacy Login Widget: posts the widget's signed payload. */
|
|
45
61
|
loginWithTelegram(botID, tgAuthData, isUserAuthenticated) {
|
|
@@ -57,19 +73,21 @@ export class SneatAuthWithTelegramService {
|
|
|
57
73
|
this.signIn('auth/login-from-telegram-oidc?botID=' + botID, { id_token: idToken }, isUserAuthenticated);
|
|
58
74
|
}
|
|
59
75
|
signIn(endpoint, body, isUserAuthenticated) {
|
|
60
|
-
if (isUserAuthenticated && !this.
|
|
61
|
-
this.errorLogger.logErrorHandler('Telegram account linking stopped')(new Error(
|
|
76
|
+
if (isUserAuthenticated && !this.linkContextIsReady()) {
|
|
77
|
+
this.errorLogger.logErrorHandler('Telegram account linking stopped')(new Error(this.linkContextInvalidated
|
|
78
|
+
? 'Your sign-in changed. Reload this page before authorizing Telegram.'
|
|
79
|
+
: 'Your sign-in is refreshing. Try again after your account is ready.'));
|
|
62
80
|
return;
|
|
63
81
|
}
|
|
64
82
|
const request = isUserAuthenticated
|
|
65
83
|
? this.apiService.post(endpoint, body)
|
|
66
84
|
: this.apiService.postAsAnonymous(endpoint, body);
|
|
67
85
|
const guardedRequest = isUserAuthenticated
|
|
68
|
-
? request.pipe(takeUntil(this.authService.authState.pipe(filter((state) => !this.
|
|
86
|
+
? request.pipe(takeUntil(this.authService.authState.pipe(filter((state) => !this.preservesLinkPrincipal(state)))))
|
|
69
87
|
: request;
|
|
70
88
|
guardedRequest.pipe(takeUntilDestroyed(this.destroyRef)).subscribe({
|
|
71
89
|
next: (response) => {
|
|
72
|
-
if (isUserAuthenticated && !this.
|
|
90
|
+
if (isUserAuthenticated && !this.linkContextIsReady())
|
|
73
91
|
return;
|
|
74
92
|
this.authService
|
|
75
93
|
.signInWithToken(response.token)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sneat-auth-with-telegram.service.js","sourceRoot":"","sources":["../../../../../../../../libs/auth/ui/src/lib/pages/login-page/sneat-auth-with-telegram.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EACL,YAAY,EAEZ,qBAAqB,GACtB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAgB,MAAM,aAAa,CAAC;AACxD,OAAO,EAAc,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;;AAuB3D,MAAM,OAAO,4BAA4B;
|
|
1
|
+
{"version":3,"file":"sneat-auth-with-telegram.service.js","sourceRoot":"","sources":["../../../../../../../../libs/auth/ui/src/lib/pages/login-page/sneat-auth-with-telegram.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { DestroyRef, Injectable, inject } from '@angular/core';\nimport { takeUntilDestroyed } from '@angular/core/rxjs-interop';\nimport { SneatApiService } from '@sneat/api';\nimport {\n AuthStatuses,\n ISneatAuthState,\n SneatAuthStateService,\n} from '@sneat/auth-core';\nimport { ErrorLogger, IErrorLogger } from '@sneat/core';\nimport { Observable, filter, take, takeUntil } from 'rxjs';\n\nexport interface ITelegramAuthData {\n id: number;\n first_name: string;\n last_name: string;\n username?: string;\n photo_url?: string;\n auth_date: number;\n hash: string;\n}\n\n/** What the server hands the page before it opens Telegram's OpenID popup. */\nexport interface ITelegramOIDCNonce {\n clientID: string;\n nonce: string;\n}\n\ninterface IResponse {\n token: string;\n}\n\n@Injectable()\nexport class SneatAuthWithTelegramService {\n private readonly errorLogger = inject<IErrorLogger>(ErrorLogger);\n private readonly apiService = inject(SneatApiService);\n private readonly authService = inject(SneatAuthStateService);\n private readonly destroyRef = inject(DestroyRef);\n private readonly linkUserID?: string;\n private linkContextInvalidated = false;\n private linkState?: ISneatAuthState;\n\n constructor() {\n // Auth state replays its current principal synchronously. If it is not\n // ready, authenticated linking fails closed for this control's lifetime.\n let initialState: ISneatAuthState | undefined;\n this.authService.authState\n .pipe(take(1), takeUntilDestroyed(this.destroyRef))\n .subscribe((state) => {\n initialState = state;\n });\n this.linkUserID =\n initialState && this.isAuthenticatedReady(initialState)\n ? initialState.user?.uid\n : undefined;\n this.authService.authState\n .pipe(takeUntilDestroyed(this.destroyRef))\n .subscribe((state) => {\n this.linkState = state;\n if (!this.preservesLinkPrincipal(state)) {\n // Never revive an old popup after an A -> B -> A account transition.\n this.linkContextInvalidated = true;\n }\n });\n }\n\n private isAuthenticatedReady(state: ISneatAuthState): boolean {\n return (\n state.status === AuthStatuses.authenticated &&\n !!state.user?.uid &&\n !state.err &&\n // Older public callers omit loadingPhase. An explicit pending phase is\n // never ready, and the real auth service's ready state needs its token.\n (state.loadingPhase === undefined ||\n (state.loadingPhase === 'ready' && !!state.token))\n );\n }\n\n private preservesLinkPrincipal(state: ISneatAuthState): boolean {\n return (\n !!this.linkUserID &&\n state.user?.uid === this.linkUserID &&\n !state.err &&\n (this.isAuthenticatedReady(state) ||\n (state.status === AuthStatuses.authenticating &&\n state.loadingPhase === 'getting-token'))\n );\n }\n\n private linkContextIsReady(): boolean {\n return (\n !this.linkContextInvalidated &&\n !!this.linkState &&\n this.preservesLinkPrincipal(this.linkState) &&\n this.isAuthenticatedReady(this.linkState)\n );\n }\n\n /** Legacy Login Widget: posts the widget's signed payload. */\n public loginWithTelegram(\n botID: string,\n tgAuthData: ITelegramAuthData,\n isUserAuthenticated: boolean,\n ): void {\n this.signIn(\n 'auth/login-from-telegram-widget?botID=' + botID,\n tgAuthData,\n isUserAuthenticated,\n );\n }\n\n /**\n * Asks the server for the bot's OpenID Client ID and a fresh nonce. Fails\n * with 400 for a bot that has no OpenID login configured server-side.\n */\n public getTelegramOIDCNonce(botID: string): Observable<ITelegramOIDCNonce> {\n return this.apiService.postAsAnonymous<ITelegramOIDCNonce>(\n 'auth/telegram-oidc-nonce?botID=' + botID,\n {},\n );\n }\n\n /** OpenID login: posts the id_token Telegram's popup returned. */\n public loginWithTelegramOIDC(\n botID: string,\n idToken: string,\n isUserAuthenticated: boolean,\n ): void {\n this.signIn(\n 'auth/login-from-telegram-oidc?botID=' + botID,\n { id_token: idToken },\n isUserAuthenticated,\n );\n }\n\n private signIn(\n endpoint: string,\n body: unknown,\n isUserAuthenticated: boolean,\n ): void {\n if (isUserAuthenticated && !this.linkContextIsReady()) {\n this.errorLogger.logErrorHandler('Telegram account linking stopped')(\n new Error(\n this.linkContextInvalidated\n ? 'Your sign-in changed. Reload this page before authorizing Telegram.'\n : 'Your sign-in is refreshing. Try again after your account is ready.',\n ),\n );\n return;\n }\n const request = isUserAuthenticated\n ? this.apiService.post<IResponse>(endpoint, body)\n : this.apiService.postAsAnonymous<IResponse>(endpoint, body);\n const guardedRequest = isUserAuthenticated\n ? request.pipe(\n takeUntil(\n this.authService.authState.pipe(\n filter((state) => !this.preservesLinkPrincipal(state)),\n ),\n ),\n )\n : request;\n guardedRequest.pipe(takeUntilDestroyed(this.destroyRef)).subscribe({\n next: (response) => {\n if (isUserAuthenticated && !this.linkContextIsReady()) return;\n this.authService\n .signInWithToken(response.token)\n .catch(\n this.errorLogger.logErrorHandler(\n 'Failed to sign-in with custom token',\n ),\n );\n },\n error: this.errorLogger.logErrorHandler('signInWithTelegram() error:'),\n });\n }\n}\n"]}
|
|
@@ -30,7 +30,7 @@ export declare class AuthPanelComponent implements OnInit {
|
|
|
30
30
|
/** False when no credential could be kept to link later. */
|
|
31
31
|
readonly autoLink: boolean;
|
|
32
32
|
} | undefined>;
|
|
33
|
-
protected readonly recordState: import("@angular/core").WritableSignal<"
|
|
33
|
+
protected readonly recordState: import("@angular/core").WritableSignal<"ready" | "failed" | "signed-out" | "loading">;
|
|
34
34
|
protected readonly isNativePlatform: boolean;
|
|
35
35
|
protected readonly safeReturnTo: import("@angular/core").Signal<string | undefined>;
|
|
36
36
|
protected readonly ssoQueryParams: import("@angular/core").Signal<{
|
|
@@ -21,9 +21,11 @@ export declare class SneatAuthWithTelegramService {
|
|
|
21
21
|
private readonly destroyRef;
|
|
22
22
|
private readonly linkUserID?;
|
|
23
23
|
private linkContextInvalidated;
|
|
24
|
+
private linkState?;
|
|
24
25
|
constructor();
|
|
25
|
-
private
|
|
26
|
-
private
|
|
26
|
+
private isAuthenticatedReady;
|
|
27
|
+
private preservesLinkPrincipal;
|
|
28
|
+
private linkContextIsReady;
|
|
27
29
|
/** Legacy Login Widget: posts the widget's signed payload. */
|
|
28
30
|
loginWithTelegram(botID: string, tgAuthData: ITelegramAuthData, isUserAuthenticated: boolean): void;
|
|
29
31
|
/**
|