@cuby-ui/core 0.0.287 → 0.0.290

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.
@@ -4,7 +4,7 @@ export declare class CuiSidebarHeaderComponent {
4
4
  private readonly document;
5
5
  private readonly sidebarService;
6
6
  protected readonly isOpened: import("@angular/core").Signal<boolean>;
7
- protected readonly buttonIcon: import("@angular/core").Signal<"cuiIconLoading" | "cuiIconCheck" | "cuiIconCheckSm" | "cuiIconCheckCircle" | "cuiIconCheckCircleSm" | "cuiIconCheckCircleV2" | "cuiIconMoreVertical" | "cuiIconMoreVerticalSm" | "cuiIconTrash" | "cuiIconTrashSm" | "cuiIconEdit" | "cuiIconEditSm" | "cuiIconArrowSortSm" | "cuiIconX" | "cuiIconXSm" | "cuiIconXCircle" | "cuiIconXCircleSm" | "cuiIconClear" | "cuiIconClearSm" | "cuiIconEye" | "cuiIconEyeSm" | "cuiIconEyeOff" | "cuiIconEyeOffSm" | "cuiIconChevronUp" | "cuiIconChevronUpSm" | "cuiIconChevronRight" | "cuiIconChevronRightSm" | "cuiIconChevronDown" | "cuiIconChevronDownSm" | "cuiIconChevronLeft" | "cuiIconChevronLeftSm" | "cuiIconChevronsRight" | "cuiIconChevronsRightSm" | "cuiIconChevronsLeft" | "cuiIconChevronsLeftSm" | "cuiIconChevronsSwitch" | "cuiIconDatabase" | "cuiIconDatabaseSm" | "cuiIconHome" | "cuiIconHomeSm" | "cuiIconUser" | "cuiIconUserSm" | "cuiIconUsers" | "cuiIconUsersBg" | "cuiIconUsersSm" | "cuiIconUserPlus" | "cuiIconUserPlusSm" | "cuiIconFormula" | "cuiIconSettings" | "cuiIconSettingsSm" | "cuiIconSettingsBold" | "cuiIconCopy" | "cuiIconCopySm" | "cuiIconSidebar" | "cuiIconSidebarSm" | "cuiIconChart" | "cuiIconFolder" | "cuiIconFolderSm" | "cuiIconFolderOpen" | "cuiIconFolderOpenSm" | "cuiIconPlus" | "cuiIconPlusSm" | "cuiIconPlusCircle" | "cuiIconFiltersLines" | "cuiIconFiltersLinesSm" | "cuiIconSearch" | "cuiIconSearchSm" | "cuiIconGrid" | "cuiIconGridSm" | "cuiIconList" | "cuiIconListSm" | "cuiIconProgress" | "cuiIconSortAZSm" | "cuiIconFlagBold" | "cuiIconFileText" | "cuiIconFileTextSm" | "cuiIconLink" | "cuiIconExternalLinkSm" | "cuiIconLinkBroken" | "cuiIconLinkBrokenSm" | "cuiIconClock" | "cuiIconClockSm" | "cuiIconInfo" | "cuiIconInfoSm" | "cuiIconInfoCircle" | "cuiIconInfoCircleBg" | "cuiIconAlertTriangle" | "cuiIconAlertTriangleSm" | "cuiIconAlertCircle" | "cuiIcon2Layers" | "cuiIcon2LayersSm" | "cuiIcon3Layers" | "cuiIcon3LayersSm" | "cuiIconLearningSm" | "cuiIconBellSm" | "cuiIconMessageCircle" | "cuiIconMessageCircleSm" | "cuiIconSlashDivider" | "cuiIconCaretDownFillXxs" | "cuiIconCaretDownFill" | "cuiIconDragHandleDots" | "cuiIconPlayCircle" | "cuiIconPlayCircleSm" | "cuiIconClipBoard" | "cuiIconUpload" | "cuiIconUploadSm" | "cuiIconMaximize" | "cuiIconMaximizeSm" | "cuiIconArrowUpRight" | "cuiIconArrowUpRightSm" | "cuiIconAddBranchSm" | "cuiIconBranch" | "cuiIconBranchSm" | "cuiIconPaperclip" | "cuiIconPaperclipSm" | "cuiIconToolsSm" | "cuiIconPartsSm" | "cuiIconEquipmentSm" | "cuiIconPrimitive" | "cuiIconPrimitiveSm" | "cuiIconSpool" | "cuiIconSpoolSm" | "cuiIconTank" | "cuiIconTankSm" | "cuiIconAssembly" | "cuiIconAssemblySm" | "cuiIconVariant" | "cuiIconVariantSm" | "cuiIconRichText" | "cuiIconRichTextSm" | "cuiIconChecklist" | "cuiIconRefreshCcwSm" | "cuiIconRefreshCcw" | "cuiIconBarChartSm" | "cuiIconBarChart" | "cuiIconCurvedArrow" | "cuiIconBulletFillSm" | "cuiIconBulletSm" | "cuiIconArrowRight" | "cuiIconArrowRightSm" | "cuiIconImage" | "cuiIconCutLinearSm" | "cuiIconCutLinear" | "cuiIconForkLift" | "cuiIconForkLiftSm" | "cuiIconPartPrimitive" | "cuiIconPartPrimitiveSm" | "cuiIconChecklistsSm" | "cuiIconViewInAr" | "cuiIconViewInArSm" | "cuiIconFloorplanSolid" | "cuiIconFloorplanSolidSm" | "cuiIconMoon" | "cuiIconMoonSm" | "cuiIconSunSm" | "cuiIconTool" | "cuiIconToolSm" | "cuiIconCamera" | "cuiIconPanModeSm" | "cuiIconCrane" | "cuiIconCraneSm" | "cuiIconBin" | "cuiIconBinSm" | "cuiIconAuxSm" | "cuiIcon5sSm" | "cuiIconRackSm" | "cuiIconAccessories" | "cuiIconAccessoriesSm" | "cuiIconLogisticVehicle" | "cuiIconLogisticVehicleSm" | "cuiIconComputerChipSm" | "cuiIconRack">;
7
+ protected readonly buttonIcon: import("@angular/core").Signal<"cuiIconLoading" | "cuiIconCheck" | "cuiIconCheckSm" | "cuiIconCheckCircle" | "cuiIconCheckCircleSm" | "cuiIconCheckCircleV2" | "cuiIconMoreVertical" | "cuiIconMoreVerticalSm" | "cuiIconTrash" | "cuiIconTrashSm" | "cuiIconEdit" | "cuiIconEditSm" | "cuiIconArrowSortSm" | "cuiIconX" | "cuiIconXSm" | "cuiIconXCircle" | "cuiIconXCircleSm" | "cuiIconClear" | "cuiIconClearSm" | "cuiIconEye" | "cuiIconEyeSm" | "cuiIconEyeOff" | "cuiIconEyeOffSm" | "cuiIconChevronUp" | "cuiIconChevronUpSm" | "cuiIconChevronRight" | "cuiIconChevronRightSm" | "cuiIconChevronDown" | "cuiIconChevronDownSm" | "cuiIconChevronLeft" | "cuiIconChevronLeftSm" | "cuiIconChevronsRight" | "cuiIconChevronsRightSm" | "cuiIconChevronsLeft" | "cuiIconChevronsLeftSm" | "cuiIconChevronsSwitch" | "cuiIconDatabase" | "cuiIconDatabaseSm" | "cuiIconHome" | "cuiIconHomeSm" | "cuiIconUser" | "cuiIconUserSm" | "cuiIconUsers" | "cuiIconUsersBg" | "cuiIconUsersSm" | "cuiIconUserPlus" | "cuiIconUserPlusSm" | "cuiIconFormula" | "cuiIconSettings" | "cuiIconSettingsSm" | "cuiIconSettingsBold" | "cuiIconCopy" | "cuiIconCopySm" | "cuiIconSidebar" | "cuiIconSidebarSm" | "cuiIconChart" | "cuiIconFolder" | "cuiIconFolderSm" | "cuiIconFolderOpen" | "cuiIconFolderOpenSm" | "cuiIconPlus" | "cuiIconPlusSm" | "cuiIconPlusCircle" | "cuiIconFiltersLines" | "cuiIconFiltersLinesSm" | "cuiIconSearch" | "cuiIconSearchSm" | "cuiIconGrid" | "cuiIconGridSm" | "cuiIconList" | "cuiIconListSm" | "cuiIconProgress" | "cuiIconSortAZSm" | "cuiIconFlagBold" | "cuiIconFileText" | "cuiIconFileTextSm" | "cuiIconLink" | "cuiIconExternalLinkSm" | "cuiIconLinkBroken" | "cuiIconLinkBrokenSm" | "cuiIconClock" | "cuiIconClockSm" | "cuiIconInfo" | "cuiIconInfoSm" | "cuiIconInfoCircle" | "cuiIconInfoCircleBg" | "cuiIconAlertTriangle" | "cuiIconAlertTriangleSm" | "cuiIconAlertCircle" | "cuiIcon2Layers" | "cuiIcon2LayersSm" | "cuiIcon3Layers" | "cuiIcon3LayersSm" | "cuiIconLearningSm" | "cuiIconBellSm" | "cuiIconMessageCircle" | "cuiIconMessageCircleSm" | "cuiIconSlashDivider" | "cuiIconCaretDownFillXxs" | "cuiIconCaretDownFill" | "cuiIconDragHandleDots" | "cuiIconPlayCircle" | "cuiIconPlayCircleSm" | "cuiIconClipBoard" | "cuiIconUpload" | "cuiIconUploadSm" | "cuiIconMaximize" | "cuiIconMaximizeSm" | "cuiIconArrowUpRight" | "cuiIconArrowUpRightSm" | "cuiIconAddBranchSm" | "cuiIconBranch" | "cuiIconBranchSm" | "cuiIconPaperclip" | "cuiIconPaperclipSm" | "cuiIconToolsSm" | "cuiIconPartsSm" | "cuiIconEquipmentSm" | "cuiIconPrimitive" | "cuiIconPrimitiveSm" | "cuiIconSpool" | "cuiIconSpoolSm" | "cuiIconTank" | "cuiIconTankSm" | "cuiIconAssembly" | "cuiIconAssemblySm" | "cuiIconVariant" | "cuiIconVariantSm" | "cuiIconRichText" | "cuiIconRichTextSm" | "cuiIconChecklist" | "cuiIconRefreshCcwSm" | "cuiIconRefreshCcw" | "cuiIconBarChartSm" | "cuiIconBarChart" | "cuiIconCurvedArrow" | "cuiIconBulletFillSm" | "cuiIconBulletSm" | "cuiIconArrowRight" | "cuiIconArrowRightSm" | "cuiIconImage" | "cuiIconCutLinearSm" | "cuiIconCutLinear" | "cuiIconForkLift" | "cuiIconForkLiftSm" | "cuiIconPartPrimitive" | "cuiIconPartPrimitiveSm" | "cuiIconChecklistsSm" | "cuiIconViewInAr" | "cuiIconViewInArSm" | "cuiIconFloorplanSolid" | "cuiIconFloorplanSolidSm" | "cuiIconMoon" | "cuiIconMoonSm" | "cuiIconSunSm" | "cuiIconTool" | "cuiIconToolSm" | "cuiIconCamera" | "cuiIconPanModeSm" | "cuiIconCrane" | "cuiIconCraneSm" | "cuiIconBin" | "cuiIconBinSm" | "cuiIconAuxSm" | "cuiIcon5sSm" | "cuiIconRackSm" | "cuiIconComputerChipSm" | "cuiIconRack" | "cuiIconAccessories" | "cuiIconAccessoriesSm" | "cuiIconLogisticVehicle" | "cuiIconLogisticVehicleSm" | "cuiIconCollapseSm" | "cuiIconBookOpenSm" | "cuiIconBriefcaseSm" | "cuiIconCreditCardSm" | "cuiIconTrelloSm" | "cuiIconBookOpen" | "cuiIconBriefcase" | "cuiIconCreditCard" | "cuiIconTrello">;
8
8
  readonly headerSlot: import("@angular/core").InputSignal<TemplateRef<unknown>>;
9
9
  protected onSwitch(event: MouseEvent): void;
10
10
  static ɵfac: i0.ɵɵFactoryDeclaration<CuiSidebarHeaderComponent, never>;
@@ -1,7 +1,7 @@
1
1
  import * as i0 from "@angular/core";
2
2
  export declare class CuiSidebarNavigationItemComponent {
3
3
  readonly text: import("@angular/core").InputSignal<string>;
4
- readonly icon: import("@angular/core").InputSignal<"cuiIconLoading" | "cuiIconCheck" | "cuiIconCheckSm" | "cuiIconCheckCircle" | "cuiIconCheckCircleSm" | "cuiIconCheckCircleV2" | "cuiIconMoreVertical" | "cuiIconMoreVerticalSm" | "cuiIconTrash" | "cuiIconTrashSm" | "cuiIconEdit" | "cuiIconEditSm" | "cuiIconArrowSortSm" | "cuiIconX" | "cuiIconXSm" | "cuiIconXCircle" | "cuiIconXCircleSm" | "cuiIconClear" | "cuiIconClearSm" | "cuiIconEye" | "cuiIconEyeSm" | "cuiIconEyeOff" | "cuiIconEyeOffSm" | "cuiIconChevronUp" | "cuiIconChevronUpSm" | "cuiIconChevronRight" | "cuiIconChevronRightSm" | "cuiIconChevronDown" | "cuiIconChevronDownSm" | "cuiIconChevronLeft" | "cuiIconChevronLeftSm" | "cuiIconChevronsRight" | "cuiIconChevronsRightSm" | "cuiIconChevronsLeft" | "cuiIconChevronsLeftSm" | "cuiIconChevronsSwitch" | "cuiIconDatabase" | "cuiIconDatabaseSm" | "cuiIconHome" | "cuiIconHomeSm" | "cuiIconUser" | "cuiIconUserSm" | "cuiIconUsers" | "cuiIconUsersBg" | "cuiIconUsersSm" | "cuiIconUserPlus" | "cuiIconUserPlusSm" | "cuiIconFormula" | "cuiIconSettings" | "cuiIconSettingsSm" | "cuiIconSettingsBold" | "cuiIconCopy" | "cuiIconCopySm" | "cuiIconSidebar" | "cuiIconSidebarSm" | "cuiIconChart" | "cuiIconFolder" | "cuiIconFolderSm" | "cuiIconFolderOpen" | "cuiIconFolderOpenSm" | "cuiIconPlus" | "cuiIconPlusSm" | "cuiIconPlusCircle" | "cuiIconFiltersLines" | "cuiIconFiltersLinesSm" | "cuiIconSearch" | "cuiIconSearchSm" | "cuiIconGrid" | "cuiIconGridSm" | "cuiIconList" | "cuiIconListSm" | "cuiIconProgress" | "cuiIconSortAZSm" | "cuiIconFlagBold" | "cuiIconFileText" | "cuiIconFileTextSm" | "cuiIconLink" | "cuiIconExternalLinkSm" | "cuiIconLinkBroken" | "cuiIconLinkBrokenSm" | "cuiIconClock" | "cuiIconClockSm" | "cuiIconInfo" | "cuiIconInfoSm" | "cuiIconInfoCircle" | "cuiIconInfoCircleBg" | "cuiIconAlertTriangle" | "cuiIconAlertTriangleSm" | "cuiIconAlertCircle" | "cuiIcon2Layers" | "cuiIcon2LayersSm" | "cuiIcon3Layers" | "cuiIcon3LayersSm" | "cuiIconLearningSm" | "cuiIconBellSm" | "cuiIconMessageCircle" | "cuiIconMessageCircleSm" | "cuiIconSlashDivider" | "cuiIconCaretDownFillXxs" | "cuiIconCaretDownFill" | "cuiIconDragHandleDots" | "cuiIconPlayCircle" | "cuiIconPlayCircleSm" | "cuiIconClipBoard" | "cuiIconUpload" | "cuiIconUploadSm" | "cuiIconMaximize" | "cuiIconMaximizeSm" | "cuiIconArrowUpRight" | "cuiIconArrowUpRightSm" | "cuiIconAddBranchSm" | "cuiIconBranch" | "cuiIconBranchSm" | "cuiIconPaperclip" | "cuiIconPaperclipSm" | "cuiIconToolsSm" | "cuiIconPartsSm" | "cuiIconEquipmentSm" | "cuiIconPrimitive" | "cuiIconPrimitiveSm" | "cuiIconSpool" | "cuiIconSpoolSm" | "cuiIconTank" | "cuiIconTankSm" | "cuiIconAssembly" | "cuiIconAssemblySm" | "cuiIconVariant" | "cuiIconVariantSm" | "cuiIconRichText" | "cuiIconRichTextSm" | "cuiIconChecklist" | "cuiIconRefreshCcwSm" | "cuiIconRefreshCcw" | "cuiIconBarChartSm" | "cuiIconBarChart" | "cuiIconCurvedArrow" | "cuiIconBulletFillSm" | "cuiIconBulletSm" | "cuiIconArrowRight" | "cuiIconArrowRightSm" | "cuiIconImage" | "cuiIconCutLinearSm" | "cuiIconCutLinear" | "cuiIconForkLift" | "cuiIconForkLiftSm" | "cuiIconPartPrimitive" | "cuiIconPartPrimitiveSm" | "cuiIconChecklistsSm" | "cuiIconViewInAr" | "cuiIconViewInArSm" | "cuiIconFloorplanSolid" | "cuiIconFloorplanSolidSm" | "cuiIconMoon" | "cuiIconMoonSm" | "cuiIconSunSm" | "cuiIconTool" | "cuiIconToolSm" | "cuiIconCamera" | "cuiIconPanModeSm" | "cuiIconCrane" | "cuiIconCraneSm" | "cuiIconBin" | "cuiIconBinSm" | "cuiIconAuxSm" | "cuiIcon5sSm" | "cuiIconRackSm" | "cuiIconAccessories" | "cuiIconAccessoriesSm" | "cuiIconLogisticVehicle" | "cuiIconLogisticVehicleSm" | "cuiIconComputerChipSm" | "cuiIconRack" | undefined>;
4
+ readonly icon: import("@angular/core").InputSignal<"cuiIconLoading" | "cuiIconCheck" | "cuiIconCheckSm" | "cuiIconCheckCircle" | "cuiIconCheckCircleSm" | "cuiIconCheckCircleV2" | "cuiIconMoreVertical" | "cuiIconMoreVerticalSm" | "cuiIconTrash" | "cuiIconTrashSm" | "cuiIconEdit" | "cuiIconEditSm" | "cuiIconArrowSortSm" | "cuiIconX" | "cuiIconXSm" | "cuiIconXCircle" | "cuiIconXCircleSm" | "cuiIconClear" | "cuiIconClearSm" | "cuiIconEye" | "cuiIconEyeSm" | "cuiIconEyeOff" | "cuiIconEyeOffSm" | "cuiIconChevronUp" | "cuiIconChevronUpSm" | "cuiIconChevronRight" | "cuiIconChevronRightSm" | "cuiIconChevronDown" | "cuiIconChevronDownSm" | "cuiIconChevronLeft" | "cuiIconChevronLeftSm" | "cuiIconChevronsRight" | "cuiIconChevronsRightSm" | "cuiIconChevronsLeft" | "cuiIconChevronsLeftSm" | "cuiIconChevronsSwitch" | "cuiIconDatabase" | "cuiIconDatabaseSm" | "cuiIconHome" | "cuiIconHomeSm" | "cuiIconUser" | "cuiIconUserSm" | "cuiIconUsers" | "cuiIconUsersBg" | "cuiIconUsersSm" | "cuiIconUserPlus" | "cuiIconUserPlusSm" | "cuiIconFormula" | "cuiIconSettings" | "cuiIconSettingsSm" | "cuiIconSettingsBold" | "cuiIconCopy" | "cuiIconCopySm" | "cuiIconSidebar" | "cuiIconSidebarSm" | "cuiIconChart" | "cuiIconFolder" | "cuiIconFolderSm" | "cuiIconFolderOpen" | "cuiIconFolderOpenSm" | "cuiIconPlus" | "cuiIconPlusSm" | "cuiIconPlusCircle" | "cuiIconFiltersLines" | "cuiIconFiltersLinesSm" | "cuiIconSearch" | "cuiIconSearchSm" | "cuiIconGrid" | "cuiIconGridSm" | "cuiIconList" | "cuiIconListSm" | "cuiIconProgress" | "cuiIconSortAZSm" | "cuiIconFlagBold" | "cuiIconFileText" | "cuiIconFileTextSm" | "cuiIconLink" | "cuiIconExternalLinkSm" | "cuiIconLinkBroken" | "cuiIconLinkBrokenSm" | "cuiIconClock" | "cuiIconClockSm" | "cuiIconInfo" | "cuiIconInfoSm" | "cuiIconInfoCircle" | "cuiIconInfoCircleBg" | "cuiIconAlertTriangle" | "cuiIconAlertTriangleSm" | "cuiIconAlertCircle" | "cuiIcon2Layers" | "cuiIcon2LayersSm" | "cuiIcon3Layers" | "cuiIcon3LayersSm" | "cuiIconLearningSm" | "cuiIconBellSm" | "cuiIconMessageCircle" | "cuiIconMessageCircleSm" | "cuiIconSlashDivider" | "cuiIconCaretDownFillXxs" | "cuiIconCaretDownFill" | "cuiIconDragHandleDots" | "cuiIconPlayCircle" | "cuiIconPlayCircleSm" | "cuiIconClipBoard" | "cuiIconUpload" | "cuiIconUploadSm" | "cuiIconMaximize" | "cuiIconMaximizeSm" | "cuiIconArrowUpRight" | "cuiIconArrowUpRightSm" | "cuiIconAddBranchSm" | "cuiIconBranch" | "cuiIconBranchSm" | "cuiIconPaperclip" | "cuiIconPaperclipSm" | "cuiIconToolsSm" | "cuiIconPartsSm" | "cuiIconEquipmentSm" | "cuiIconPrimitive" | "cuiIconPrimitiveSm" | "cuiIconSpool" | "cuiIconSpoolSm" | "cuiIconTank" | "cuiIconTankSm" | "cuiIconAssembly" | "cuiIconAssemblySm" | "cuiIconVariant" | "cuiIconVariantSm" | "cuiIconRichText" | "cuiIconRichTextSm" | "cuiIconChecklist" | "cuiIconRefreshCcwSm" | "cuiIconRefreshCcw" | "cuiIconBarChartSm" | "cuiIconBarChart" | "cuiIconCurvedArrow" | "cuiIconBulletFillSm" | "cuiIconBulletSm" | "cuiIconArrowRight" | "cuiIconArrowRightSm" | "cuiIconImage" | "cuiIconCutLinearSm" | "cuiIconCutLinear" | "cuiIconForkLift" | "cuiIconForkLiftSm" | "cuiIconPartPrimitive" | "cuiIconPartPrimitiveSm" | "cuiIconChecklistsSm" | "cuiIconViewInAr" | "cuiIconViewInArSm" | "cuiIconFloorplanSolid" | "cuiIconFloorplanSolidSm" | "cuiIconMoon" | "cuiIconMoonSm" | "cuiIconSunSm" | "cuiIconTool" | "cuiIconToolSm" | "cuiIconCamera" | "cuiIconPanModeSm" | "cuiIconCrane" | "cuiIconCraneSm" | "cuiIconBin" | "cuiIconBinSm" | "cuiIconAuxSm" | "cuiIcon5sSm" | "cuiIconRackSm" | "cuiIconComputerChipSm" | "cuiIconRack" | "cuiIconAccessories" | "cuiIconAccessoriesSm" | "cuiIconLogisticVehicle" | "cuiIconLogisticVehicleSm" | "cuiIconCollapseSm" | "cuiIconBookOpenSm" | "cuiIconBriefcaseSm" | "cuiIconCreditCardSm" | "cuiIconTrelloSm" | "cuiIconBookOpen" | "cuiIconBriefcase" | "cuiIconCreditCard" | "cuiIconTrello" | undefined>;
5
5
  readonly active: import("@angular/core").InputSignal<boolean | undefined>;
6
6
  readonly isOpen: import("@angular/core").InputSignal<boolean | undefined>;
7
7
  static ɵfac: i0.ɵɵFactoryDeclaration<CuiSidebarNavigationItemComponent, never>;
@@ -1,28 +1,20 @@
1
- import { OAuthInfoEvent, OAuthService } from 'angular-oauth2-oidc';
1
+ import { OAuthInfoEvent } from 'angular-oauth2-oidc';
2
2
  import { filter } from 'rxjs';
3
- export class CuiAuthBase extends OAuthService {
3
+ import { CuiTokenBase } from './token.service';
4
+ export class CuiAuthBase extends CuiTokenBase {
4
5
  createLoginUrl(state, loginHint, customRedirectUri, noPrompt, params) {
5
6
  return super.createLoginUrl(state, loginHint, customRedirectUri, noPrompt, params);
6
7
  }
7
- useCheckTokenFlow(loginCallback) {
8
- const isTokenExist = this.hasValidAccessToken();
8
+ async useCheckTokenFlow(loginCallback) {
9
+ const isExpired = this.checkIsTokenExpired();
9
10
  const isRefreshTokenExist = this.getRefreshToken();
10
- if (isTokenExist && isRefreshTokenExist) {
11
- return this.refreshTokenWithExpiredChecking();
11
+ if (!isRefreshTokenExist) {
12
+ return loginCallback();
12
13
  }
13
- return loginCallback();
14
- }
15
- checkIsTokenExpired() {
16
- const expiredTime = this.getAccessTokenExpiration();
17
- const currentTime = Date.now();
18
- return currentTime >= expiredTime;
19
- }
20
- refreshTokenWithExpiredChecking() {
21
- const isExpired = this.checkIsTokenExpired();
22
14
  if (!isExpired) {
23
15
  return;
24
16
  }
25
- this.refreshToken();
17
+ return await this.refreshToken();
26
18
  }
27
19
  initAuthRefreshEvents(loginCallback) {
28
20
  this.events.pipe(filter((event) => event instanceof OAuthInfoEvent)).subscribe((event) => {
@@ -36,4 +28,4 @@ export class CuiAuthBase extends OAuthService {
36
28
  });
37
29
  }
38
30
  }
39
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vcHJvamVjdHMvY29yZS9zZXJ2aWNlcy9hdXRoLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGNBQWMsRUFBRSxZQUFZLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNuRSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRTlCLE1BQU0sT0FBTyxXQUFZLFNBQVEsWUFBWTtJQUN6QixjQUFjLENBQUMsS0FBYyxFQUFFLFNBQWtCLEVBQUUsaUJBQTBCLEVBQUUsUUFBa0IsRUFBRSxNQUFlO1FBQzlILE9BQU8sS0FBSyxDQUFDLGNBQWMsQ0FBQyxLQUFLLEVBQUUsU0FBUyxFQUFFLGlCQUFpQixFQUFFLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUN2RixDQUFDO0lBRU0saUJBQWlCLENBQUMsYUFBeUI7UUFDOUMsTUFBTSxZQUFZLEdBQUcsSUFBSSxDQUFDLG1CQUFtQixFQUFFLENBQUM7UUFDaEQsTUFBTSxtQkFBbUIsR0FBRyxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7UUFFbkQsSUFBSSxZQUFZLElBQUksbUJBQW1CLEVBQUUsQ0FBQztZQUN0QyxPQUFPLElBQUksQ0FBQywrQkFBK0IsRUFBRSxDQUFDO1FBQ2xELENBQUM7UUFFRCxPQUFPLGFBQWEsRUFBRSxDQUFDO0lBQzNCLENBQUM7SUFFTSxtQkFBbUI7UUFDdEIsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLHdCQUF3QixFQUFFLENBQUM7UUFDcEQsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBRS9CLE9BQU8sV0FBVyxJQUFJLFdBQVcsQ0FBQztJQUN0QyxDQUFDO0lBRU0sK0JBQStCO1FBQ2xDLE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO1FBRTdDLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUNiLE9BQU87UUFDWCxDQUFDO1FBRUQsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO0lBQ3hCLENBQUM7SUFFTSxxQkFBcUIsQ0FBQyxhQUF5QjtRQUNsRCxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLEtBQUssWUFBWSxjQUFjLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFO1lBQ3JGLElBQUksS0FBSyxDQUFDLElBQUksS0FBSyxlQUFlLElBQUksS0FBSyxDQUFDLElBQUksS0FBSyxjQUFjLEVBQUUsQ0FBQztnQkFDbEUsT0FBTztZQUNYLENBQUM7WUFFRCxJQUFJLENBQUMsSUFBSSxDQUFDLG1CQUFtQixFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLEVBQUUsQ0FBQztnQkFDekQsT0FBTyxhQUFhLEVBQUUsQ0FBQztZQUMzQixDQUFDO1lBRUQsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1FBQ3hCLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQztDQUNKIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgT0F1dGhJbmZvRXZlbnQsIE9BdXRoU2VydmljZSB9IGZyb20gJ2FuZ3VsYXItb2F1dGgyLW9pZGMnO1xuaW1wb3J0IHsgZmlsdGVyIH0gZnJvbSAncnhqcyc7XG5cbmV4cG9ydCBjbGFzcyBDdWlBdXRoQmFzZSBleHRlbmRzIE9BdXRoU2VydmljZSB7XG4gICAgcHVibGljIG92ZXJyaWRlIGNyZWF0ZUxvZ2luVXJsKHN0YXRlPzogc3RyaW5nLCBsb2dpbkhpbnQ/OiBzdHJpbmcsIGN1c3RvbVJlZGlyZWN0VXJpPzogc3RyaW5nLCBub1Byb21wdD86IGJvb2xlYW4sIHBhcmFtcz86IG9iamVjdCk6IFByb21pc2U8c3RyaW5nPiB7XG4gICAgICAgIHJldHVybiBzdXBlci5jcmVhdGVMb2dpblVybChzdGF0ZSwgbG9naW5IaW50LCBjdXN0b21SZWRpcmVjdFVyaSwgbm9Qcm9tcHQsIHBhcmFtcyk7XG4gICAgfVxuXG4gICAgcHVibGljIHVzZUNoZWNrVG9rZW5GbG93KGxvZ2luQ2FsbGJhY2s6ICgpID0+IHZvaWQpOiB2b2lkIHtcbiAgICAgICAgY29uc3QgaXNUb2tlbkV4aXN0ID0gdGhpcy5oYXNWYWxpZEFjY2Vzc1Rva2VuKCk7XG4gICAgICAgIGNvbnN0IGlzUmVmcmVzaFRva2VuRXhpc3QgPSB0aGlzLmdldFJlZnJlc2hUb2tlbigpO1xuXG4gICAgICAgIGlmIChpc1Rva2VuRXhpc3QgJiYgaXNSZWZyZXNoVG9rZW5FeGlzdCkge1xuICAgICAgICAgICAgcmV0dXJuIHRoaXMucmVmcmVzaFRva2VuV2l0aEV4cGlyZWRDaGVja2luZygpO1xuICAgICAgICB9XG5cbiAgICAgICAgcmV0dXJuIGxvZ2luQ2FsbGJhY2soKTtcbiAgICB9XG5cbiAgICBwdWJsaWMgY2hlY2tJc1Rva2VuRXhwaXJlZCgpOiBib29sZWFuIHtcbiAgICAgICAgY29uc3QgZXhwaXJlZFRpbWUgPSB0aGlzLmdldEFjY2Vzc1Rva2VuRXhwaXJhdGlvbigpO1xuICAgICAgICBjb25zdCBjdXJyZW50VGltZSA9IERhdGUubm93KCk7XG5cbiAgICAgICAgcmV0dXJuIGN1cnJlbnRUaW1lID49IGV4cGlyZWRUaW1lO1xuICAgIH1cblxuICAgIHB1YmxpYyByZWZyZXNoVG9rZW5XaXRoRXhwaXJlZENoZWNraW5nKCk6IHZvaWQge1xuICAgICAgICBjb25zdCBpc0V4cGlyZWQgPSB0aGlzLmNoZWNrSXNUb2tlbkV4cGlyZWQoKTtcblxuICAgICAgICBpZiAoIWlzRXhwaXJlZCkge1xuICAgICAgICAgICAgcmV0dXJuO1xuICAgICAgICB9XG5cbiAgICAgICAgdGhpcy5yZWZyZXNoVG9rZW4oKTtcbiAgICB9XG5cbiAgICBwdWJsaWMgaW5pdEF1dGhSZWZyZXNoRXZlbnRzKGxvZ2luQ2FsbGJhY2s6ICgpID0+IHZvaWQpOiB2b2lkIHtcbiAgICAgICAgdGhpcy5ldmVudHMucGlwZShmaWx0ZXIoKGV2ZW50KSA9PiBldmVudCBpbnN0YW5jZW9mIE9BdXRoSW5mb0V2ZW50KSkuc3Vic2NyaWJlKChldmVudCkgPT4ge1xuICAgICAgICAgICAgaWYgKGV2ZW50LnR5cGUgIT09ICd0b2tlbl9leHBpcmVzJyB8fCBldmVudC5pbmZvICE9PSAnYWNjZXNzX3Rva2VuJykge1xuICAgICAgICAgICAgICAgIHJldHVybjtcbiAgICAgICAgICAgIH1cblxuICAgICAgICAgICAgaWYgKCF0aGlzLmhhc1ZhbGlkQWNjZXNzVG9rZW4oKSB8fCAhdGhpcy5nZXRSZWZyZXNoVG9rZW4oKSkge1xuICAgICAgICAgICAgICAgIHJldHVybiBsb2dpbkNhbGxiYWNrKCk7XG4gICAgICAgICAgICB9XG5cbiAgICAgICAgICAgIHRoaXMucmVmcmVzaFRva2VuKCk7XG4gICAgICAgIH0pO1xuICAgIH1cbn1cbiJdfQ==
31
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vcHJvamVjdHMvY29yZS9zZXJ2aWNlcy9hdXRoLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGNBQWMsRUFBaUIsTUFBTSxxQkFBcUIsQ0FBQztBQUNwRSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQzlCLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUUvQyxNQUFNLE9BQU8sV0FBWSxTQUFRLFlBQVk7SUFDekIsY0FBYyxDQUFDLEtBQWMsRUFBRSxTQUFrQixFQUFFLGlCQUEwQixFQUFFLFFBQWtCLEVBQUUsTUFBZTtRQUM5SCxPQUFPLEtBQUssQ0FBQyxjQUFjLENBQUMsS0FBSyxFQUFFLFNBQVMsRUFBRSxpQkFBaUIsRUFBRSxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDdkYsQ0FBQztJQUVNLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxhQUF5QjtRQUNwRCxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsbUJBQW1CLEVBQUUsQ0FBQztRQUM3QyxNQUFNLG1CQUFtQixHQUFHLElBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBQztRQUVuRCxJQUFJLENBQUMsbUJBQW1CLEVBQUUsQ0FBQztZQUN2QixPQUFPLGFBQWEsRUFBRSxDQUFDO1FBQzNCLENBQUM7UUFFRCxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDYixPQUFPO1FBQ1gsQ0FBQztRQUVELE9BQU8sTUFBTSxJQUFJLENBQUMsWUFBWSxFQUFFLENBQUM7SUFDckMsQ0FBQztJQUVNLHFCQUFxQixDQUFDLGFBQXlCO1FBQ2xELElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsS0FBSyxZQUFZLGNBQWMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsS0FBSyxFQUFFLEVBQUU7WUFDckYsSUFBSSxLQUFLLENBQUMsSUFBSSxLQUFLLGVBQWUsSUFBSSxLQUFLLENBQUMsSUFBSSxLQUFLLGNBQWMsRUFBRSxDQUFDO2dCQUNsRSxPQUFPO1lBQ1gsQ0FBQztZQUVELElBQUksQ0FBQyxJQUFJLENBQUMsbUJBQW1CLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxlQUFlLEVBQUUsRUFBRSxDQUFDO2dCQUN6RCxPQUFPLGFBQWEsRUFBRSxDQUFDO1lBQzNCLENBQUM7WUFFRCxJQUFJLENBQUMsWUFBWSxFQUFFLENBQUM7UUFDeEIsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDO0NBQ0oiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBPQXV0aEluZm9FdmVudCwgVG9rZW5SZXNwb25zZSB9IGZyb20gJ2FuZ3VsYXItb2F1dGgyLW9pZGMnO1xuaW1wb3J0IHsgZmlsdGVyIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBDdWlUb2tlbkJhc2UgfSBmcm9tICcuL3Rva2VuLnNlcnZpY2UnO1xuXG5leHBvcnQgY2xhc3MgQ3VpQXV0aEJhc2UgZXh0ZW5kcyBDdWlUb2tlbkJhc2Uge1xuICAgIHB1YmxpYyBvdmVycmlkZSBjcmVhdGVMb2dpblVybChzdGF0ZT86IHN0cmluZywgbG9naW5IaW50Pzogc3RyaW5nLCBjdXN0b21SZWRpcmVjdFVyaT86IHN0cmluZywgbm9Qcm9tcHQ/OiBib29sZWFuLCBwYXJhbXM/OiBvYmplY3QpOiBQcm9taXNlPHN0cmluZz4ge1xuICAgICAgICByZXR1cm4gc3VwZXIuY3JlYXRlTG9naW5Vcmwoc3RhdGUsIGxvZ2luSGludCwgY3VzdG9tUmVkaXJlY3RVcmksIG5vUHJvbXB0LCBwYXJhbXMpO1xuICAgIH1cblxuICAgIHB1YmxpYyBhc3luYyB1c2VDaGVja1Rva2VuRmxvdyhsb2dpbkNhbGxiYWNrOiAoKSA9PiB2b2lkKTogUHJvbWlzZTxUb2tlblJlc3BvbnNlIHwgdm9pZD4ge1xuICAgICAgICBjb25zdCBpc0V4cGlyZWQgPSB0aGlzLmNoZWNrSXNUb2tlbkV4cGlyZWQoKTtcbiAgICAgICAgY29uc3QgaXNSZWZyZXNoVG9rZW5FeGlzdCA9IHRoaXMuZ2V0UmVmcmVzaFRva2VuKCk7XG5cbiAgICAgICAgaWYgKCFpc1JlZnJlc2hUb2tlbkV4aXN0KSB7XG4gICAgICAgICAgICByZXR1cm4gbG9naW5DYWxsYmFjaygpO1xuICAgICAgICB9XG5cbiAgICAgICAgaWYgKCFpc0V4cGlyZWQpIHtcbiAgICAgICAgICAgIHJldHVybjtcbiAgICAgICAgfVxuXG4gICAgICAgIHJldHVybiBhd2FpdCB0aGlzLnJlZnJlc2hUb2tlbigpO1xuICAgIH1cblxuICAgIHB1YmxpYyBpbml0QXV0aFJlZnJlc2hFdmVudHMobG9naW5DYWxsYmFjazogKCkgPT4gdm9pZCk6IHZvaWQge1xuICAgICAgICB0aGlzLmV2ZW50cy5waXBlKGZpbHRlcigoZXZlbnQpID0+IGV2ZW50IGluc3RhbmNlb2YgT0F1dGhJbmZvRXZlbnQpKS5zdWJzY3JpYmUoKGV2ZW50KSA9PiB7XG4gICAgICAgICAgICBpZiAoZXZlbnQudHlwZSAhPT0gJ3Rva2VuX2V4cGlyZXMnIHx8IGV2ZW50LmluZm8gIT09ICdhY2Nlc3NfdG9rZW4nKSB7XG4gICAgICAgICAgICAgICAgcmV0dXJuO1xuICAgICAgICAgICAgfVxuXG4gICAgICAgICAgICBpZiAoIXRoaXMuaGFzVmFsaWRBY2Nlc3NUb2tlbigpIHx8ICF0aGlzLmdldFJlZnJlc2hUb2tlbigpKSB7XG4gICAgICAgICAgICAgICAgcmV0dXJuIGxvZ2luQ2FsbGJhY2soKTtcbiAgICAgICAgICAgIH1cblxuICAgICAgICAgICAgdGhpcy5yZWZyZXNoVG9rZW4oKTtcbiAgICAgICAgfSk7XG4gICAgfVxufSJdfQ==
@@ -15,7 +15,7 @@ export class CuiBrowserAuthService extends CuiAuthBase {
15
15
  await this.loadDiscoveryDocument();
16
16
  await this.tryLogin();
17
17
  this.initAuthRefreshEvents(this.initLoginFlow.bind(this));
18
- this.useCheckTokenFlow(this.initLoginFlow.bind(this));
18
+ await this.useCheckTokenFlow(this.initLoginFlow.bind(this));
19
19
  this.router.navigateByUrl(this.location.path(false).split('?')[0]);
20
20
  }
21
21
  static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CuiBrowserAuthService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -27,4 +27,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
27
27
  providedIn: 'root'
28
28
  }]
29
29
  }] });
