[AAE-12501] Replace oauth2Auth with authentication service to get the token

This commit is contained in:
Amedeo Lepore
2023-03-31 12:12:02 +02:00
parent 03c0b1387a
commit 92fad7d0f3
@@ -22,7 +22,7 @@ import { WebSocketLink } from '@apollo/client/link/ws';
import { onError } from '@apollo/client/link/error'; import { onError } from '@apollo/client/link/error';
import { getMainDefinition } from '@apollo/client/utilities'; import { getMainDefinition } from '@apollo/client/utilities';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { AppConfigService, AlfrescoApiService } from '@alfresco/adf-core'; import { AppConfigService, AlfrescoApiService, AuthenticationService } from '@alfresco/adf-core';
import { BaseCloudService } from './base-cloud.service'; import { BaseCloudService } from './base-cloud.service';
@Injectable({ @Injectable({
@@ -35,7 +35,8 @@ export class NotificationCloudService extends BaseCloudService {
constructor(apiService: AlfrescoApiService, constructor(apiService: AlfrescoApiService,
appConfigService: AppConfigService, appConfigService: AppConfigService,
public apollo: Apollo, public apollo: Apollo,
private http: HttpLink) { private http: HttpLink,
private authService: AuthenticationService) {
super(apiService, appConfigService); super(apiService, appConfigService);
} }
@@ -62,7 +63,7 @@ export class NotificationCloudService extends BaseCloudService {
connectionParams: { connectionParams: {
kaInterval: 2000, kaInterval: 2000,
// eslint-disable-next-line @typescript-eslint/naming-convention // eslint-disable-next-line @typescript-eslint/naming-convention
'X-Authorization': 'Bearer ' + this.apiService.getInstance().oauth2Auth.token 'X-Authorization': 'Bearer ' + this.authService.getToken()
} }
} }
}); });
@@ -86,7 +87,7 @@ export class NotificationCloudService extends BaseCloudService {
headers: { headers: {
...oldHeaders, ...oldHeaders,
// eslint-disable-next-line @typescript-eslint/naming-convention // eslint-disable-next-line @typescript-eslint/naming-convention
'X-Authorization': 'Bearer ' + this.apiService.getInstance().oauth2Auth.token 'X-Authorization': 'Bearer ' + this.authService.getToken()
} }
}); });
forward(operation); forward(operation);