@myclub_se/data-access 3.7.3 → 3.7.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2,5 +2,13 @@ import { Auth } from '../../models';
2
2
  import { authSectionFactory } from './auth-section-factory';
3
3
  import { authMemberFactory } from './auth-member-factory';
4
4
  import { authTeamFactory } from './auth-team-factory';
5
- export const authFactory = (apiAuth) => new Auth(apiAuth.id, apiAuth.name, apiAuth.club_admin, apiAuth.is_section_club, apiAuth.members.map((apiAuthMember) => authMemberFactory(apiAuthMember)), apiAuth.registration_enabled, apiAuth.sections.map((apiAuthSection) => authSectionFactory(apiAuthSection)), apiAuth.site_enabled, apiAuth.teams.map((apiAuthTeam) => authTeamFactory(apiAuthTeam)), apiAuth.teams.length > 0, apiAuth.user_name, apiAuth.blocked_members.map((apiAuthMember) => authMemberFactory(apiAuthMember)), apiAuth.club_admin_2fa_required, apiAuth.section_admin_2fa_required, apiAuth.team_admin_2fa_required, apiAuth.member_admin_2fa_required);
6
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC1mYWN0b3J5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvZGF0YS1hY2Nlc3Mvc3JjL2xpYi9zZXJ2aWNlcy9mYWN0b3JpZXMvYXV0aC1mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDcEMsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDNUQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDMUQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRXRELE1BQU0sQ0FBQyxNQUFNLFdBQVcsR0FBRyxDQUFDLE9BQWdCLEVBQUUsRUFBRSxDQUM5QyxJQUFJLElBQUksQ0FDTixPQUFPLENBQUMsRUFBRSxFQUNWLE9BQU8sQ0FBQyxJQUFJLEVBQ1osT0FBTyxDQUFDLFVBQVUsRUFDbEIsT0FBTyxDQUFDLGVBQWUsRUFDdkIsT0FBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxhQUE0QixFQUFFLEVBQUUsQ0FBQyxpQkFBaUIsQ0FBQyxhQUFhLENBQUMsQ0FBQyxFQUN2RixPQUFPLENBQUMsb0JBQW9CLEVBQzVCLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUMsY0FBOEIsRUFBRSxFQUFFLENBQUMsa0JBQWtCLENBQUMsY0FBYyxDQUFDLENBQUMsRUFDNUYsT0FBTyxDQUFDLFlBQVksRUFDcEIsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxXQUF3QixFQUFFLEVBQUUsQ0FBQyxlQUFlLENBQUMsV0FBVyxDQUFDLENBQUMsRUFDN0UsT0FBTyxDQUFDLEtBQUssQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUN4QixPQUFPLENBQUMsU0FBUyxFQUNqQixPQUFPLENBQUMsZUFBZSxDQUFDLEdBQUcsQ0FBQyxDQUFDLGFBQTRCLEVBQUUsRUFBRSxDQUFDLGlCQUFpQixDQUFDLGFBQWEsQ0FBQyxDQUFDLEVBQy9GLE9BQU8sQ0FBQyx1QkFBdUIsRUFDL0IsT0FBTyxDQUFDLDBCQUEwQixFQUNsQyxPQUFPLENBQUMsdUJBQXVCLEVBQy9CLE9BQU8sQ0FBQyx5QkFBeUIsQ0FDbEMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFwaUF1dGgsIEFwaUF1dGhNZW1iZXIsIEFwaUF1dGhTZWN0aW9uLCBBcGlBdXRoVGVhbSB9IGZyb20gJy4uLy4uL2FwaS1tb2RlbHMnO1xuaW1wb3J0IHsgQXV0aCB9IGZyb20gJy4uLy4uL21vZGVscyc7XG5pbXBvcnQgeyBhdXRoU2VjdGlvbkZhY3RvcnkgfSBmcm9tICcuL2F1dGgtc2VjdGlvbi1mYWN0b3J5JztcbmltcG9ydCB7IGF1dGhNZW1iZXJGYWN0b3J5IH0gZnJvbSAnLi9hdXRoLW1lbWJlci1mYWN0b3J5JztcbmltcG9ydCB7IGF1dGhUZWFtRmFjdG9yeSB9IGZyb20gJy4vYXV0aC10ZWFtLWZhY3RvcnknO1xuXG5leHBvcnQgY29uc3QgYXV0aEZhY3RvcnkgPSAoYXBpQXV0aDogQXBpQXV0aCkgPT5cbiAgbmV3IEF1dGgoXG4gICAgYXBpQXV0aC5pZCxcbiAgICBhcGlBdXRoLm5hbWUsXG4gICAgYXBpQXV0aC5jbHViX2FkbWluLFxuICAgIGFwaUF1dGguaXNfc2VjdGlvbl9jbHViLFxuICAgIGFwaUF1dGgubWVtYmVycy5tYXAoKGFwaUF1dGhNZW1iZXI6IEFwaUF1dGhNZW1iZXIpID0+IGF1dGhNZW1iZXJGYWN0b3J5KGFwaUF1dGhNZW1iZXIpKSxcbiAgICBhcGlBdXRoLnJlZ2lzdHJhdGlvbl9lbmFibGVkLFxuICAgIGFwaUF1dGguc2VjdGlvbnMubWFwKChhcGlBdXRoU2VjdGlvbjogQXBpQXV0aFNlY3Rpb24pID0+IGF1dGhTZWN0aW9uRmFjdG9yeShhcGlBdXRoU2VjdGlvbikpLFxuICAgIGFwaUF1dGguc2l0ZV9lbmFibGVkLFxuICAgIGFwaUF1dGgudGVhbXMubWFwKChhcGlBdXRoVGVhbTogQXBpQXV0aFRlYW0pID0+IGF1dGhUZWFtRmFjdG9yeShhcGlBdXRoVGVhbSkpLFxuICAgIGFwaUF1dGgudGVhbXMubGVuZ3RoID4gMCxcbiAgICBhcGlBdXRoLnVzZXJfbmFtZSxcbiAgICBhcGlBdXRoLmJsb2NrZWRfbWVtYmVycy5tYXAoKGFwaUF1dGhNZW1iZXI6IEFwaUF1dGhNZW1iZXIpID0+IGF1dGhNZW1iZXJGYWN0b3J5KGFwaUF1dGhNZW1iZXIpKSxcbiAgICBhcGlBdXRoLmNsdWJfYWRtaW5fMmZhX3JlcXVpcmVkLFxuICAgIGFwaUF1dGguc2VjdGlvbl9hZG1pbl8yZmFfcmVxdWlyZWQsXG4gICAgYXBpQXV0aC50ZWFtX2FkbWluXzJmYV9yZXF1aXJlZCxcbiAgICBhcGlBdXRoLm1lbWJlcl9hZG1pbl8yZmFfcmVxdWlyZWRcbiAgKTtcbiJdfQ==
5
+ export const authFactory = (apiAuth) => {
6
+ // teamsLoaded guards against repeated team loading (the success reducer sets it true once the
7
+ // full team list is fetched). Club/section admins must always load their full team list first,
8
+ // even when the payload already contains personal teams (team admin/member) — otherwise they
9
+ // would never receive the rest of their club's/section's groups. Non-admins never load teams,
10
+ // so their payload teams are already the complete set.
11
+ const isAdmin = apiAuth.club_admin || apiAuth.sections.length > 0;
12
+ return new Auth(apiAuth.id, apiAuth.name, apiAuth.club_admin, apiAuth.is_section_club, apiAuth.members.map((apiAuthMember) => authMemberFactory(apiAuthMember)), apiAuth.registration_enabled, apiAuth.sections.map((apiAuthSection) => authSectionFactory(apiAuthSection)), apiAuth.site_enabled, apiAuth.teams.map((apiAuthTeam) => authTeamFactory(apiAuthTeam)), isAdmin ? false : apiAuth.teams.length > 0, apiAuth.user_name, apiAuth.blocked_members.map((apiAuthMember) => authMemberFactory(apiAuthMember)), apiAuth.club_admin_2fa_required, apiAuth.section_admin_2fa_required, apiAuth.team_admin_2fa_required, apiAuth.member_admin_2fa_required);
13
+ };
14
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC1mYWN0b3J5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvZGF0YS1hY2Nlc3Mvc3JjL2xpYi9zZXJ2aWNlcy9mYWN0b3JpZXMvYXV0aC1mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDcEMsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDNUQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDMUQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRXRELE1BQU0sQ0FBQyxNQUFNLFdBQVcsR0FBRyxDQUFDLE9BQWdCLEVBQUUsRUFBRTtJQUM5Qyw4RkFBOEY7SUFDOUYsK0ZBQStGO0lBQy9GLDZGQUE2RjtJQUM3Riw4RkFBOEY7SUFDOUYsdURBQXVEO0lBQ3ZELE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxVQUFVLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDO0lBRWxFLE9BQU8sSUFBSSxJQUFJLENBQ2IsT0FBTyxDQUFDLEVBQUUsRUFDVixPQUFPLENBQUMsSUFBSSxFQUNaLE9BQU8sQ0FBQyxVQUFVLEVBQ2xCLE9BQU8sQ0FBQyxlQUFlLEVBQ3ZCLE9BQU8sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsYUFBNEIsRUFBRSxFQUFFLENBQUMsaUJBQWlCLENBQUMsYUFBYSxDQUFDLENBQUMsRUFDdkYsT0FBTyxDQUFDLG9CQUFvQixFQUM1QixPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFDLGNBQThCLEVBQUUsRUFBRSxDQUFDLGtCQUFrQixDQUFDLGNBQWMsQ0FBQyxDQUFDLEVBQzVGLE9BQU8sQ0FBQyxZQUFZLEVBQ3BCLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsV0FBd0IsRUFBRSxFQUFFLENBQUMsZUFBZSxDQUFDLFdBQVcsQ0FBQyxDQUFDLEVBQzdFLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQzFDLE9BQU8sQ0FBQyxTQUFTLEVBQ2pCLE9BQU8sQ0FBQyxlQUFlLENBQUMsR0FBRyxDQUFDLENBQUMsYUFBNEIsRUFBRSxFQUFFLENBQUMsaUJBQWlCLENBQUMsYUFBYSxDQUFDLENBQUMsRUFDL0YsT0FBTyxDQUFDLHVCQUF1QixFQUMvQixPQUFPLENBQUMsMEJBQTBCLEVBQ2xDLE9BQU8sQ0FBQyx1QkFBdUIsRUFDL0IsT0FBTyxDQUFDLHlCQUF5QixDQUNsQyxDQUFDO0FBQ0osQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQXBpQXV0aCwgQXBpQXV0aE1lbWJlciwgQXBpQXV0aFNlY3Rpb24sIEFwaUF1dGhUZWFtIH0gZnJvbSAnLi4vLi4vYXBpLW1vZGVscyc7XG5pbXBvcnQgeyBBdXRoIH0gZnJvbSAnLi4vLi4vbW9kZWxzJztcbmltcG9ydCB7IGF1dGhTZWN0aW9uRmFjdG9yeSB9IGZyb20gJy4vYXV0aC1zZWN0aW9uLWZhY3RvcnknO1xuaW1wb3J0IHsgYXV0aE1lbWJlckZhY3RvcnkgfSBmcm9tICcuL2F1dGgtbWVtYmVyLWZhY3RvcnknO1xuaW1wb3J0IHsgYXV0aFRlYW1GYWN0b3J5IH0gZnJvbSAnLi9hdXRoLXRlYW0tZmFjdG9yeSc7XG5cbmV4cG9ydCBjb25zdCBhdXRoRmFjdG9yeSA9IChhcGlBdXRoOiBBcGlBdXRoKSA9PiB7XG4gIC8vIHRlYW1zTG9hZGVkIGd1YXJkcyBhZ2FpbnN0IHJlcGVhdGVkIHRlYW0gbG9hZGluZyAodGhlIHN1Y2Nlc3MgcmVkdWNlciBzZXRzIGl0IHRydWUgb25jZSB0aGVcbiAgLy8gZnVsbCB0ZWFtIGxpc3QgaXMgZmV0Y2hlZCkuIENsdWIvc2VjdGlvbiBhZG1pbnMgbXVzdCBhbHdheXMgbG9hZCB0aGVpciBmdWxsIHRlYW0gbGlzdCBmaXJzdCxcbiAgLy8gZXZlbiB3aGVuIHRoZSBwYXlsb2FkIGFscmVhZHkgY29udGFpbnMgcGVyc29uYWwgdGVhbXMgKHRlYW0gYWRtaW4vbWVtYmVyKSDigJQgb3RoZXJ3aXNlIHRoZXlcbiAgLy8gd291bGQgbmV2ZXIgcmVjZWl2ZSB0aGUgcmVzdCBvZiB0aGVpciBjbHViJ3Mvc2VjdGlvbidzIGdyb3Vwcy4gTm9uLWFkbWlucyBuZXZlciBsb2FkIHRlYW1zLFxuICAvLyBzbyB0aGVpciBwYXlsb2FkIHRlYW1zIGFyZSBhbHJlYWR5IHRoZSBjb21wbGV0ZSBzZXQuXG4gIGNvbnN0IGlzQWRtaW4gPSBhcGlBdXRoLmNsdWJfYWRtaW4gfHwgYXBpQXV0aC5zZWN0aW9ucy5sZW5ndGggPiAwO1xuXG4gIHJldHVybiBuZXcgQXV0aChcbiAgICBhcGlBdXRoLmlkLFxuICAgIGFwaUF1dGgubmFtZSxcbiAgICBhcGlBdXRoLmNsdWJfYWRtaW4sXG4gICAgYXBpQXV0aC5pc19zZWN0aW9uX2NsdWIsXG4gICAgYXBpQXV0aC5tZW1iZXJzLm1hcCgoYXBpQXV0aE1lbWJlcjogQXBpQXV0aE1lbWJlcikgPT4gYXV0aE1lbWJlckZhY3RvcnkoYXBpQXV0aE1lbWJlcikpLFxuICAgIGFwaUF1dGgucmVnaXN0cmF0aW9uX2VuYWJsZWQsXG4gICAgYXBpQXV0aC5zZWN0aW9ucy5tYXAoKGFwaUF1dGhTZWN0aW9uOiBBcGlBdXRoU2VjdGlvbikgPT4gYXV0aFNlY3Rpb25GYWN0b3J5KGFwaUF1dGhTZWN0aW9uKSksXG4gICAgYXBpQXV0aC5zaXRlX2VuYWJsZWQsXG4gICAgYXBpQXV0aC50ZWFtcy5tYXAoKGFwaUF1dGhUZWFtOiBBcGlBdXRoVGVhbSkgPT4gYXV0aFRlYW1GYWN0b3J5KGFwaUF1dGhUZWFtKSksXG4gICAgaXNBZG1pbiA/IGZhbHNlIDogYXBpQXV0aC50ZWFtcy5sZW5ndGggPiAwLFxuICAgIGFwaUF1dGgudXNlcl9uYW1lLFxuICAgIGFwaUF1dGguYmxvY2tlZF9tZW1iZXJzLm1hcCgoYXBpQXV0aE1lbWJlcjogQXBpQXV0aE1lbWJlcikgPT4gYXV0aE1lbWJlckZhY3RvcnkoYXBpQXV0aE1lbWJlcikpLFxuICAgIGFwaUF1dGguY2x1Yl9hZG1pbl8yZmFfcmVxdWlyZWQsXG4gICAgYXBpQXV0aC5zZWN0aW9uX2FkbWluXzJmYV9yZXF1aXJlZCxcbiAgICBhcGlBdXRoLnRlYW1fYWRtaW5fMmZhX3JlcXVpcmVkLFxuICAgIGFwaUF1dGgubWVtYmVyX2FkbWluXzJmYV9yZXF1aXJlZFxuICApO1xufTtcbiJdfQ==
@@ -55,12 +55,19 @@ export class AuthEffects {
55
55
  else {
56
56
  const sectionsTeams$ = payload.sections.map((section) => this.teamService.getSectionTeams(section.id));
57
57
  return forkJoin(sectionsTeams$).pipe(map((results) => {
58
- const sortedTeams = results
59
- .flatMap((result) => result.toArray())
60
- .sort((a, b) => a.name.localeCompare(b.name));
58
+ const sectionTeams = results
59
+ .flatMap((result) => result.toArray());
60
+ // Union the fetched section teams with any teams already on the auth (e.g. a team the
61
+ // user admins outside the sections they administer), keyed by id. Fetched SearchTeams
62
+ // win on duplicates so the richer section_name is kept.
63
+ const teamsById = new Map();
64
+ [...payload.teams, ...sectionTeams].forEach((team) => teamsById.set(team.id, team));
65
+ const mergedTeams = [...teamsById.values()].sort((a, b) => a.name.localeCompare(b.name));
61
66
  const auth = {
62
67
  ...payload,
63
- teams: sortedTeams,
68
+ // teams is typed as AuthTeam[] | SearchTeam[]; the merged list may mix both shapes,
69
+ // which consumers already handle (they read id/name/section_name | section?.name).
70
+ teams: mergedTeams,
64
71
  };
65
72
  return listAuthTeamsSuccessAction({ payload: auth });
66
73
  }), catchError((error) => of(listAuthTeamsFailureAction({ payload: error }))));
@@ -124,4 +131,4 @@ export class AuthEffects {
124
131
  i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: AuthEffects, decorators: [{
125
132
  type: Injectable
126
133
  }] });
127
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth.effects.js","sourceRoot":"","sources":["../../../../../../projects/data-access/src/lib/store/effects/auth.effects.ts"],"names":[],"mappings":"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","sourcesContent":["import { inject, Injectable } from '@angular/core';\nimport { Actions, createEffect, ofType } from '@ngrx/effects';\nimport {\n  AuthService,\n  STORAGE_SELECTED_AUTH,\n  STORAGE_SELECTED_MEMBERS,\n  STORAGE_TOKEN,\n  StorageService,\n  TeamService\n} from '../../services';\nimport {\n  clearAuthenticationAction,\n  clearAuthenticationSuccessAction,\n  clearCurrentAuthAction,\n  clearCurrentAuthSuccessAction,\n  clearStoreAction,\n  getCurrentAuthAction,\n  getCurrentAuthSuccessAction,\n  listAuthAction,\n  listAuthFailureAction,\n  listAuthSuccessAction,\n  listAuthTeamsAction,\n  listAuthTeamsFailureAction,\n  listAuthTeamsSuccessAction,\n  refreshAuthsAction,\n  refreshAuthsFailureAction,\n  refreshAuthsSuccessAction,\n  removeMemberAuthAction,\n  removeMemberAuthFailureAction,\n  removeMemberAuthSuccessAction,\n  removeTeamAuthAction,\n  removeTeamAuthFailureAction,\n  removeTeamAuthSuccessAction,\n  setCurrentAuthAction,\n  unblockMemberAuthAction,\n  unblockMemberAuthFailureAction,\n  unblockMemberAuthSuccessAction\n} from '../actions';\nimport { exhaustMap, forkJoin, mergeMap, Observable, of, switchMap } from 'rxjs';\nimport { catchError, map } from 'rxjs/operators';\nimport { HttpErrorResponse } from '@angular/common/http';\nimport { Auth, Collection, SearchTeam } from '../../models';\nimport { RemoveMemberAuthInterface, RemoveTeamAuthInterface } from '../interfaces';\nimport { AuthenticationService } from '../../authentication';\n\n@Injectable()\nexport class AuthEffects {\n  private actions$ = inject(Actions);\n  private authenticationService = inject(AuthenticationService);\n  private authService = inject(AuthService);\n  private storageService = inject(StorageService);\n  private teamService = inject(TeamService);\n\n  clearAuthentication$ = createEffect(() => this.actions$\n    .pipe(\n      ofType(clearAuthenticationAction),\n      exhaustMap(() =>\n        forkJoin(\n          {\n            tokenRemoval: this.storageService.removeAsObservable(STORAGE_TOKEN),\n            selectedAuthRemoval: this.storageService.removeAsObservable(STORAGE_SELECTED_AUTH),\n            selectedMembersRemoval: this.storageService.removeAsObservable(STORAGE_SELECTED_MEMBERS),\n          }\n        ).pipe(\n          mergeMap(() => {\n            this.authenticationService.clearAuthentication();\n            return [\n              clearStoreAction(),\n              clearAuthenticationSuccessAction()\n            ]\n          })\n        )\n      )\n    )\n  );\n\n  clearCurrent$ = createEffect(() => this.actions$\n    .pipe(\n      ofType(clearCurrentAuthAction),\n      exhaustMap(() => this.storageService.removeAsObservable(STORAGE_SELECTED_AUTH)\n        .pipe(\n          map(() => clearCurrentAuthSuccessAction())\n        )\n      )\n    )\n  );\n\n  getCurrent$ = createEffect(() => this.actions$\n    .pipe(\n      ofType(getCurrentAuthAction),\n      exhaustMap(() => this.storageService.getAsObservable(STORAGE_SELECTED_AUTH)\n        .pipe(\n          map((auth: Auth | null | undefined) => {\n            if (auth === undefined) {\n              return getCurrentAuthSuccessAction({payload: null});\n            }\n            return getCurrentAuthSuccessAction({payload: auth});\n          })\n        )\n      )\n    )\n  );\n\n  listAuth$ = createEffect(() => this.actions$\n    .pipe(\n      ofType(listAuthAction),\n      switchMap(({payload}) => this.authService.getAuths(payload)\n        .pipe(\n          map((auths: Collection<Auth>) => listAuthSuccessAction({payload: auths.toArray()})),\n          catchError((error: HttpErrorResponse) => of(listAuthFailureAction({payload: error})))\n        )\n      )\n    )\n  );\n\n  listAuthTeams$ = createEffect(() => this.actions$\n    .pipe(\n      ofType(listAuthTeamsAction),\n      mergeMap(({payload}) => {\n        if (payload.clubAdmin) {\n          return this.teamService.getClubTeams(payload.id)\n            .pipe(\n              map((searchTeams: Collection<SearchTeam>) => {\n                const auth = {\n                  ...payload,\n                  teams: searchTeams.toArray()\n                    .sort((a: SearchTeam, b: SearchTeam) => a.name.localeCompare(b.name))\n                };\n\n                return listAuthTeamsSuccessAction({payload: auth});\n              }),\n              catchError((error: HttpErrorResponse) => of(listAuthTeamsFailureAction({payload: error})))\n            );\n        } else {\n          const sectionsTeams$: Array<Observable<Collection<SearchTeam>>> = payload.sections.map((section) =>\n            this.teamService.getSectionTeams(section.id)\n          );\n\n          return forkJoin(sectionsTeams$).pipe(\n            map((results: Array<Collection<SearchTeam>>) => {\n              const sortedTeams: Array<SearchTeam> = results\n                .flatMap((result: Collection<SearchTeam>) => result.toArray())\n                .sort((a, b) => a.name.localeCompare(b.name));\n              const auth = {\n                ...payload,\n                teams: sortedTeams,\n              };\n              return listAuthTeamsSuccessAction({payload: auth});\n            }),\n            catchError((error: HttpErrorResponse) => of(listAuthTeamsFailureAction({payload: error})))\n          );\n        }\n      })\n    )\n  );\n\n  refresh$ = createEffect(() => this.actions$\n    .pipe(\n      ofType(refreshAuthsAction),\n      exhaustMap(() => this.authService.updateMembers()\n        .pipe(\n          mergeMap((success: boolean) => {\n            if (success) {\n              return [\n                refreshAuthsSuccessAction(),\n                listAuthAction()\n              ];\n            } else {\n              return of(refreshAuthsFailureAction());\n            }\n          }),\n          catchError(() => of(refreshAuthsFailureAction()))\n        )\n      )\n    )\n  );\n\n  removeMember$ = createEffect(() => this.actions$\n    .pipe(\n      ofType(removeMemberAuthAction),\n      exhaustMap(({payload}: {\n          payload: RemoveMemberAuthInterface\n        }) => this.authService.removeMemberAuth(payload.authId, payload.memberId)\n          .pipe(\n            map((value: boolean) => value ? removeMemberAuthSuccessAction() : removeMemberAuthFailureAction()),\n            catchError(() => of(removeMemberAuthFailureAction()))\n          )\n      )\n    )\n  );\n\n  removeTeam$ = createEffect(() => this.actions$\n    .pipe(\n      ofType(removeTeamAuthAction),\n      exhaustMap(({payload}: {\n          payload: RemoveTeamAuthInterface\n        }) => this.authService.removeTeamAuth(payload.authId, payload.teamId)\n          .pipe(\n            map((value: boolean) => value ? removeTeamAuthSuccessAction() : removeTeamAuthFailureAction()),\n            catchError(() => of(removeMemberAuthFailureAction()))\n          )\n      )\n    )\n  );\n\n  setCurrent$ = createEffect(() => this.actions$\n    .pipe(\n      ofType(setCurrentAuthAction),\n      exhaustMap(({payload}: { payload: Auth }) => this.storageService.getAsObservable(STORAGE_SELECTED_AUTH)\n        .pipe(\n          mergeMap((oldAuth: Auth) => {\n            return this.storageService.setAsObservable(STORAGE_SELECTED_AUTH, payload)\n              .pipe(\n                mergeMap((newAuth: Auth) => {\n                  if (oldAuth && newAuth.id === oldAuth.id && ((newAuth.members && newAuth.members.length === oldAuth.members.length) || (newAuth.teams && newAuth.teams.length === oldAuth.teams.length && newAuth.teams[0].id === oldAuth.teams[0].id))) {\n                    return [\n                      getCurrentAuthSuccessAction({payload: newAuth})\n                    ]\n                  } else {\n                    return [\n                      getCurrentAuthSuccessAction({payload: newAuth}),\n                      clearStoreAction()\n                    ]\n                  }\n                })\n              )\n          })\n        )\n      )\n    )\n  );\n\n  unblockMember$ = createEffect(() => this.actions$\n    .pipe(\n      ofType(unblockMemberAuthAction),\n      exhaustMap(({payload}: {payload: {userId: string, clubId: string, memberId: string}}) => this.authService.unblockMember(payload.userId, payload.clubId, payload.memberId)\n        .pipe(\n          mergeMap((success: boolean) => {\n            if (success) {\n              return [\n                unblockMemberAuthSuccessAction(),\n                refreshAuthsAction()\n              ];\n            }\n            return [\n              unblockMemberAuthFailureAction({\n              payload: new HttpErrorResponse({status: 400})\n            })];\n          }),\n          catchError((err: HttpErrorResponse) => of(unblockMemberAuthFailureAction({payload: err})))\n        )\n      )\n    )\n  )\n}\n"]}
134
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth.effects.js","sourceRoot":"","sources":["../../../../../../projects/data-access/src/lib/store/effects/auth.effects.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EACL,WAAW,EACX,qBAAqB,EACrB,wBAAwB,EACxB,aAAa,EACb,cAAc,EACd,WAAW,EACZ,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,yBAAyB,EACzB,gCAAgC,EAChC,sBAAsB,EACtB,6BAA6B,EAC7B,gBAAgB,EAChB,oBAAoB,EACpB,2BAA2B,EAC3B,cAAc,EACd,qBAAqB,EACrB,qBAAqB,EACrB,mBAAmB,EACnB,0BAA0B,EAC1B,0BAA0B,EAC1B,kBAAkB,EAClB,yBAAyB,EACzB,yBAAyB,EACzB,sBAAsB,EACtB,6BAA6B,EAC7B,6BAA6B,EAC7B,oBAAoB,EACpB,2BAA2B,EAC3B,2BAA2B,EAC3B,oBAAoB,EACpB,uBAAuB,EACvB,8BAA8B,EAC9B,8BAA8B,EAC/B,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAc,EAAE,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjF,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;;AAG7D,MAAM,OAAO,WAAW;IACd,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAC3B,qBAAqB,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;IACtD,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;IAClC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;IACxC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;IAE1C,oBAAoB,GAAG,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ;SACpD,IAAI,CACH,MAAM,CAAC,yBAAyB,CAAC,EACjC,UAAU,CAAC,GAAG,EAAE,CACd,QAAQ,CACN;QACE,YAAY,EAAE,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,aAAa,CAAC;QACnE,mBAAmB,EAAE,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,qBAAqB,CAAC;QAClF,sBAAsB,EAAE,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,wBAAwB,CAAC;KACzF,CACF,CAAC,IAAI,CACJ,QAAQ,CAAC,GAAG,EAAE;QACZ,IAAI,CAAC,qBAAqB,CAAC,mBAAmB,EAAE,CAAC;QACjD,OAAO;YACL,gBAAgB,EAAE;YAClB,gCAAgC,EAAE;SACnC,CAAA;IACH,CAAC,CAAC,CACH,CACF,CACF,CACF,CAAC;IAEF,aAAa,GAAG,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ;SAC7C,IAAI,CACH,MAAM,CAAC,sBAAsB,CAAC,EAC9B,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,qBAAqB,CAAC;SAC3E,IAAI,CACH,GAAG,CAAC,GAAG,EAAE,CAAC,6BAA6B,EAAE,CAAC,CAC3C,CACF,CACF,CACF,CAAC;IAEF,WAAW,GAAG,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ;SAC3C,IAAI,CACH,MAAM,CAAC,oBAAoB,CAAC,EAC5B,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,qBAAqB,CAAC;SACxE,IAAI,CACH,GAAG,CAAC,CAAC,IAA6B,EAAE,EAAE;QACpC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,OAAO,2BAA2B,CAAC,EAAC,OAAO,EAAE,IAAI,EAAC,CAAC,CAAC;QACtD,CAAC;QACD,OAAO,2BAA2B,CAAC,EAAC,OAAO,EAAE,IAAI,EAAC,CAAC,CAAC;IACtD,CAAC,CAAC,CACH,CACF,CACF,CACF,CAAC;IAEF,SAAS,GAAG,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ;SACzC,IAAI,CACH,MAAM,CAAC,cAAc,CAAC,EACtB,SAAS,CAAC,CAAC,EAAC,OAAO,EAAC,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC;SACxD,IAAI,CACH,GAAG,CAAC,CAAC,KAAuB,EAAE,EAAE,CAAC,qBAAqB,CAAC,EAAC,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,EAAC,CAAC,CAAC,EACnF,UAAU,CAAC,CAAC,KAAwB,EAAE,EAAE,CAAC,EAAE,CAAC,qBAAqB,CAAC,EAAC,OAAO,EAAE,KAAK,EAAC,CAAC,CAAC,CAAC,CACtF,CACF,CACF,CACF,CAAC;IAEF,cAAc,GAAG,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ;SAC9C,IAAI,CACH,MAAM,CAAC,mBAAmB,CAAC,EAC3B,QAAQ,CAAC,CAAC,EAAC,OAAO,EAAC,EAAE,EAAE;QACrB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;iBAC7C,IAAI,CACH,GAAG,CAAC,CAAC,WAAmC,EAAE,EAAE;gBAC1C,MAAM,IAAI,GAAG;oBACX,GAAG,OAAO;oBACV,KAAK,EAAE,WAAW,CAAC,OAAO,EAAE;yBACzB,IAAI,CAAC,CAAC,CAAa,EAAE,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;iBACxE,CAAC;gBAEF,OAAO,0BAA0B,CAAC,EAAC,OAAO,EAAE,IAAI,EAAC,CAAC,CAAC;YACrD,CAAC,CAAC,EACF,UAAU,CAAC,CAAC,KAAwB,EAAE,EAAE,CAAC,EAAE,CAAC,0BAA0B,CAAC,EAAC,OAAO,EAAE,KAAK,EAAC,CAAC,CAAC,CAAC,CAC3F,CAAC;QACN,CAAC;aAAM,CAAC;YACN,MAAM,cAAc,GAA8C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACjG,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,CAC7C,CAAC;YAEF,OAAO,QAAQ,CAAC,cAAc,CAAC,CAAC,IAAI,CAClC,GAAG,CAAC,CAAC,OAAsC,EAAE,EAAE;gBAC7C,MAAM,YAAY,GAAsB,OAAO;qBAC5C,OAAO,CAAC,CAAC,MAA8B,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;gBACjE,sFAAsF;gBACtF,sFAAsF;gBACtF,wDAAwD;gBACxD,MAAM,SAAS,GAAG,IAAI,GAAG,EAAiC,CAAC;gBAC3D,CAAC,GAAG,OAAO,CAAC,KAAK,EAAE,GAAG,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;gBACpF,MAAM,WAAW,GAAG,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;gBACzF,MAAM,IAAI,GAAG;oBACX,GAAG,OAAO;oBACV,oFAAoF;oBACpF,mFAAmF;oBACnF,KAAK,EAAE,WAA2B;iBACnC,CAAC;gBACF,OAAO,0BAA0B,CAAC,EAAC,OAAO,EAAE,IAAI,EAAC,CAAC,CAAC;YACrD,CAAC,CAAC,EACF,UAAU,CAAC,CAAC,KAAwB,EAAE,EAAE,CAAC,EAAE,CAAC,0BAA0B,CAAC,EAAC,OAAO,EAAE,KAAK,EAAC,CAAC,CAAC,CAAC,CAC3F,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CACH,CACF,CAAC;IAEF,QAAQ,GAAG,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ;SACxC,IAAI,CACH,MAAM,CAAC,kBAAkB,CAAC,EAC1B,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE;SAC9C,IAAI,CACH,QAAQ,CAAC,CAAC,OAAgB,EAAE,EAAE;QAC5B,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO;gBACL,yBAAyB,EAAE;gBAC3B,cAAc,EAAE;aACjB,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,CAAC,yBAAyB,EAAE,CAAC,CAAC;QACzC,CAAC;IACH,CAAC,CAAC,EACF,UAAU,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,yBAAyB,EAAE,CAAC,CAAC,CAClD,CACF,CACF,CACF,CAAC;IAEF,aAAa,GAAG,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ;SAC7C,IAAI,CACH,MAAM,CAAC,sBAAsB,CAAC,EAC9B,UAAU,CAAC,CAAC,EAAC,OAAO,EAEjB,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC;SACtE,IAAI,CACH,GAAG,CAAC,CAAC,KAAc,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,6BAA6B,EAAE,CAAC,CAAC,CAAC,6BAA6B,EAAE,CAAC,EAClG,UAAU,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,6BAA6B,EAAE,CAAC,CAAC,CACtD,CACJ,CACF,CACF,CAAC;IAEF,WAAW,GAAG,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ;SAC3C,IAAI,CACH,MAAM,CAAC,oBAAoB,CAAC,EAC5B,UAAU,CAAC,CAAC,EAAC,OAAO,EAEjB,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC;SAClE,IAAI,CACH,GAAG,CAAC,CAAC,KAAc,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,2BAA2B,EAAE,CAAC,CAAC,CAAC,2BAA2B,EAAE,CAAC,EAC9F,UAAU,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,6BAA6B,EAAE,CAAC,CAAC,CACtD,CACJ,CACF,CACF,CAAC;IAEF,WAAW,GAAG,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ;SAC3C,IAAI,CACH,MAAM,CAAC,oBAAoB,CAAC,EAC5B,UAAU,CAAC,CAAC,EAAC,OAAO,EAAoB,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,qBAAqB,CAAC;SACpG,IAAI,CACH,QAAQ,CAAC,CAAC,OAAa,EAAE,EAAE;QACzB,OAAO,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,qBAAqB,EAAE,OAAO,CAAC;aACvE,IAAI,CACH,QAAQ,CAAC,CAAC,OAAa,EAAE,EAAE;YACzB,IAAI,OAAO,IAAI,OAAO,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,OAAO,CAAC,KAAK,CAAC,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;gBACxO,OAAO;oBACL,2BAA2B,CAAC,EAAC,OAAO,EAAE,OAAO,EAAC,CAAC;iBAChD,CAAA;YACH,CAAC;iBAAM,CAAC;gBACN,OAAO;oBACL,2BAA2B,CAAC,EAAC,OAAO,EAAE,OAAO,EAAC,CAAC;oBAC/C,gBAAgB,EAAE;iBACnB,CAAA;YACH,CAAC;QACH,CAAC,CAAC,CACH,CAAA;IACL,CAAC,CAAC,CACH,CACF,CACF,CACF,CAAC;IAEF,cAAc,GAAG,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ;SAC9C,IAAI,CACH,MAAM,CAAC,uBAAuB,CAAC,EAC/B,UAAU,CAAC,CAAC,EAAC,OAAO,EAAgE,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC;SACtK,IAAI,CACH,QAAQ,CAAC,CAAC,OAAgB,EAAE,EAAE;QAC5B,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO;gBACL,8BAA8B,EAAE;gBAChC,kBAAkB,EAAE;aACrB,CAAC;QACJ,CAAC;QACD,OAAO;YACL,8BAA8B,CAAC;gBAC/B,OAAO,EAAE,IAAI,iBAAiB,CAAC,EAAC,MAAM,EAAE,GAAG,EAAC,CAAC;aAC9C,CAAC;SAAC,CAAC;IACN,CAAC,CAAC,EACF,UAAU,CAAC,CAAC,GAAsB,EAAE,EAAE,CAAC,EAAE,CAAC,8BAA8B,CAAC,EAAC,OAAO,EAAE,GAAG,EAAC,CAAC,CAAC,CAAC,CAC3F,CACF,CACF,CACF,CAAA;uGAtNU,WAAW;2GAAX,WAAW;;2FAAX,WAAW;kBADvB,UAAU","sourcesContent":["import { inject, Injectable } from '@angular/core';\nimport { Actions, createEffect, ofType } from '@ngrx/effects';\nimport {\n  AuthService,\n  STORAGE_SELECTED_AUTH,\n  STORAGE_SELECTED_MEMBERS,\n  STORAGE_TOKEN,\n  StorageService,\n  TeamService\n} from '../../services';\nimport {\n  clearAuthenticationAction,\n  clearAuthenticationSuccessAction,\n  clearCurrentAuthAction,\n  clearCurrentAuthSuccessAction,\n  clearStoreAction,\n  getCurrentAuthAction,\n  getCurrentAuthSuccessAction,\n  listAuthAction,\n  listAuthFailureAction,\n  listAuthSuccessAction,\n  listAuthTeamsAction,\n  listAuthTeamsFailureAction,\n  listAuthTeamsSuccessAction,\n  refreshAuthsAction,\n  refreshAuthsFailureAction,\n  refreshAuthsSuccessAction,\n  removeMemberAuthAction,\n  removeMemberAuthFailureAction,\n  removeMemberAuthSuccessAction,\n  removeTeamAuthAction,\n  removeTeamAuthFailureAction,\n  removeTeamAuthSuccessAction,\n  setCurrentAuthAction,\n  unblockMemberAuthAction,\n  unblockMemberAuthFailureAction,\n  unblockMemberAuthSuccessAction\n} from '../actions';\nimport { exhaustMap, forkJoin, mergeMap, Observable, of, switchMap } from 'rxjs';\nimport { catchError, map } from 'rxjs/operators';\nimport { HttpErrorResponse } from '@angular/common/http';\nimport { Auth, AuthTeam, Collection, SearchTeam } from '../../models';\nimport { RemoveMemberAuthInterface, RemoveTeamAuthInterface } from '../interfaces';\nimport { AuthenticationService } from '../../authentication';\n\n@Injectable()\nexport class AuthEffects {\n  private actions$ = inject(Actions);\n  private authenticationService = inject(AuthenticationService);\n  private authService = inject(AuthService);\n  private storageService = inject(StorageService);\n  private teamService = inject(TeamService);\n\n  clearAuthentication$ = createEffect(() => this.actions$\n    .pipe(\n      ofType(clearAuthenticationAction),\n      exhaustMap(() =>\n        forkJoin(\n          {\n            tokenRemoval: this.storageService.removeAsObservable(STORAGE_TOKEN),\n            selectedAuthRemoval: this.storageService.removeAsObservable(STORAGE_SELECTED_AUTH),\n            selectedMembersRemoval: this.storageService.removeAsObservable(STORAGE_SELECTED_MEMBERS),\n          }\n        ).pipe(\n          mergeMap(() => {\n            this.authenticationService.clearAuthentication();\n            return [\n              clearStoreAction(),\n              clearAuthenticationSuccessAction()\n            ]\n          })\n        )\n      )\n    )\n  );\n\n  clearCurrent$ = createEffect(() => this.actions$\n    .pipe(\n      ofType(clearCurrentAuthAction),\n      exhaustMap(() => this.storageService.removeAsObservable(STORAGE_SELECTED_AUTH)\n        .pipe(\n          map(() => clearCurrentAuthSuccessAction())\n        )\n      )\n    )\n  );\n\n  getCurrent$ = createEffect(() => this.actions$\n    .pipe(\n      ofType(getCurrentAuthAction),\n      exhaustMap(() => this.storageService.getAsObservable(STORAGE_SELECTED_AUTH)\n        .pipe(\n          map((auth: Auth | null | undefined) => {\n            if (auth === undefined) {\n              return getCurrentAuthSuccessAction({payload: null});\n            }\n            return getCurrentAuthSuccessAction({payload: auth});\n          })\n        )\n      )\n    )\n  );\n\n  listAuth$ = createEffect(() => this.actions$\n    .pipe(\n      ofType(listAuthAction),\n      switchMap(({payload}) => this.authService.getAuths(payload)\n        .pipe(\n          map((auths: Collection<Auth>) => listAuthSuccessAction({payload: auths.toArray()})),\n          catchError((error: HttpErrorResponse) => of(listAuthFailureAction({payload: error})))\n        )\n      )\n    )\n  );\n\n  listAuthTeams$ = createEffect(() => this.actions$\n    .pipe(\n      ofType(listAuthTeamsAction),\n      mergeMap(({payload}) => {\n        if (payload.clubAdmin) {\n          return this.teamService.getClubTeams(payload.id)\n            .pipe(\n              map((searchTeams: Collection<SearchTeam>) => {\n                const auth = {\n                  ...payload,\n                  teams: searchTeams.toArray()\n                    .sort((a: SearchTeam, b: SearchTeam) => a.name.localeCompare(b.name))\n                };\n\n                return listAuthTeamsSuccessAction({payload: auth});\n              }),\n              catchError((error: HttpErrorResponse) => of(listAuthTeamsFailureAction({payload: error})))\n            );\n        } else {\n          const sectionsTeams$: Array<Observable<Collection<SearchTeam>>> = payload.sections.map((section) =>\n            this.teamService.getSectionTeams(section.id)\n          );\n\n          return forkJoin(sectionsTeams$).pipe(\n            map((results: Array<Collection<SearchTeam>>) => {\n              const sectionTeams: Array<SearchTeam> = results\n                .flatMap((result: Collection<SearchTeam>) => result.toArray());\n              // Union the fetched section teams with any teams already on the auth (e.g. a team the\n              // user admins outside the sections they administer), keyed by id. Fetched SearchTeams\n              // win on duplicates so the richer section_name is kept.\n              const teamsById = new Map<string, AuthTeam | SearchTeam>();\n              [...payload.teams, ...sectionTeams].forEach((team) => teamsById.set(team.id, team));\n              const mergedTeams = [...teamsById.values()].sort((a, b) => a.name.localeCompare(b.name));\n              const auth = {\n                ...payload,\n                // teams is typed as AuthTeam[] | SearchTeam[]; the merged list may mix both shapes,\n                // which consumers already handle (they read id/name/section_name | section?.name).\n                teams: mergedTeams as SearchTeam[],\n              };\n              return listAuthTeamsSuccessAction({payload: auth});\n            }),\n            catchError((error: HttpErrorResponse) => of(listAuthTeamsFailureAction({payload: error})))\n          );\n        }\n      })\n    )\n  );\n\n  refresh$ = createEffect(() => this.actions$\n    .pipe(\n      ofType(refreshAuthsAction),\n      exhaustMap(() => this.authService.updateMembers()\n        .pipe(\n          mergeMap((success: boolean) => {\n            if (success) {\n              return [\n                refreshAuthsSuccessAction(),\n                listAuthAction()\n              ];\n            } else {\n              return of(refreshAuthsFailureAction());\n            }\n          }),\n          catchError(() => of(refreshAuthsFailureAction()))\n        )\n      )\n    )\n  );\n\n  removeMember$ = createEffect(() => this.actions$\n    .pipe(\n      ofType(removeMemberAuthAction),\n      exhaustMap(({payload}: {\n          payload: RemoveMemberAuthInterface\n        }) => this.authService.removeMemberAuth(payload.authId, payload.memberId)\n          .pipe(\n            map((value: boolean) => value ? removeMemberAuthSuccessAction() : removeMemberAuthFailureAction()),\n            catchError(() => of(removeMemberAuthFailureAction()))\n          )\n      )\n    )\n  );\n\n  removeTeam$ = createEffect(() => this.actions$\n    .pipe(\n      ofType(removeTeamAuthAction),\n      exhaustMap(({payload}: {\n          payload: RemoveTeamAuthInterface\n        }) => this.authService.removeTeamAuth(payload.authId, payload.teamId)\n          .pipe(\n            map((value: boolean) => value ? removeTeamAuthSuccessAction() : removeTeamAuthFailureAction()),\n            catchError(() => of(removeMemberAuthFailureAction()))\n          )\n      )\n    )\n  );\n\n  setCurrent$ = createEffect(() => this.actions$\n    .pipe(\n      ofType(setCurrentAuthAction),\n      exhaustMap(({payload}: { payload: Auth }) => this.storageService.getAsObservable(STORAGE_SELECTED_AUTH)\n        .pipe(\n          mergeMap((oldAuth: Auth) => {\n            return this.storageService.setAsObservable(STORAGE_SELECTED_AUTH, payload)\n              .pipe(\n                mergeMap((newAuth: Auth) => {\n                  if (oldAuth && newAuth.id === oldAuth.id && ((newAuth.members && newAuth.members.length === oldAuth.members.length) || (newAuth.teams && newAuth.teams.length === oldAuth.teams.length && newAuth.teams[0].id === oldAuth.teams[0].id))) {\n                    return [\n                      getCurrentAuthSuccessAction({payload: newAuth})\n                    ]\n                  } else {\n                    return [\n                      getCurrentAuthSuccessAction({payload: newAuth}),\n                      clearStoreAction()\n                    ]\n                  }\n                })\n              )\n          })\n        )\n      )\n    )\n  );\n\n  unblockMember$ = createEffect(() => this.actions$\n    .pipe(\n      ofType(unblockMemberAuthAction),\n      exhaustMap(({payload}: {payload: {userId: string, clubId: string, memberId: string}}) => this.authService.unblockMember(payload.userId, payload.clubId, payload.memberId)\n        .pipe(\n          mergeMap((success: boolean) => {\n            if (success) {\n              return [\n                unblockMemberAuthSuccessAction(),\n                refreshAuthsAction()\n              ];\n            }\n            return [\n              unblockMemberAuthFailureAction({\n              payload: new HttpErrorResponse({status: 400})\n            })];\n          }),\n          catchError((err: HttpErrorResponse) => of(unblockMemberAuthFailureAction({payload: err})))\n        )\n      )\n    )\n  )\n}\n"]}
@@ -2061,7 +2061,15 @@ const authTeamSectionFactory = (apiAuthTeamSection) => new AuthTeamSection(apiAu
2061
2061
 
2062
2062
  const authTeamFactory = (apiAuthTeam) => new AuthTeam(apiAuthTeam.id, apiAuthTeam.calendar_url, apiAuthTeam.name, apiAuthTeam.section ? authTeamSectionFactory(apiAuthTeam.section) : null, apiAuthTeam.team_admin_2fa_required);
2063
2063
 
2064
- const authFactory = (apiAuth) => new Auth(apiAuth.id, apiAuth.name, apiAuth.club_admin, apiAuth.is_section_club, apiAuth.members.map((apiAuthMember) => authMemberFactory(apiAuthMember)), apiAuth.registration_enabled, apiAuth.sections.map((apiAuthSection) => authSectionFactory(apiAuthSection)), apiAuth.site_enabled, apiAuth.teams.map((apiAuthTeam) => authTeamFactory(apiAuthTeam)), apiAuth.teams.length > 0, apiAuth.user_name, apiAuth.blocked_members.map((apiAuthMember) => authMemberFactory(apiAuthMember)), apiAuth.club_admin_2fa_required, apiAuth.section_admin_2fa_required, apiAuth.team_admin_2fa_required, apiAuth.member_admin_2fa_required);
2064
+ const authFactory = (apiAuth) => {
2065
+ // teamsLoaded guards against repeated team loading (the success reducer sets it true once the
2066
+ // full team list is fetched). Club/section admins must always load their full team list first,
2067
+ // even when the payload already contains personal teams (team admin/member) — otherwise they
2068
+ // would never receive the rest of their club's/section's groups. Non-admins never load teams,
2069
+ // so their payload teams are already the complete set.
2070
+ const isAdmin = apiAuth.club_admin || apiAuth.sections.length > 0;
2071
+ return new Auth(apiAuth.id, apiAuth.name, apiAuth.club_admin, apiAuth.is_section_club, apiAuth.members.map((apiAuthMember) => authMemberFactory(apiAuthMember)), apiAuth.registration_enabled, apiAuth.sections.map((apiAuthSection) => authSectionFactory(apiAuthSection)), apiAuth.site_enabled, apiAuth.teams.map((apiAuthTeam) => authTeamFactory(apiAuthTeam)), isAdmin ? false : apiAuth.teams.length > 0, apiAuth.user_name, apiAuth.blocked_members.map((apiAuthMember) => authMemberFactory(apiAuthMember)), apiAuth.club_admin_2fa_required, apiAuth.section_admin_2fa_required, apiAuth.team_admin_2fa_required, apiAuth.member_admin_2fa_required);
2072
+ };
2065
2073
 
2066
2074
  const bookablePartFactory = (apiBookablePart) => {
2067
2075
  return new BookablePart(apiBookablePart.id, apiBookablePart.name);
@@ -8975,12 +8983,19 @@ class AuthEffects {
8975
8983
  else {
8976
8984
  const sectionsTeams$ = payload.sections.map((section) => this.teamService.getSectionTeams(section.id));
8977
8985
  return forkJoin(sectionsTeams$).pipe(map((results) => {
8978
- const sortedTeams = results
8979
- .flatMap((result) => result.toArray())
8980
- .sort((a, b) => a.name.localeCompare(b.name));
8986
+ const sectionTeams = results
8987
+ .flatMap((result) => result.toArray());
8988
+ // Union the fetched section teams with any teams already on the auth (e.g. a team the
8989
+ // user admins outside the sections they administer), keyed by id. Fetched SearchTeams
8990
+ // win on duplicates so the richer section_name is kept.
8991
+ const teamsById = new Map();
8992
+ [...payload.teams, ...sectionTeams].forEach((team) => teamsById.set(team.id, team));
8993
+ const mergedTeams = [...teamsById.values()].sort((a, b) => a.name.localeCompare(b.name));
8981
8994
  const auth = {
8982
8995
  ...payload,
8983
- teams: sortedTeams,
8996
+ // teams is typed as AuthTeam[] | SearchTeam[]; the merged list may mix both shapes,
8997
+ // which consumers already handle (they read id/name/section_name | section?.name).
8998
+ teams: mergedTeams,
8984
8999
  };
8985
9000
  return listAuthTeamsSuccessAction({ payload: auth });
8986
9001
  }), catchError((error) => of(listAuthTeamsFailureAction({ payload: error }))));