11.0 Conflict

README.md

@@ -1,6 +1,6 @@
 # Drupal
 
-This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 9.1.12.
+[![GitHub release](https://img.shields.io/github/release/attus74/drupal.svg)](https://GitHub.com/attus74/drupal/releases/)
 
 ## A library for Angular-Drupal Communication
 
@@ -77,5 +77,10 @@ export class MyComponent implements OnInit {
     return this.drupal.get(path, options);
   }
 
+  loginUser(username: string, password: string): void {
+    // There is no direct answer, but you can subscribe the result, see getUserLoginStatus()
+    this.drupal.login(username, password);
+  }
+
 }
-```
+```

package.json

@@ -1,11 +1,30 @@
 {
   "name": "@attus/drupal",
   "version": "11.0.0",
+  "description": "Drupal Service",
+  "homepage": "https://github.com/attus74/drupal",
+  "author": "Attila Németh",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/attus74/drupal.git"
+  },
   "peerDependencies": {
     "@angular/common": "^11.0",
     "@angular/core": "^11.0"
   },
   "dependencies": {
     "tslib": "^1.10.0"
-  }
-}
+  },
+  "bugs": {
+    "url": "https://github.com/attus74/drupal/issues"
+  },
+  "main": "karma.conf.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [
+    "Drupal",
+    "Angular"
+  ],
+  "license": "GPL-3.0"
+}

src/lib/drupal.module.ts

@@ -3,7 +3,6 @@ import { HttpClientModule } from '@angular/common/http';
 import { DrupalComponent } from './drupal.component';
 import { DrupalService } from './drupal.service';
 
-
 @NgModule({
   declarations: [DrupalComponent],
   imports: [
@@ -13,8 +12,10 @@ import { DrupalService } from './drupal.service';
     DrupalService,
     {
       provide: APP_INITIALIZER,
-      useFactory: (drupal: DrupalService) => {
-        return () => drupal.initialize()
+      useFactory: function(drupal: DrupalService) {
+        return function() {
+          drupal.initialize();
+        }
       },
       deps: [DrupalService],
       multi: true

src/lib/drupal.service.ts

@@ -21,7 +21,7 @@ export class DrupalService {
 
   async initialize(): Promise<any> {
     console.info('Drupal Service wurde initialisiert');
-    this.refreshToken();
+    return this.refreshToken();
   }
 
   login(username: string, password: string): void {
@@ -64,7 +64,7 @@ export class DrupalService {
 
   get(path: string, options: DrupalHttpOptions): Observable<any> {
     return this.http.get(this.drupalConfig.url + '/' + path, options).pipe(
-      retry(3),
+      retry(5),
       timeout(8000),
       catchError(this.formatErrors),
     );
@@ -78,6 +78,14 @@ export class DrupalService {
     );
   }
 
+  patch(path: string, data: any, options?: DrupalHttpOptions): Observable<any> {
+    return this.http.patch(this.drupalConfig.url + '/' + path, data, options).pipe(
+      retry(3),
+      timeout(24000),
+      catchError(this.formatErrors),
+    );
+  }
+
   private refreshToken(): void {
     this.tokenService.getRefreshToken().then(token => {
       if (token === null) {

src/lib/model/options.ts

@@ -14,6 +14,10 @@ export class DrupalHttpOptions {
     this.headers = this.headers.set(name, value);
   }
 
+  setJsonApiHeaders(): void {
+    this.headers = this.headers.set('Content-Type', 'application/vnd.api+json');
+  }
+
   setParam(name: string, value: any): void {
     if (this.params === null) {
       this.params = new HttpParams();