@cccteam/ccc-lib 0.0.23 → 0.0.24

package/README.md

@@ -47,3 +47,7 @@ To run the library's tests, use the following command:
 ```bash
 ng test ccc-lib
 ```
+
+### Known Issues
+
+- **Contentful Dependency**: The library currently has a hard dependency on `@contentful/rich-text-types` due to the `CustomTypes.ContentfulDocument` type definition in the resource metadata. This means consumers of the library must have this package installed, even if they are not using this custom type.

package/fesm2022/cccteam-ccc-lib-auth-authentication-guard.mjs

@@ -1,10 +1,18 @@
 import { inject } from '@angular/core';
+import { Router } from '@angular/router';
 import { AuthService } from '@cccteam/ccc-lib/auth-service';
 import { BASE_URL, API_URL } from '@cccteam/ccc-lib/types';
 import { of } from 'rxjs';
 import { map, catchError } from 'rxjs/operators';
 
-const AuthenticationGuard = (route, routerState) => {
+/**
+ * Route guard that protects routes using OIDC (OpenID Connect) authentication.
+ *
+ * If the user is not authenticated, they are redirected to the external OIDC
+ * login endpoint with the current URL encoded as a return URL parameter.
+ *
+ */
+const OIDCAuthenticationGuard = (_, routerState) => {
     const authService = inject(AuthService);
     const baseUrl = inject(BASE_URL);
     const apiUrl = inject(API_URL);
@@ -28,10 +36,39 @@ const AuthenticationGuard = (route, routerState) => {
         return of(false);
     }));
 };
+/**
+ * Route guard that protects routes using internal login-based authentication.
+ *
+ * If the user is not authenticated, they are redirected to the application's
+ * internal FRONTEND_LOGIN_PATH route. The attempted URL is stored in the AuthService so the
+ * user can be redirected back after successful login.
+ *
+ */
+const LoginAuthenticationGuard = (_, routerState) => {
+    const router = inject(Router);
+    const authService = inject(AuthService);
+    const authenticate = () => {
+        authService.redirectUrl.set(routerState.url);
+        router.navigate([authService.loginRoute()]);
+    };
+    if (authService.authenticated()) {
+        return of(true);
+    }
+    return authService.checkUserSession().pipe(map((sessionInfo) => {
+        if (sessionInfo?.authenticated) {
+            return true;
+        }
+        authenticate();
+        return false;
+    }), catchError(() => {
+        authenticate();
+        return of(false);
+    }));
+};
 
 /**
  * Generated bundle index. Do not edit.
  */
 
-export { AuthenticationGuard };
+export { LoginAuthenticationGuard, OIDCAuthenticationGuard };
 //# sourceMappingURL=cccteam-ccc-lib-auth-authentication-guard.mjs.map