30
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnJvd3Nlci1hdXRoLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9jb3JlL3NlcnZpY2VzL2Jyb3dzZXItYXV0aC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUMzQyxPQUFPLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUNuRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFHekMsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGdCQUFnQixDQUFDOztBQUs3QyxNQUFNLE9BQU8scUJBQXNCLFNBQVEsV0FBVztJQUh0RDs7UUFJcUIsV0FBTSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUN4QixhQUFRLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0tBY2hEO0lBWlUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxVQUFzQjtRQUN4QyxJQUFJLENBQUMsVUFBVSxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQzlCLElBQUksQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLENBQUM7UUFFM0IsTUFBTSxJQUFJLENBQUMscUJBQXFCLEVBQUUsQ0FBQztRQUNuQyxNQUFNLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUV0QixJQUFJLENBQUMscUJBQXFCLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUMxRCxJQUFJLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUV0RCxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN2RSxDQUFDOytHQWZRLHFCQUFxQjttSEFBckIscUJBQXFCLGNBRmxCLE1BQU07OzRGQUVULHFCQUFxQjtrQkFIakMsVUFBVTttQkFBQztvQkFDUixVQUFVLEVBQUUsTUFBTTtpQkFDckIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBMb2NhdGlvbiB9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbic7XG5pbXBvcnQgeyBpbmplY3QsIEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IFJvdXRlciB9IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XG5pbXBvcnQgdHlwZSB7IEF1dGhDb25maWcgfSBmcm9tICdhbmd1bGFyLW9hdXRoMi1vaWRjJztcblxuaW1wb3J0IHsgQ3VpQXV0aEJhc2UgfSBmcm9tICcuL2F1dGguc2VydmljZSc7XG5cbkBJbmplY3RhYmxlKHtcbiAgICBwcm92aWRlZEluOiAncm9vdCdcbn0pXG5leHBvcnQgY2xhc3MgQ3VpQnJvd3NlckF1dGhTZXJ2aWNlIGV4dGVuZHMgQ3VpQXV0aEJhc2Uge1xuICAgIHByaXZhdGUgcmVhZG9ubHkgcm91dGVyID0gaW5qZWN0KFJvdXRlcik7XG4gICAgcHJpdmF0ZSByZWFkb25seSBsb2NhdGlvbiA9IGluamVjdChMb2NhdGlvbik7XG5cbiAgICBwdWJsaWMgYXN5bmMgaW5pdEF1dGgoYXV0aENvbmZpZzogQXV0aENvbmZpZyk6IFByb21pc2U8dm9pZD4ge1xuICAgICAgICB0aGlzLnNldFN0b3JhZ2UobG9jYWxTdG9yYWdlKTtcbiAgICAgICAgdGhpcy5jb25maWd1cmUoYXV0aENvbmZpZyk7XG5cbiAgICAgICAgYXdhaXQgdGhpcy5sb2FkRGlzY292ZXJ5RG9jdW1lbnQoKTtcbiAgICAgICAgYXdhaXQgdGhpcy50cnlMb2dpbigpO1xuXG4gICAgICAgIHRoaXMuaW5pdEF1dGhSZWZyZXNoRXZlbnRzKHRoaXMuaW5pdExvZ2luRmxvdy5iaW5kKHRoaXMpKTtcbiAgICAgICAgdGhpcy51c2VDaGVja1Rva2VuRmxvdyh0aGlzLmluaXRMb2dpbkZsb3cuYmluZCh0aGlzKSk7XG5cbiAgICAgICAgdGhpcy5yb3V0ZXIubmF2aWdhdGVCeVVybCh0aGlzLmxvY2F0aW9uLnBhdGgoZmFsc2UpLnNwbGl0KCc/JylbMF0pO1xuICAgIH1cbn1cbiJdfQ==
30
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnJvd3Nlci1hdXRoLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9jb3JlL3NlcnZpY2VzL2Jyb3dzZXItYXV0aC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUMzQyxPQUFPLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUNuRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFHekMsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGdCQUFnQixDQUFDOztBQUs3QyxNQUFNLE9BQU8scUJBQXNCLFNBQVEsV0FBVztJQUh0RDs7UUFJcUIsV0FBTSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUN4QixhQUFRLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0tBZWhEO0lBYlUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxVQUFzQjtRQUN4QyxJQUFJLENBQUMsVUFBVSxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQzlCLElBQUksQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLENBQUM7UUFFM0IsTUFBTSxJQUFJLENBQUMscUJBQXFCLEVBQUUsQ0FBQztRQUNuQyxNQUFNLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUV0QixJQUFJLENBQUMscUJBQXFCLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUUxRCxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO1FBRTVELElBQUksQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3ZFLENBQUM7K0dBaEJRLHFCQUFxQjttSEFBckIscUJBQXFCLGNBRmxCLE1BQU07OzRGQUVULHFCQUFxQjtrQkFIakMsVUFBVTttQkFBQztvQkFDUixVQUFVLEVBQUUsTUFBTTtpQkFDckIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBMb2NhdGlvbiB9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbic7XG5pbXBvcnQgeyBpbmplY3QsIEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IFJvdXRlciB9IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XG5pbXBvcnQgdHlwZSB7IEF1dGhDb25maWcgfSBmcm9tICdhbmd1bGFyLW9hdXRoMi1vaWRjJztcblxuaW1wb3J0IHsgQ3VpQXV0aEJhc2UgfSBmcm9tICcuL2F1dGguc2VydmljZSc7XG5cbkBJbmplY3RhYmxlKHtcbiAgICBwcm92aWRlZEluOiAncm9vdCdcbn0pXG5leHBvcnQgY2xhc3MgQ3VpQnJvd3NlckF1dGhTZXJ2aWNlIGV4dGVuZHMgQ3VpQXV0aEJhc2Uge1xuICAgIHByaXZhdGUgcmVhZG9ubHkgcm91dGVyID0gaW5qZWN0KFJvdXRlcik7XG4gICAgcHJpdmF0ZSByZWFkb25seSBsb2NhdGlvbiA9IGluamVjdChMb2NhdGlvbik7XG5cbiAgICBwdWJsaWMgYXN5bmMgaW5pdEF1dGgoYXV0aENvbmZpZzogQXV0aENvbmZpZyk6IFByb21pc2U8dm9pZD4ge1xuICAgICAgICB0aGlzLnNldFN0b3JhZ2UobG9jYWxTdG9yYWdlKTtcbiAgICAgICAgdGhpcy5jb25maWd1cmUoYXV0aENvbmZpZyk7XG5cbiAgICAgICAgYXdhaXQgdGhpcy5sb2FkRGlzY292ZXJ5RG9jdW1lbnQoKTtcbiAgICAgICAgYXdhaXQgdGhpcy50cnlMb2dpbigpO1xuXG4gICAgICAgIHRoaXMuaW5pdEF1dGhSZWZyZXNoRXZlbnRzKHRoaXMuaW5pdExvZ2luRmxvdy5iaW5kKHRoaXMpKTtcblxuICAgICAgICBhd2FpdCB0aGlzLnVzZUNoZWNrVG9rZW5GbG93KHRoaXMuaW5pdExvZ2luRmxvdy5iaW5kKHRoaXMpKTtcblxuICAgICAgICB0aGlzLnJvdXRlci5uYXZpZ2F0ZUJ5VXJsKHRoaXMubG9jYXRpb24ucGF0aChmYWxzZSkuc3BsaXQoJz8nKVswXSk7XG4gICAgfVxufVxuIl19
@@ -0,0 +1,97 @@
1
+ import { inject, signal } from '@angular/core';
2
+ import { OAuthErrorEvent, OAuthService, OAuthSuccessEvent } from 'angular-oauth2-oidc';
3
+ import { CuiActivityTokenExchangeApiService } from '@cuby-ui/api';
4
+ import { from, map, of, switchMap, tap } from 'rxjs';
5
+ class CuiToken extends OAuthService {
6
+ constructor() {
7
+ super(...arguments);
8
+ this.tokenData = signal({});
9
+ }
10
+ getTokenDataFromStore(token) {
11
+ const tokenData = this.tokenData()[token];
12
+ if (tokenData) {
13
+ return tokenData;
14
+ }
15
+ const currentTokenData = this.parseToken(token);
16
+ this.tokenData.set({ [token]: currentTokenData });
17
+ return currentTokenData;
18
+ }
19
+ parseToken(token) {
20
+ try {
21
+ const base64Url = token.split('.')[1];
22
+ const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
23
+ return JSON.parse(atob(base64));
24
+ }
25
+ catch {
26
+ throw new Error('Invalid token');
27
+ }
28
+ }
29
+ }
30
+ export class CuiTokenBase extends CuiToken {
31
+ constructor() {
32
+ super(...arguments);
33
+ this.activityTokenExchangeApiService = inject(CuiActivityTokenExchangeApiService);
34
+ }
35
+ getAccessTokenData() {
36
+ const token = this.getAccessToken();
37
+ if (!token) {
38
+ throw new Error('No access token found');
39
+ }
40
+ return this.getTokenDataFromStore(token);
41
+ }
42
+ checkIsTokenExpired() {
43
+ const token = this.getAccessToken();
44
+ if (!token) {
45
+ return true;
46
+ }
47
+ const expiredTime = this.getAccessTokenExpiration();
48
+ const currentTime = Date.now();
49
+ return currentTime >= expiredTime;
50
+ }
51
+ exchangeToken(params) {
52
+ return new Promise((resolve, reject) => this.activityTokenExchangeApiService
53
+ .tokenExchange(params)
54
+ .pipe(switchMap((tokenResponse) => this.setIdToken(tokenResponse)))
55
+ .subscribe({
56
+ next: (tokenResponse) => {
57
+ this.setTokenResponse(tokenResponse);
58
+ resolve(tokenResponse);
59
+ },
60
+ error: (error) => {
61
+ this.logger.error('Error exchanging token', error);
62
+ reject(error);
63
+ }
64
+ }));
65
+ }
66
+ // TODO: override refreshToken with custom refresh token request to the backend
67
+ refreshToken() {
68
+ return new Promise((resolve, reject) => this.activityTokenExchangeApiService
69
+ .tokenRefresh()
70
+ .pipe(switchMap((tokenResponse) => this.setIdToken(tokenResponse)))
71
+ .subscribe({
72
+ next: (tokenResponse) => {
73
+ this.setTokenResponse(tokenResponse);
74
+ resolve(tokenResponse);
75
+ },
76
+ error: (error) => {
77
+ this.logger.error('Error refreshing token', error);
78
+ this.eventsSubject.next(new OAuthErrorEvent('token_refresh_error', error));
79
+ reject(error);
80
+ }
81
+ }));
82
+ }
83
+ setTokenResponse(tokenResponse) {
84
+ const expiresIn = tokenResponse.expires_in || this.fallbackAccessTokenExpirationTimeInSec;
85
+ this.debug('tokenResponse', tokenResponse);
86
+ this.storeAccessTokenResponse(tokenResponse.access_token, tokenResponse.refresh_token, expiresIn, tokenResponse.scope);
87
+ this.eventsSubject.next(new OAuthSuccessEvent('token_received'));
88
+ this.eventsSubject.next(new OAuthSuccessEvent('token_refreshed'));
89
+ }
90
+ setIdToken(tokenResponse) {
91
+ if (!this.oidc || !tokenResponse.id_token) {
92
+ return of(tokenResponse);
93
+ }
94
+ return from(this.processIdToken(tokenResponse.id_token, tokenResponse.access_token, true)).pipe(tap((result) => this.storeIdToken(result)), map(() => tokenResponse));
95
+ }
96
+ }
97
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"token.service.js","sourceRoot":"","sources":["../../../../projects/core/services/token.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { inject, signal } from '@angular/core';\nimport { OAuthErrorEvent, OAuthService, OAuthSuccessEvent, TokenResponse } from 'angular-oauth2-oidc';\nimport { CuiActivityTokenExchangeApiService, CuiTokenExchangeRequestBody } from '@cuby-ui/api';\nimport { from, map, Observable, of, switchMap, tap } from 'rxjs';\n\nabstract class CuiToken extends OAuthService {\n    private readonly tokenData = signal<{ [key: string]: TokenResponse }>({});\n\n    protected getTokenDataFromStore(token: string): TokenResponse {\n        const tokenData = this.tokenData()[token];\n\n        if (tokenData) {\n            return tokenData;\n        }\n\n        const currentTokenData = this.parseToken(token);\n\n        this.tokenData.set({ [token]: currentTokenData });\n\n        return currentTokenData;\n    }\n\n    private parseToken(token: string): TokenResponse {\n        try {\n            const base64Url = token.split('.')[1];\n            const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');\n\n            return JSON.parse(atob(base64));\n        } catch {\n            throw new Error('Invalid token');\n        }\n    }\n}\n\nexport class CuiTokenBase extends CuiToken {\n    private readonly activityTokenExchangeApiService = inject(CuiActivityTokenExchangeApiService);\n\n    public getAccessTokenData<T extends TokenResponse = TokenResponse>(): T {\n        const token = this.getAccessToken();\n\n        if (!token) {\n            throw new Error('No access token found');\n        }\n\n        return this.getTokenDataFromStore(token) as T;\n    }\n\n    public checkIsTokenExpired(): boolean {\n        const token = this.getAccessToken();\n\n        if (!token) {\n            return true;\n        }\n\n        const expiredTime = this.getAccessTokenExpiration();\n        const currentTime = Date.now();\n\n        return currentTime >= expiredTime;\n    }\n\n    public exchangeToken(params: CuiTokenExchangeRequestBody): Promise<TokenResponse> {\n        return new Promise((resolve, reject) =>\n            this.activityTokenExchangeApiService\n                .tokenExchange(params)\n                .pipe(switchMap((tokenResponse) => this.setIdToken(tokenResponse)))\n                .subscribe({\n                    next: (tokenResponse) => {\n                        this.setTokenResponse(tokenResponse);\n\n                        resolve(tokenResponse);\n                    },\n                    error: (error) => {\n                        this.logger.error('Error exchanging token', error);\n\n                        reject(error);\n                    }\n                })\n        );\n    }\n\n    // TODO: override refreshToken with custom refresh token request to the backend\n    public override refreshToken(): Promise<TokenResponse> {\n        return new Promise((resolve, reject) =>\n            this.activityTokenExchangeApiService\n                .tokenRefresh()\n                .pipe(switchMap((tokenResponse) => this.setIdToken(tokenResponse)))\n                .subscribe({\n                    next: (tokenResponse) => {\n                        this.setTokenResponse(tokenResponse);\n\n                        resolve(tokenResponse);\n                    },\n                    error: (error) => {\n                        this.logger.error('Error refreshing token', error);\n                        this.eventsSubject.next(new OAuthErrorEvent('token_refresh_error', error));\n\n                        reject(error);\n                    }\n                })\n        );\n    }\n\n    private setTokenResponse(tokenResponse: TokenResponse): void {\n        const expiresIn = tokenResponse.expires_in || this.fallbackAccessTokenExpirationTimeInSec!;\n\n        this.debug('tokenResponse', tokenResponse);\n        this.storeAccessTokenResponse(\n            tokenResponse.access_token,\n            tokenResponse.refresh_token,\n            expiresIn,\n            tokenResponse.scope\n        );\n\n        this.eventsSubject.next(new OAuthSuccessEvent('token_received'));\n        this.eventsSubject.next(new OAuthSuccessEvent('token_refreshed'));\n    }\n\n    private setIdToken(tokenResponse: TokenResponse): Observable<TokenResponse> {\n        if (!this.oidc || !tokenResponse.id_token) {\n            return of(tokenResponse);\n        }\n\n        return from(this.processIdToken(tokenResponse.id_token, tokenResponse.access_token, true)).pipe(\n            tap((result) => this.storeIdToken(result)),\n            map(() => tokenResponse)\n        );\n    }\n}\n"]}
@@ -6,9 +6,10 @@ import * as i1$1 from '@cuby-ui/cdk';
6
6
  import { CUI_WINDOW, cuiCreateToken, cuiCreateTokenFromFactory, CuiDestroyService, CuiFilterPipe, CuiLetDirective, CuiPopoverService, cuiProvide, CUI_ANIMATION_FRAME, cuiZonefree, EMPTY_CLIENT_RECT, cuiInjectElement, CUI_LOCAL_STORAGE, CUI_IS_WEBKIT, CuiItemDirective, CuiActiveZone, CuiFocusTrapDirective, cuiGetElementObscures, CUI_IS_MOBILE, CuiHoveredService, cuiPure, cuiPointToClientRect, cuiClamp, cuiPx, cuiIfMap, cuiIsPresent, cuiTypedFromEvent, cuiZonefreeScheduler, cuiZoneOptimized, cuiIsNativeFocused, CuiClickOutsideDirective, CuiTargetDirective, cuiGetClosestFocusable, CuiTime, CuiDimensionsObserverDirective, CuiAutoResizingDirective, CuiIdService, CuiElementDirective, CuiDragPointerDirective, CuiDragDropDirective, CuiDragListDirective, CuiHandleScrollDirective } from '@cuby-ui/cdk';
