diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/admin/admin-dashboard/admin-dashboard.component.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/admin/admin-dashboard/admin-dashboard.component.ts index cee6e804..b977004d 100644 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/admin/admin-dashboard/admin-dashboard.component.ts +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/admin/admin-dashboard/admin-dashboard.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit, Output, EventEmitter, OnDestroy } from '@angular/cor import { Subscription } from 'rxjs'; import { RecordingDeleteRequestedEvent, RecordingInfo, RecordingStatus } from '../../models/recording.model'; import { ActionService } from '../../services/action/action.service'; -import { OpenViduComponentsConfigService } from '../../services/config/openvidu-components-angular.config.service'; +import { OpenViduComponentsConfigService } from '../../services/config/directive-config.service'; import { RecordingService } from '../../services/recording/recording.service'; @Component({ diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/admin/admin-login/admin-login.component.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/admin/admin-login/admin-login.component.ts index 4ede4ee6..89975b6b 100644 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/admin/admin-login/admin-login.component.ts +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/admin/admin-login/admin-login.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, OnInit, Output } from '@angular/core'; import { Validators, FormGroup, FormBuilder } from '@angular/forms'; import { Subscription } from 'rxjs'; import { ActionService } from '../../services/action/action.service'; -import { OpenViduComponentsConfigService } from '../../services/config/openvidu-components-angular.config.service'; +import { OpenViduComponentsConfigService } from '../../services/config/directive-config.service'; @Component({ selector: 'ov-admin-login', diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/layout/layout.component.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/layout/layout.component.ts index ff122a6b..41666a10 100644 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/layout/layout.component.ts +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/layout/layout.component.ts @@ -18,7 +18,7 @@ import { LayoutService } from '../../services/layout/layout.service'; import { ParticipantService } from '../../services/participant/participant.service'; import { CdkDrag } from '@angular/cdk/drag-drop'; import { PanelService } from '../../services/panel/panel.service'; -import { OpenViduComponentsConfigService } from '../../services/config/openvidu-components-angular.config.service'; +import { GlobalConfigService } from '../../services/config/global-config.service'; /** * @@ -86,7 +86,7 @@ export class LayoutComponent implements OnInit, OnDestroy, AfterViewInit { private layoutService: LayoutService, private panelService: PanelService, private participantService: ParticipantService, - private libService: OpenViduComponentsConfigService, + private globalService: GlobalConfigService, private cd: ChangeDetectorRef ) {} @@ -207,7 +207,7 @@ export class LayoutComponent implements OnInit, OnDestroy, AfterViewInit { }; this.cdkSubscription = this.cdkDrag.released.subscribe(handler); - if (this.libService.getConfig().production) return; + if (this.globalService.isProduction()) return; // Just for allow E2E testing with drag and drop document.addEventListener('webcomponentTestingEndedDragAndDropEvent', handler); document.addEventListener('webcomponentTestingEndedDragAndDropRightEvent', (event: any) => { diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/panel/activities-panel/activities-panel.component.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/panel/activities-panel/activities-panel.component.ts index e7a8b500..7f696efb 100644 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/panel/activities-panel/activities-panel.component.ts +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/panel/activities-panel/activities-panel.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, OnInit, Output } from '@angular/core'; import { Subscription } from 'rxjs'; import { PanelStatusInfo, PanelType } from '../../../models/panel.model'; -import { OpenViduComponentsConfigService } from '../../../services/config/openvidu-components-angular.config.service'; +import { OpenViduComponentsConfigService } from '../../../services/config/directive-config.service'; import { PanelService } from '../../../services/panel/panel.service'; import { RecordingDeleteRequestedEvent, diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/panel/participants-panel/participant-panel-item/participant-panel-item.component.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/panel/participants-panel/participant-panel-item/participant-panel-item.component.ts index caabc22b..7577bba8 100644 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/panel/participants-panel/participant-panel-item/participant-panel-item.component.ts +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/panel/participants-panel/participant-panel-item/participant-panel-item.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ContentChild, In import { Subscription } from 'rxjs'; import { ParticipantPanelItemElementsDirective } from '../../../../directives/template/openvidu-components-angular.directive'; import { ParticipantModel } from '../../../../models/participant.model'; -import { OpenViduComponentsConfigService } from '../../../../services/config/openvidu-components-angular.config.service'; +import { OpenViduComponentsConfigService } from '../../../../services/config/directive-config.service'; import { ParticipantService } from '../../../../services/participant/participant.service'; /** diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/panel/settings-panel/settings-panel.component.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/panel/settings-panel/settings-panel.component.ts index 3f863711..88031c05 100644 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/panel/settings-panel/settings-panel.component.ts +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/panel/settings-panel/settings-panel.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, OnInit, Output } from '@angular/core'; import { Subscription } from 'rxjs'; import { PanelStatusInfo, PanelSettingsOptions, PanelType } from '../../../models/panel.model'; -import { OpenViduComponentsConfigService } from '../../../services/config/openvidu-components-angular.config.service'; +import { OpenViduComponentsConfigService } from '../../../services/config/directive-config.service'; import { PanelService } from '../../../services/panel/panel.service'; import { PlatformService } from '../../../services/platform/platform.service'; import { CustomDevice } from '../../../models/device.model'; diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/pre-join/pre-join.component.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/pre-join/pre-join.component.ts index 3bcb017c..97192b07 100644 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/pre-join/pre-join.component.ts +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/pre-join/pre-join.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectorRef, Component, EventEmitter, HostListener, Input, OnDest import { Subscription } from 'rxjs'; import { ILogger } from '../../models/logger.model'; import { CdkOverlayService } from '../../services/cdk-overlay/cdk-overlay.service'; -import { OpenViduComponentsConfigService } from '../../services/config/openvidu-components-angular.config.service'; +import { OpenViduComponentsConfigService } from '../../services/config/directive-config.service'; import { LayoutService } from '../../services/layout/layout.service'; import { LoggerService } from '../../services/logger/logger.service'; import { OpenViduService } from '../../services/openvidu/openvidu.service'; diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/session/session.component.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/session/session.component.ts index 255a7ef6..b8954738 100644 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/session/session.component.ts +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/session/session.component.ts @@ -25,7 +25,7 @@ import { ActionService } from '../../services/action/action.service'; import { BroadcastingService } from '../../services/broadcasting/broadcasting.service'; // import { CaptionService } from '../../services/caption/caption.service'; import { ChatService } from '../../services/chat/chat.service'; -import { OpenViduComponentsConfigService } from '../../services/config/openvidu-components-angular.config.service'; +import { OpenViduComponentsConfigService } from '../../services/config/directive-config.service'; import { LayoutService } from '../../services/layout/layout.service'; import { LoggerService } from '../../services/logger/logger.service'; import { OpenViduService } from '../../services/openvidu/openvidu.service'; diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/stream/stream.component.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/stream/stream.component.ts index 311c54de..c406b9f1 100644 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/stream/stream.component.ts +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/stream/stream.component.ts @@ -2,7 +2,7 @@ import { Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from '@ang import { MatMenuPanel, MatMenuTrigger } from '@angular/material/menu'; import { Subscription } from 'rxjs'; import { CdkOverlayService } from '../../services/cdk-overlay/cdk-overlay.service'; -import { OpenViduComponentsConfigService } from '../../services/config/openvidu-components-angular.config.service'; +import { OpenViduComponentsConfigService } from '../../services/config/directive-config.service'; import { LayoutService } from '../../services/layout/layout.service'; import { OpenViduService } from '../../services/openvidu/openvidu.service'; import { ParticipantService } from '../../services/participant/participant.service'; diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/toolbar/toolbar.component.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/toolbar/toolbar.component.ts index 6a2d5b1a..f86a326d 100644 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/toolbar/toolbar.component.ts +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/toolbar/toolbar.component.ts @@ -35,7 +35,7 @@ import { } from '../../models/recording.model'; import { ActionService } from '../../services/action/action.service'; import { BroadcastingService } from '../../services/broadcasting/broadcasting.service'; -import { OpenViduComponentsConfigService } from '../../services/config/openvidu-components-angular.config.service'; +import { OpenViduComponentsConfigService } from '../../services/config/directive-config.service'; import { DeviceService } from '../../services/device/device.service'; import { LayoutService } from '../../services/layout/layout.service'; import { LoggerService } from '../../services/logger/logger.service'; diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/videoconference/videoconference.component.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/videoconference/videoconference.component.ts index a9d8eb79..dddcfd03 100644 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/videoconference/videoconference.component.ts +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/videoconference/videoconference.component.ts @@ -28,7 +28,7 @@ import { } from '../../directives/template/openvidu-components-angular.directive'; import { ILogger } from '../../models/logger.model'; import { ActionService } from '../../services/action/action.service'; -import { OpenViduComponentsConfigService } from '../../services/config/openvidu-components-angular.config.service'; +import { OpenViduComponentsConfigService } from '../../services/config/directive-config.service'; import { DeviceService } from '../../services/device/device.service'; import { LoggerService } from '../../services/logger/logger.service'; import { OpenViduService } from '../../services/openvidu/openvidu.service'; diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/activities-panel.directive.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/activities-panel.directive.ts index 32a3babd..f4e3b78f 100644 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/activities-panel.directive.ts +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/activities-panel.directive.ts @@ -1,5 +1,5 @@ import { AfterViewInit, Directive, ElementRef, Input, OnDestroy } from '@angular/core'; -import { OpenViduComponentsConfigService } from '../../services/config/openvidu-components-angular.config.service'; +import { OpenViduComponentsConfigService } from '../../services/config/directive-config.service'; /** * The **recordingActivity** directive allows show/hide the recording activity in {@link ActivitiesPanelComponent}. diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/admin.directive.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/admin.directive.ts index 2a2c5b4e..f83d03a3 100644 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/admin.directive.ts +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/admin.directive.ts @@ -1,6 +1,6 @@ import { Directive, AfterViewInit, OnDestroy, Input, ElementRef } from '@angular/core'; import { RecordingInfo } from '../../models/recording.model'; -import { OpenViduComponentsConfigService } from '../../services/config/openvidu-components-angular.config.service'; +import { OpenViduComponentsConfigService } from '../../services/config/directive-config.service'; /** * The **recordingsList** directive allows show all recordings saved in your OpenVidu deployment in {@link AdminDashboardComponent}. diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/participant-panel-item.directive.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/participant-panel-item.directive.ts index b95a5a3e..02fff1e7 100644 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/participant-panel-item.directive.ts +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/participant-panel-item.directive.ts @@ -1,5 +1,5 @@ import { Directive, AfterViewInit, OnDestroy, Input, ElementRef } from '@angular/core'; -import { OpenViduComponentsConfigService } from '../../services/config/openvidu-components-angular.config.service'; +import { OpenViduComponentsConfigService } from '../../services/config/directive-config.service'; /** * The **muteButton** directive allows show/hide the muted button in participant panel item component. diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/stream.directive.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/stream.directive.ts index 75532479..aee67b66 100644 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/stream.directive.ts +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/stream.directive.ts @@ -1,5 +1,5 @@ import { AfterViewInit, Directive, ElementRef, Input, OnDestroy } from '@angular/core'; -import { OpenViduComponentsConfigService } from '../../services/config/openvidu-components-angular.config.service'; +import { OpenViduComponentsConfigService } from '../../services/config/directive-config.service'; /** * The **displayParticipantName** directive allows show/hide the participants name in stream component. diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/toolbar.directive.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/toolbar.directive.ts index 2c4daa73..23c2c031 100644 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/toolbar.directive.ts +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/toolbar.directive.ts @@ -1,5 +1,5 @@ import { AfterViewInit, Directive, ElementRef, Input, OnDestroy } from '@angular/core'; -import { OpenViduComponentsConfigService } from '../../services/config/openvidu-components-angular.config.service'; +import { OpenViduComponentsConfigService } from '../../services/config/directive-config.service'; import { ToolbarAdditionalButtonsPosition } from '../../models/toolbar.model'; /** diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/videoconference.directive.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/videoconference.directive.ts index 6f530e66..776c4640 100644 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/videoconference.directive.ts +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/videoconference.directive.ts @@ -1,7 +1,7 @@ import { Directive, ElementRef, Input, OnDestroy, OnInit } from '@angular/core'; import { CaptionsLangOption } from '../../models/caption.model'; // import { CaptionService } from '../../services/caption/caption.service'; -import { OpenViduComponentsConfigService } from '../../services/config/openvidu-components-angular.config.service'; +import { OpenViduComponentsConfigService } from '../../services/config/directive-config.service'; import { TranslateService } from '../../services/translate/translate.service'; import { LangOption } from '../../models/lang.model'; import { StorageService } from '../../services/storage/storage.service'; diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/openvidu-components-angular.module.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/openvidu-components-angular.module.ts index 66c9de7c..6cff3937 100644 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/openvidu-components-angular.module.ts +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/openvidu-components-angular.module.ts @@ -25,7 +25,7 @@ import { CdkOverlayContainer } from './config/custom-cdk-overlay'; import { OpenViduComponentsConfig } from './config/openvidu-components-angular.config'; import { ActionService } from './services/action/action.service'; import { ChatService } from './services/chat/chat.service'; -import { OpenViduComponentsConfigService } from './services/config/openvidu-components-angular.config.service'; +import { OpenViduComponentsConfigService } from './services/config/directive-config.service'; import { DeviceService } from './services/device/device.service'; import { DocumentService } from './services/document/document.service'; import { LayoutService } from './services/layout/layout.service'; @@ -97,7 +97,7 @@ const privateComponents = [ VideoDevicesComponent, AudioDevicesComponent, ParticipantNameInputComponent, - LangSelectorComponent, + LangSelectorComponent // CaptionsSettingComponent ]; diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/config/openvidu-components-angular.config.service.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/config/directive-config.service.ts similarity index 89% rename from openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/config/openvidu-components-angular.config.service.ts rename to openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/config/directive-config.service.ts index 1773aa45..2b312db5 100644 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/config/openvidu-components-angular.config.service.ts +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/config/directive-config.service.ts @@ -1,18 +1,13 @@ -import { Inject, Injectable } from '@angular/core'; +import { Injectable } from '@angular/core'; import { BehaviorSubject, Observable } from 'rxjs'; -import { OpenViduComponentsConfig, ParticipantFactoryFunction } from '../../config/openvidu-components-angular.config'; import { RecordingInfo } from '../../models/recording.model'; -import { DOCUMENT } from '@angular/common'; import { ToolbarAdditionalButtonsPosition } from '../../models/toolbar.model'; -// import { version } from '../../../../package.json'; - /** * @internal */ @Injectable() export class OpenViduComponentsConfigService { - private configuration: OpenViduComponentsConfig; private token = >new BehaviorSubject(''); token$: Observable; @@ -92,13 +87,7 @@ export class OpenViduComponentsConfigService { private adminLoginError = >new BehaviorSubject(null); adminLoginError$: Observable; - constructor( - @Inject('OPENVIDU_COMPONENTS_CONFIG') config: OpenViduComponentsConfig, - @Inject(DOCUMENT) private document: Document - ) { - this.configuration = config; - console.log(this.configuration); - if (this.isProduction()) console.log('OpenVidu Angular Production Mode'); + constructor() { this.token$ = this.token.asObservable(); this.livekitUrl$ = this.livekitUrl.asObservable(); this.tokenError$ = this.tokenError.asObservable(); @@ -368,39 +357,6 @@ export class OpenViduComponentsConfigService { return this.adminLoginError.getValue(); } - getConfig(): OpenViduComponentsConfig { - return this.configuration; - } - isProduction(): boolean { - return this.configuration?.production || false; - } - - /** - * Retrieves the base href of the application. - * - * @returns The base href of the application as a string. - */ - getBaseHref(): string { - const base = this.document.getElementsByTagName('base'); - if (!base || base.length === 0) { - return '/'; - } - - const baseHref = base[0].href; - if (baseHref) { - return baseHref; - } - return '/'; - } - - hasParticipantFactory(): boolean { - return typeof this.getConfig().participantFactory === 'function'; - } - - getParticipantFactory(): ParticipantFactoryFunction { - return this.getConfig().participantFactory; - } - isRecordingEnabled(): boolean { return this.recordingButton.getValue() && this.recordingActivity.getValue(); } diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/config/global-config.service.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/config/global-config.service.ts new file mode 100644 index 00000000..0ab1292d --- /dev/null +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/config/global-config.service.ts @@ -0,0 +1,52 @@ +import { DOCUMENT } from '@angular/common'; +import { Inject, Injectable} from '@angular/core'; +import { ParticipantFactoryFunction, OpenViduComponentsConfig } from '../../config/openvidu-components-angular.config'; + +@Injectable({ + providedIn: 'root' +}) +export class GlobalConfigService { + private configuration: OpenViduComponentsConfig; + + constructor( + @Inject('OPENVIDU_COMPONENTS_CONFIG') config: OpenViduComponentsConfig, + @Inject(DOCUMENT) private document: Document + ) { + this.configuration = config; + console.log(this.configuration); + if (this.isProduction()) console.log('OpenVidu Angular Production Mode'); + } + + /** + * Retrieves the base href of the application. + * + * @returns The base href of the application as a string. + */ + getBaseHref(): string { + const base = this.document.getElementsByTagName('base'); + if (!base || base.length === 0) { + return '/'; + } + + const baseHref = base[0].href; + if (baseHref) { + return baseHref; + } + return '/'; + } + + hasParticipantFactory(): boolean { + return typeof this.getConfig().participantFactory === 'function'; + } + + getParticipantFactory(): ParticipantFactoryFunction { + return this.getConfig().participantFactory; + } + + getConfig(): OpenViduComponentsConfig { + return this.configuration; + } + isProduction(): boolean { + return this.configuration?.production || false; + } +} diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/config/openvidu-components-angular.config.service.mock.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/config/openvidu-components-angular.config.service.mock.ts deleted file mode 100644 index d1d13e23..00000000 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/config/openvidu-components-angular.config.service.mock.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Injectable } from '@angular/core'; -import { OpenViduComponentsConfig } from '../../config/openvidu-components-angular.config'; - -@Injectable() -export class OpenViduAngularConfigServiceMock { - private configuration: OpenViduComponentsConfig; - - constructor() { - this.configuration = { production: false }; - } - - getConfig(): OpenViduComponentsConfig { - return this.configuration; - } - isProduction(): boolean { - return this.configuration?.production; - } -} diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/config/openvidu-components-angular.config.service.spec.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/config/openvidu-components-angular.config.service.spec.ts deleted file mode 100644 index c6b32317..00000000 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/config/openvidu-components-angular.config.service.spec.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { TestBed } from '@angular/core/testing'; -import { OpenViduComponentsConfig } from '../../config/openvidu-components-angular.config'; - -import { OpenViduComponentsConfigService } from './openvidu-components-angular.config.service'; - -describe('OpenViduAngularConfigService', () => { - let service: OpenViduComponentsConfigService; - const config: OpenViduComponentsConfig = { production: false }; - - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [ - OpenViduComponentsConfigService, - {provide: 'LIB_CONFIG', useValue: config}] - }); - service = TestBed.inject(OpenViduComponentsConfigService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/logger/logger.service.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/logger/logger.service.ts index 40436c42..579fa2df 100644 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/logger/logger.service.ts +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/logger/logger.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { ILogService } from '../../models/logger.model'; -import { OpenViduComponentsConfigService } from '../config/openvidu-components-angular.config.service'; +import { GlobalConfigService } from '../config/global-config.service'; /** * @internal @@ -18,7 +18,7 @@ export class LoggerService implements ILogService { ['[', '] ERROR: '] ]; - constructor(private openviduAngularConfigSrv: OpenViduComponentsConfigService) { + constructor(private globalService: GlobalConfigService) { } private getLoggerFns(prefix: string) { @@ -31,7 +31,7 @@ export class LoggerService implements ILogService { } public get(prefix: string) { - const prodMode = this.openviduAngularConfigSrv.isProduction(); + const prodMode = this.globalService.isProduction(); const loggerService = this; return { d: function(...args: any[]) { diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/participant/participant.service.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/participant/participant.service.ts index 6a8ff938..65ed7b2b 100644 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/participant/participant.service.ts +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/participant/participant.service.ts @@ -2,7 +2,8 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject, Observable } from 'rxjs'; import { ILogger } from '../../models/logger.model'; import { ParticipantModel, ParticipantProperties } from '../../models/participant.model'; -import { OpenViduComponentsConfigService } from '../config/openvidu-components-angular.config.service'; +import { OpenViduComponentsConfigService } from '../config/directive-config.service'; +import { GlobalConfigService } from '../config/global-config.service'; import { LoggerService } from '../logger/logger.service'; import { OpenViduService } from '../openvidu/openvidu.service'; @@ -45,7 +46,8 @@ export class ParticipantService { * @internal */ constructor( - private openviduAngularConfigSrv: OpenViduComponentsConfigService, + private globalService: GlobalConfigService, + private directiveService: OpenViduComponentsConfigService, private openviduService: OpenViduService, private storageSrv: StorageService, private loggerSrv: LoggerService @@ -320,7 +322,7 @@ export class ParticipantService { if (this.openviduService.isRoomConnected() && this.localParticipant) { return this.localParticipant.isCameraEnabled; } else { - const directiveCameraEnabled = this.openviduAngularConfigSrv.isVideoEnabled(); + const directiveCameraEnabled = this.directiveService.isVideoEnabled(); if (!directiveCameraEnabled) { return false; @@ -336,7 +338,7 @@ export class ParticipantService { if (this.openviduService.isRoomConnected() && this.localParticipant) { return this.localParticipant.isMicrophoneEnabled; } else { - const directiveMicropgoneEnabled = this.openviduAngularConfigSrv.isAudioEnabled(); + const directiveMicropgoneEnabled = this.directiveService.isAudioEnabled(); if (!directiveMicropgoneEnabled) { return false; @@ -532,8 +534,8 @@ export class ParticipantService { } private newParticipant(props: ParticipantProperties) { - if (this.openviduAngularConfigSrv.hasParticipantFactory()) { - return this.openviduAngularConfigSrv.getParticipantFactory().apply(this, [props]); + if (this.globalService.hasParticipantFactory()) { + return this.globalService.getParticipantFactory().apply(this, [props]); } return new ParticipantModel(props); } diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/recording/recording.service.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/recording/recording.service.ts index 503c9b67..46fa345f 100644 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/recording/recording.service.ts +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/services/recording/recording.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject, Observable } from 'rxjs'; import { RecordingInfo, RecordingStatus, RecordingStatusInfo } from '../../models/recording.model'; import { ActionService } from '../action/action.service'; -import { OpenViduComponentsConfigService } from '../config/openvidu-components-angular.config.service'; +import { GlobalConfigService } from '../config/global-config.service'; @Injectable({ providedIn: 'root' @@ -23,9 +23,9 @@ export class RecordingService { /** * @internal */ - constructor(private actionService: ActionService, private openviduConfigService: OpenViduComponentsConfigService) { + constructor(private actionService: ActionService, private globalService: GlobalConfigService) { this.recordingStatusObs = this.recordingStatus.asObservable(); - this.API_RECORDINGS_PREFIX = this.openviduConfigService.getBaseHref() + this.API_RECORDINGS_PREFIX; + this.API_RECORDINGS_PREFIX = this.globalService.getBaseHref() + this.API_RECORDINGS_PREFIX; } /** diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/public-api.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/public-api.ts index b3733254..2b1c6a06 100644 --- a/openvidu-components-angular/projects/openvidu-components-angular/src/public-api.ts +++ b/openvidu-components-angular/projects/openvidu-components-angular/src/public-api.ts @@ -49,6 +49,6 @@ export * from './lib/services/openvidu/openvidu.service'; export * from './lib/services/panel/panel.service'; export * from './lib/services/participant/participant.service'; export * from './lib/services/recording/recording.service'; -export * from './lib/services/config/openvidu-components-angular.config.service'; +export * from './lib/services/config/global-config.service'; export * from 'livekit-client';