package/fesm2022/cccteam-ccc-lib-auth-authentication-guard.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"cccteam-ccc-lib-auth-authentication-guard.mjs","sources":["../../../projects/ccc-lib/auth-authentication-guard/authentication.guard.ts","../../../projects/ccc-lib/auth-authentication-guard/cccteam-ccc-lib-auth-authentication-guard.ts"],"sourcesContent":["import { inject } from '@angular/core';\nimport { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';\nimport { AuthService } from '@cccteam/ccc-lib/auth-service';\nimport { API_URL, BASE_URL } from '@cccteam/ccc-lib/types';\nimport { Observable, of } from 'rxjs';\nimport { catchError, map } from 'rxjs/operators';\n\nexport const AuthenticationGuard = (\n  route: ActivatedRouteSnapshot,\n  routerState: RouterStateSnapshot,\n): Observable<boolean> => {\n  const authService = inject(AuthService);\n  const baseUrl = inject(BASE_URL);\n  const apiUrl = inject(API_URL);\n\n  const authenticate = (): void => {\n    const url = routerState.url;\n    const absoluteUrl = baseUrl + (!url.toString().startsWith('/') ? '/' + url : url);\n    const encodedUrl = encodeURIComponent(absoluteUrl);\n    window.location.href = `${apiUrl}/user/login?returnUrl=${encodedUrl}`;\n  };\n\n  if (authService.authenticated()) {\n    return of(true);\n  }\n\n  return authService.checkUserSession().pipe(\n    map((sessionInfo) => {\n      if (sessionInfo?.authenticated) {\n        return true;\n      }\n\n      authenticate();\n      return false;\n    }),\n    catchError(() => {\n      authenticate();\n      return of(false);\n    }),\n  );\n};\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":";;;;;;MAOa,mBAAmB,GAAG,CACjC,KAA6B,EAC7B,WAAgC,KACT;AACvB,IAAA,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;AACvC,IAAA,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC;AAChC,IAAA,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;IAE9B,MAAM,YAAY,GAAG,MAAW;AAC9B,QAAA,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG;QAC3B,MAAM,WAAW,GAAG,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;AACjF,QAAA,MAAM,UAAU,GAAG,kBAAkB,CAAC,WAAW,CAAC;QAClD,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,MAAM,CAAA,sBAAA,EAAyB,UAAU,CAAA,CAAE;AACvE,IAAA,CAAC;AAED,IAAA,IAAI,WAAW,CAAC,aAAa,EAAE,EAAE;AAC/B,QAAA,OAAO,EAAE,CAAC,IAAI,CAAC;IACjB;AAEA,IAAA,OAAO,WAAW,CAAC,gBAAgB,EAAE,CAAC,IAAI,CACxC,GAAG,CAAC,CAAC,WAAW,KAAI;AAClB,QAAA,IAAI,WAAW,EAAE,aAAa,EAAE;AAC9B,YAAA,OAAO,IAAI;QACb;AAEA,QAAA,YAAY,EAAE;AACd,QAAA,OAAO,KAAK;AACd,IAAA,CAAC,CAAC,EACF,UAAU,CAAC,MAAK;AACd,QAAA,YAAY,EAAE;AACd,QAAA,OAAO,EAAE,CAAC,KAAK,CAAC;IAClB,CAAC,CAAC,CACH;AACH;;ACxCA;;AAEG;;;;"}
+{"version":3,"file":"cccteam-ccc-lib-auth-authentication-guard.mjs","sources":["../../../projects/ccc-lib/auth-authentication-guard/authentication.guard.ts","../../../projects/ccc-lib/auth-authentication-guard/cccteam-ccc-lib-auth-authentication-guard.ts"],"sourcesContent":["import { inject } from '@angular/core';\nimport { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';\nimport { AuthService } from '@cccteam/ccc-lib/auth-service';\nimport { API_URL, BASE_URL } from '@cccteam/ccc-lib/types';\nimport { Observable, of } from 'rxjs';\nimport { catchError, map } from 'rxjs/operators';\n\n/**\n * Route guard that protects routes using OIDC (OpenID Connect) authentication.\n *\n * If the user is not authenticated, they are redirected to the external OIDC\n * login endpoint with the current URL encoded as a return URL parameter.\n *\n */\nexport const OIDCAuthenticationGuard = (\n  _: ActivatedRouteSnapshot,\n  routerState: RouterStateSnapshot,\n): Observable<boolean> => {\n  const authService = inject(AuthService);\n  const baseUrl = inject(BASE_URL);\n  const apiUrl = inject(API_URL);\n\n  const authenticate = (): void => {\n    const url = routerState.url;\n    const absoluteUrl = baseUrl + (!url.toString().startsWith('/') ? '/' + url : url);\n    const encodedUrl = encodeURIComponent(absoluteUrl);\n    window.location.href = `${apiUrl}/user/login?returnUrl=${encodedUrl}`;\n  };\n\n  if (authService.authenticated()) {\n    return of(true);\n  }\n\n  return authService.checkUserSession().pipe(\n    map((sessionInfo) => {\n      if (sessionInfo?.authenticated) {\n        return true;\n      }\n\n      authenticate();\n      return false;\n    }),\n    catchError(() => {\n      authenticate();\n      return of(false);\n    }),\n  );\n};\n\n/**\n * Route guard that protects routes using internal login-based authentication.\n *\n * If the user is not authenticated, they are redirected to the application's\n * internal FRONTEND_LOGIN_PATH route. The attempted URL is stored in the AuthService so the\n * user can be redirected back after successful login.\n *\n */\nexport const LoginAuthenticationGuard = (\n  _: ActivatedRouteSnapshot,\n  routerState: RouterStateSnapshot,\n): Observable<boolean> => {\n  const router = inject(Router);\n  const authService = inject(AuthService);\n\n  const authenticate = (): void => {\n    authService.redirectUrl.set(routerState.url);\n    router.navigate([authService.loginRoute()]);\n  };\n\n  if (authService.authenticated()) {\n    return of(true);\n  }\n\n  return authService.checkUserSession().pipe(\n    map((sessionInfo) => {\n      if (sessionInfo?.authenticated) {\n        return true;\n      }\n\n      authenticate();\n      return false;\n    }),\n    catchError(() => {\n      authenticate();\n      return of(false);\n    }),\n  );\n};\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":";;;;;;;AAOA;;;;;;AAMG;MACU,uBAAuB,GAAG,CACrC,CAAyB,EACzB,WAAgC,KACT;AACvB,IAAA,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;AACvC,IAAA,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC;AAChC,IAAA,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;IAE9B,MAAM,YAAY,GAAG,MAAW;AAC9B,QAAA,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG;QAC3B,MAAM,WAAW,GAAG,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;AACjF,QAAA,MAAM,UAAU,GAAG,kBAAkB,CAAC,WAAW,CAAC;QAClD,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,MAAM,CAAA,sBAAA,EAAyB,UAAU,CAAA,CAAE;AACvE,IAAA,CAAC;AAED,IAAA,IAAI,WAAW,CAAC,aAAa,EAAE,EAAE;AAC/B,QAAA,OAAO,EAAE,CAAC,IAAI,CAAC;IACjB;AAEA,IAAA,OAAO,WAAW,CAAC,gBAAgB,EAAE,CAAC,IAAI,CACxC,GAAG,CAAC,CAAC,WAAW,KAAI;AAClB,QAAA,IAAI,WAAW,EAAE,aAAa,EAAE;AAC9B,YAAA,OAAO,IAAI;QACb;AAEA,QAAA,YAAY,EAAE;AACd,QAAA,OAAO,KAAK;AACd,IAAA,CAAC,CAAC,EACF,UAAU,CAAC,MAAK;AACd,QAAA,YAAY,EAAE;AACd,QAAA,OAAO,EAAE,CAAC,KAAK,CAAC;IAClB,CAAC,CAAC,CACH;AACH;AAEA;;;;;;;AAOG;MACU,wBAAwB,GAAG,CACtC,CAAyB,EACzB,WAAgC,KACT;AACvB,IAAA,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;AAC7B,IAAA,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;IAEvC,MAAM,YAAY,GAAG,MAAW;QAC9B,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC;QAC5C,MAAM,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC,CAAC;AAC7C,IAAA,CAAC;AAED,IAAA,IAAI,WAAW,CAAC,aAAa,EAAE,EAAE;AAC/B,QAAA,OAAO,EAAE,CAAC,IAAI,CAAC;IACjB;AAEA,IAAA,OAAO,WAAW,CAAC,gBAAgB,EAAE,CAAC,IAAI,CACxC,GAAG,CAAC,CAAC,WAAW,KAAI;AAClB,QAAA,IAAI,WAAW,EAAE,aAAa,EAAE;AAC9B,YAAA,OAAO,IAAI;QACb;AAEA,QAAA,YAAY,EAAE;AACd,QAAA,OAAO,KAAK;AACd,IAAA,CAAC,CAAC,EACF,UAAU,CAAC,MAAK;AACd,QAAA,YAAY,EAAE;AACd,QAAA,OAAO,EAAE,CAAC,KAAK,CAAC;IAClB,CAAC,CAAC,CACH;AACH;;ACvFA;;AAEG;;;;"}

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@cccteam/ccc-lib",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "repository": {
     "type": "git",
     "url": "git://github.com/cccteam/ccc-lib.git"
   },
   "peerDependencies": {
     "@angular/common": "^21.0.0",
-    "@angular/core": "^21.0.0"
+    "@angular/core": "^21.0.0",
+    "@contentful/rich-text-types": "^17.2.5"
   },
   "dependencies": {
     "date-fns": "^4.1.0",

package/types/cccteam-ccc-lib-auth-authentication-guard.d.ts

@@ -1,6 +1,22 @@
 import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 
-declare const AuthenticationGuard: (route: ActivatedRouteSnapshot, routerState: RouterStateSnapshot) => Observable<boolean>;
+/**
+ * Route guard that protects routes using OIDC (OpenID Connect) authentication.
+ *
+ * If the user is not authenticated, they are redirected to the external OIDC
+ * login endpoint with the current URL encoded as a return URL parameter.
+ *
+ */
+declare const OIDCAuthenticationGuard: (_: ActivatedRouteSnapshot, routerState: RouterStateSnapshot) => Observable<boolean>;
+/**
+ * Route guard that protects routes using internal login-based authentication.
+ *
+ * If the user is not authenticated, they are redirected to the application's
+ * internal FRONTEND_LOGIN_PATH route. The attempted URL is stored in the AuthService so the
+ * user can be redirected back after successful login.
+ *
+ */
+declare const LoginAuthenticationGuard: (_: ActivatedRouteSnapshot, routerState: RouterStateSnapshot) => Observable<boolean>;
 
-export { AuthenticationGuard };
+export { LoginAuthenticationGuard, OIDCAuthenticationGuard };

package/types/cccteam-ccc-lib-types.d.ts

@@ -1,6 +1,7 @@
 import * as _angular_core from '@angular/core';
 import { Type, InjectionToken } from '@angular/core';
 import { TooltipPosition } from '@angular/material/tooltip';
+import { Document } from '@contentful/rich-text-types';
 import { ValidatorFn, AbstractControl, ValidationErrors } from '@angular/forms';
 
 type Brand<K, T> = K & {
@@ -20,7 +21,7 @@ interface PermissionScope {
 declare const ReadPermission: Permission;
 declare const UpdatePermission: Permission;
 
-type ValidDisplayTypes = 'boolean' | 'nullboolean' | 'number' | 'string' | 'date' | 'enumerated' | 'link' | 'uuid' | 'civildate' | 'string[]' | 'customtypes.document';
+type ValidDisplayTypes = 'boolean' | 'nullboolean' | 'number' | 'string' | 'date' | 'enumerated' | 'link' | 'uuid' | 'civildate' | 'string[]' | 'customtypes.contentfuldocument';
 type ValidRPCTypes = ValidDisplayTypes | `${Exclude<ValidDisplayTypes, 'string[]'>}[]`;
 interface RPCFieldMeta {
     fieldName: string;
@@ -57,9 +58,7 @@ interface ResourceMeta {
 }
 type Meta = MethodMeta | ResourceMeta;
 declare namespace CustomTypes {
-    interface Document {
-        placeholder: string;
-    }
+    type ContentfulDocument = Document;
 }
 
 declare const defaultEmptyFieldValue = "-";