Merge pull request #47 from ccremer/angular-http

Implement client with Angular's HttpClient

Author: ccremer

packages/kubernetes-client-angular/.prettierignore

@@ -1,4 +1,5 @@
 /.angular
 /dist
+/build
 /node_modules
 /playwright-report

packages/kubernetes-client-angular/projects/kubernetes-client-angular/README.md

@@ -40,20 +40,22 @@ import { NgModule } from '@angular/core'
 import { BrowserModule } from '@angular/platform-browser'
 
 import { DefaultDataServiceFactory, EntityDataModule } from '@ngrx/data'
-import { HttpClientModule } from '@angular/common/http'
+import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http'
 import {
   DefaultEntityMetadataMap,
+  KubernetesAuthorizerInterceptor,
   KubernetesDataServiceFactory,
   KubernetesDataServiceFactoryConfig,
 } from '@ccremer/kubernetes-client-angular'
 import { StoreModule } from '@ngrx/store'
 import { EffectsModule } from '@ngrx/effects'
+import { AppComponent } from './app.component'
 
 @NgModule({
-  declarations: [],
+  declarations: [AppComponent],
   imports: [
     BrowserModule,
-    HttpClientModule, // required by @ngrx/data
+    HttpClientModule,
     StoreModule.forRoot(),
     EffectsModule.forRoot(),
     EntityDataModule.forRoot({
@@ -62,11 +64,13 @@ import { EffectsModule } from '@ngrx/effects'
   ],
   providers: [
     { provide: DefaultDataServiceFactory, useClass: KubernetesDataServiceFactory },
+    { provide: HTTP_INTERCEPTORS, useClass: KubernetesAuthorizerInterceptor, multi: true },
     {
       provide: KubernetesDataServiceFactoryConfig,
       useValue: {
         default: {
           usePatchInUpsert: true,
+          usePatchInUpdate: false,
         },
       } satisfies KubernetesDataServiceFactoryConfig,
     },

packages/kubernetes-client-angular/projects/kubernetes-client-angular/examples/app.module.ts

@@ -2,20 +2,22 @@ import { NgModule } from '@angular/core'
 import { BrowserModule } from '@angular/platform-browser'
 
 import { DefaultDataServiceFactory, EntityDataModule } from '@ngrx/data'
-import { HttpClientModule } from '@angular/common/http'
+import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http'
 import {
   DefaultEntityMetadataMap,
+  KubernetesAuthorizerInterceptor,
   KubernetesDataServiceFactory,
   KubernetesDataServiceFactoryConfig,
 } from '@ccremer/kubernetes-client-angular'
 import { StoreModule } from '@ngrx/store'
 import { EffectsModule } from '@ngrx/effects'
+import { AppComponent } from './app.component'
 
 @NgModule({
-  declarations: [],
+  declarations: [AppComponent],
   imports: [
     BrowserModule,
-    HttpClientModule, // required by @ngrx/data
+    HttpClientModule,
     StoreModule.forRoot(),
     EffectsModule.forRoot(),
     EntityDataModule.forRoot({
@@ -24,11 +26,13 @@ import { EffectsModule } from '@ngrx/effects'
   ],
   providers: [
     { provide: DefaultDataServiceFactory, useClass: KubernetesDataServiceFactory },
+    { provide: HTTP_INTERCEPTORS, useClass: KubernetesAuthorizerInterceptor, multi: true },
     {
       provide: KubernetesDataServiceFactoryConfig,
       useValue: {
         default: {
           usePatchInUpsert: true,
+          usePatchInUpdate: false,
         },
       } satisfies KubernetesDataServiceFactoryConfig,
     },

packages/kubernetes-client-angular/projects/kubernetes-client-angular/package.json

@@ -12,6 +12,7 @@
     "type": "git",
     "url": "https://github.com/ccremer/kubernetes-client-browser"
   },
+  "license": "Apache-2.0",
   "keywords": [
     "angular",
     "kubernetes",

packages/kubernetes-client-angular/projects/kubernetes-client-angular/src/lib/config.ts

@@ -6,4 +6,8 @@ export abstract class DataServiceConfig {
    * If true, the client will use the `patch` verb instead of `update` when doing an `upsert` call.
    */
   usePatchInUpsert?: boolean
+  /**
+   * If true, the client will use the `patch` verb instead of `update` when doing an `update` call.
+   */
+  usePatchInUpdate?: boolean
 }

packages/kubernetes-client-angular/projects/kubernetes-client-angular/src/lib/kubernetes-authorizer.interceptor.ts

@@ -0,0 +1,27 @@
+import { Injectable, Optional } from '@angular/core'
+import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http'
+import { Observable } from 'rxjs'
+import { KubernetesAuthorizerService } from './kubernetes-authorizer.service'
+import { KubernetesDataServiceFactoryConfig } from './kubernetes-data-service-factory.service'
+
+@Injectable()
+export class KubernetesAuthorizerInterceptor implements HttpInterceptor {
+  constructor(
+    private authorizer: KubernetesAuthorizerService,
+    @Optional() private config?: KubernetesDataServiceFactoryConfig
+  ) {}
+
+  intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
+    const url = request.url
+    const base = this.config?.basePath ?? ''
+    console.log('url', url, 'token', this.authorizer.getToken())
+    if (url.startsWith(`${base}/api/`) || url.startsWith(`${base}/apis/`)) {
+      return next.handle(
+        request.clone({
+          setHeaders: { Authorization: `Bearer ${this.authorizer.getToken()}` },
+        })
+      )
+    }
+    return next.handle(request)
+  }
+}

packages/kubernetes-client-angular/projects/kubernetes-client-angular/src/lib/kubernetes-authorizer.service.ts

@@ -1,22 +1,14 @@
 import { Injectable } from '@angular/core'
-import { Authorizer, DefaultAuthorizer, NoopAuthorizer } from '@ccremer/kubernetes-client/fetch'
-import { Config } from '@ccremer/kubernetes-client/api'
 
-@Injectable({
-  providedIn: 'root',
-})
-export class KubernetesAuthorizerService implements Authorizer {
-  private wrapped: Authorizer = new NoopAuthorizer()
+@Injectable({ providedIn: 'root' })
+export class KubernetesAuthorizerService {
+  private token = ''
 
-  applyAuthorization(init: RequestInit): RequestInit {
-    return this.wrapped.applyAuthorization(init)
+  getToken(): string {
+    return this.token
   }
 
-  setToken(token: string, server = ''): void {
-    this.wrapped = new DefaultAuthorizer(Config.FromToken(token, server))
-  }
-
-  setAuthorizer(authorizer: Authorizer): void {
-    this.wrapped = authorizer
+  setToken(token: string): void {
+    this.token = token
   }
 }

packages/kubernetes-client-angular/projects/kubernetes-client-angular/src/lib/kubernetes-data-service-factory.service.ts

@@ -2,29 +2,24 @@ import { Injectable, Optional } from '@angular/core'
 import { KubeObject } from '@ccremer/kubernetes-client/types/core'
 import { EntityCollectionDataService } from '@ngrx/data'
 import { KubernetesDataService } from './kubernetes-data.service'
-import { Client, KubeClientBuilder } from '@ccremer/kubernetes-client/fetch'
-import { KubernetesAuthorizerService } from './kubernetes-authorizer.service'
 import { KubernetesUrlGeneratorService } from './kubernetes-url-generator.service'
 import { DataServiceConfig } from './config'
+import { HttpClient } from '@angular/common/http'
 
 /**
  * Factory to create {@link EntityCollectionDataService} for Kubernetes resources.
  */
 @Injectable()
 export class KubernetesDataServiceFactory {
-  private readonly client: Client
-
   constructor(
-    private authorizer: KubernetesAuthorizerService,
     private urlGenerator: KubernetesUrlGeneratorService,
+    private httpClient: HttpClient,
     @Optional() private config?: KubernetesDataServiceFactoryConfig
-  ) {
-    this.client = new KubeClientBuilder().WithAuthorizer(this.authorizer).WithUrlGenerator(this.urlGenerator).Build()
-  }
+  ) {}
 
   create<T extends KubeObject>(entityName: string): EntityCollectionDataService<T> {
     const overrideConfig = this.config?.overrides ? this.config.overrides[entityName] : this.config?.default
-    return new KubernetesDataService<T>(entityName, this.client, overrideConfig)
+    return new KubernetesDataService<T>(entityName, this.httpClient, this.urlGenerator, overrideConfig)
   }
 }
 
@@ -50,3 +45,21 @@ export abstract class KubernetesDataServiceFactoryConfig {
     [key: string]: DataServiceConfig
   }
 }
+
+/**
+ * Gets the {@link DataServiceConfig} for the given entity, with the default config as fallback.
+ * @param config the config instance
+ * @param entityName the entity name
+ * @return the config in `overrides`, fallback to `default` or undefined if no default is set either.
+ */
+export function getDataServiceConfigOrDefault(
+  entityName: string,
+  config?: KubernetesDataServiceFactoryConfig
+): DataServiceConfig | undefined {
+  if (!config) return undefined
+  if (config.overrides) {
+    const override = config.overrides[entityName]
+    return override ? override : config.default
+  }
+  return config.default
+}