7
7
  import { DomSanitizer } from '@angular/platform-browser';
8
8
  import { cuiIsIcon, CUI_ICONS } from '@cuby-ui/icons';
9
- import { BehaviorSubject, takeUntil, Observable, merge, distinctUntilChanged, startWith, map, finalize, filter, timer, Subject, switchMap, of, delay, repeat, tap, takeWhile, fromEvent, debounce, skip, take, forkJoin, throttleTime, concatMap, toArray, catchError, throwError, pairwise, debounceTime } from 'rxjs';
9
+ import { BehaviorSubject, takeUntil, Observable, merge, distinctUntilChanged, startWith, map, finalize, switchMap, of, from, tap, filter, timer, Subject, delay, repeat, takeWhile, fromEvent, debounce, skip, take, forkJoin, throttleTime, concatMap, toArray, catchError, throwError, pairwise, debounceTime } from 'rxjs';
10
10
  import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
11
- import { OAuthService, OAuthInfoEvent, provideOAuthClient } from 'angular-oauth2-oidc';
11
+ import { OAuthService, OAuthErrorEvent, OAuthSuccessEvent, OAuthInfoEvent, provideOAuthClient } from 'angular-oauth2-oidc';
12
+ import { CuiActivityTokenExchangeApiService, CuiTreeStructNavigatorApiService, CuiFrameApiService, CuiNodeChecklistApiService, CuiTreeStructApiService } from '@cuby-ui/api';
12
13
  import { trigger, transition, query, animateChild, style, animate, stagger } from '@angular/animations';
13
14
  import * as i2 from '@taiga-ui/polymorpheus';
14
15
  import { PolymorpheusOutlet, PolymorpheusTemplate, PolymorpheusComponent, injectContext } from '@taiga-ui/polymorpheus';
@@ -26,7 +27,6 @@ import { TranslocoDirective, TranslocoService, TranslocoModule } from '@jsverse/
26
27
  import { HttpClient, HttpErrorResponse } from '@angular/common/http';
27
28
  import { createCustomElement } from '@angular/elements';
28
29
  import { Router } from '@angular/router';
29
- import { CuiTreeStructNavigatorApiService, CuiFrameApiService, CuiNodeChecklistApiService, CuiTreeStructApiService } from '@cuby-ui/api';
30
30
 
31
31
  class CuiAccordionComponent {
32
32
  static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CuiAccordionComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
@@ -861,29 +861,113 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
861
861
  }]
862
862
  }] });
863
863
 
864
- class CuiAuthBase extends OAuthService {
865
- createLoginUrl(state, loginHint, customRedirectUri, noPrompt, params) {
866
- return super.createLoginUrl(state, loginHint, customRedirectUri, noPrompt, params);
864
+ class CuiToken extends OAuthService {
865
+ constructor() {
866
+ super(...arguments);
867
+ this.tokenData = signal({});
867
868
  }
868
- useCheckTokenFlow(loginCallback) {
869
- const isTokenExist = this.hasValidAccessToken();
870
- const isRefreshTokenExist = this.getRefreshToken();
871
- if (isTokenExist && isRefreshTokenExist) {
872
- return this.refreshTokenWithExpiredChecking();
869
+ getTokenDataFromStore(token) {
870
+ const tokenData = this.tokenData()[token];
871
+ if (tokenData) {
872
+ return tokenData;
873
+ }
874
+ const currentTokenData = this.parseToken(token);
875
+ this.tokenData.set({ [token]: currentTokenData });
876
+ return currentTokenData;
877
+ }
878
+ parseToken(token) {
879
+ try {
880
+ const base64Url = token.split('.')[1];
881
+ const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
882
+ return JSON.parse(atob(base64));
883
+ }
884
+ catch {
885
+ throw new Error('Invalid token');
873
886
  }
874
- return loginCallback();
887
+ }
888
+ }
889
+ class CuiTokenBase extends CuiToken {
890
+ constructor() {
891
+ super(...arguments);
892
+ this.activityTokenExchangeApiService = inject(CuiActivityTokenExchangeApiService);
893
+ }
894
+ getAccessTokenData() {
895
+ const token = this.getAccessToken();
896
+ if (!token) {
897
+ throw new Error('No access token found');
898
+ }
899
+ return this.getTokenDataFromStore(token);
875
900
  }
876
901
  checkIsTokenExpired() {
902
+ const token = this.getAccessToken();
903
+ if (!token) {
904
+ return true;
905
+ }
877
906
  const expiredTime = this.getAccessTokenExpiration();
878
907
  const currentTime = Date.now();
879
908
  return currentTime >= expiredTime;
880
909
  }
881
- refreshTokenWithExpiredChecking() {
910
+ exchangeToken(params) {
911
+ return new Promise((resolve, reject) => this.activityTokenExchangeApiService
912
+ .tokenExchange(params)
913
+ .pipe(switchMap((tokenResponse) => this.setIdToken(tokenResponse)))
914
+ .subscribe({
915
+ next: (tokenResponse) => {
916
+ this.setTokenResponse(tokenResponse);
917
+ resolve(tokenResponse);
918
+ },
919
+ error: (error) => {
920
+ this.logger.error('Error exchanging token', error);
921
+ reject(error);
922
+ }
923
+ }));
924
+ }
925
+ // TODO: override refreshToken with custom refresh token request to the backend
926
+ refreshToken() {
927
+ return new Promise((resolve, reject) => this.activityTokenExchangeApiService
928
+ .tokenRefresh()
929
+ .pipe(switchMap((tokenResponse) => this.setIdToken(tokenResponse)))
930
+ .subscribe({
931
+ next: (tokenResponse) => {
932
+ this.setTokenResponse(tokenResponse);
933
+ resolve(tokenResponse);
934
+ },
935
+ error: (error) => {
936
+ this.logger.error('Error refreshing token', error);
937
+ this.eventsSubject.next(new OAuthErrorEvent('token_refresh_error', error));
938
+ reject(error);
939
+ }
940
+ }));
941
+ }
942
+ setTokenResponse(tokenResponse) {
943
+ const expiresIn = tokenResponse.expires_in || this.fallbackAccessTokenExpirationTimeInSec;
944
+ this.debug('tokenResponse', tokenResponse);
945
+ this.storeAccessTokenResponse(tokenResponse.access_token, tokenResponse.refresh_token, expiresIn, tokenResponse.scope);
946
+ this.eventsSubject.next(new OAuthSuccessEvent('token_received'));
947
+ this.eventsSubject.next(new OAuthSuccessEvent('token_refreshed'));
948
+ }
949
+ setIdToken(tokenResponse) {
950
+ if (!this.oidc || !tokenResponse.id_token) {
951
+ return of(tokenResponse);
952
+ }
953
+ return from(this.processIdToken(tokenResponse.id_token, tokenResponse.access_token, true)).pipe(tap((result) => this.storeIdToken(result)), map(() => tokenResponse));
954
+ }
955
+ }
956
+
957
+ class CuiAuthBase extends CuiTokenBase {
958
+ createLoginUrl(state, loginHint, customRedirectUri, noPrompt, params) {
959
+ return super.createLoginUrl(state, loginHint, customRedirectUri, noPrompt, params);
960
+ }
961
+ async useCheckTokenFlow(loginCallback) {
882
962
  const isExpired = this.checkIsTokenExpired();
963
+ const isRefreshTokenExist = this.getRefreshToken();
964
+ if (!isRefreshTokenExist) {
965
+ return loginCallback();
966
+ }
883
967
  if (!isExpired) {
884
968
  return;
885
969
  }
886
- this.refreshToken();
970
+ return await this.refreshToken();
887
971
  }
888
972
  initAuthRefreshEvents(loginCallback) {
889
973
  this.events.pipe(filter((event) => event instanceof OAuthInfoEvent)).subscribe((event) => {
@@ -7554,7 +7638,7 @@ class CuiBrowserAuthService extends CuiAuthBase {
7554
7638
  await this.loadDiscoveryDocument();
7555
7639
  await this.tryLogin();
7556
7640
  this.initAuthRefreshEvents(this.initLoginFlow.bind(this));
7557
- this.useCheckTokenFlow(this.initLoginFlow.bind(this));
7641
+ await this.useCheckTokenFlow(this.initLoginFlow.bind(this));
7558
7642
  this.router.navigateByUrl(this.location.path(false).split('?')[0]);
7559
7643
  }
7560
7644
  static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CuiBrowserAuthService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }