Skip to content

Commit

Permalink
Merge pull request #203 from ant-media/revert-200-sslThroughWebPanel
Browse files Browse the repository at this point in the history 
Revert "SSL through web panel changes"
  • Loading branch information
@mekya
mekya committed Jan 7, 2023
2 parents 3bd52d3 + bc821ab commit 970118b
Show file tree
Hide file tree
Showing 7 changed files with 56 additions and 559 deletions.
38 changes: 1 addition & 37 deletions src/app/app.page/app.definitions.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,46 +175,10 @@ export class ServerSettings {
constructor(public serverName: string,
public licenceKey: string,
public buildForMarket: boolean,
public logLevel: string,
public sslSettings:SslSettings
public logLevel: string
) {}
}

export enum SslConfigurationType {
NO_SSL = "No SSL",
CUSTOM_DOMAIN ="Use custom domain.",
ANTMEDIA_SUBDOMAIN ="Use antmedia cloud subdomain.",
CUSTOM_CERTIFICATE = "Import custom certificate."

}


export class SslSettings{
public configurationType:string;
public customDomain:string
public antMediaSubDomain:string

public keyFileContent:string
public fullChainFileContent:string
public chainFileContent:string

public keyFileName:string
public fullChainFileName:string
public chainFileName:string

constructor(configurationType: string,antMediaSubDomain:string,customDomain:string

) {
this.configurationType = configurationType
this.antMediaSubDomain = antMediaSubDomain
this.customDomain = customDomain


}


}

export class AppSettings {

constructor(public mp4MuxingEnabled: boolean,
Expand Down
97 changes: 47 additions & 50 deletions src/app/app.page/dialog/playlist.edit.dialog.component.html
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
<div >
<form method="post" #f="ngForm" validate (ngSubmit)="updatePlaylistItemEditing(f.valid)">

<div class="card-content" style="padding-top:0px">
<h4 class="card-title text-left" i18n="@@editLiveStreamCardTitle">
Edit Playlist
</h4>
<div class="form-group text-left">
<label i18n="@@newLiveStreamName">Playlist Name</label>
<input type="text" required minlength="4" name="playlistName"
i18n-placeholder="@@stream_name_place_holder"
placeholder="Stream name"
class="form-control" [(ngModel)]="playlistEditing.name"
#playlistName="ngModel" >
<small [hidden]="playlistName.valid || (!f.submitted)"
class="text-danger" i18n="@@playlistNameIsRequired">
Playlist name should be at least 4 characters.
</small>
<form method="post" #f="ngForm" validate (ngSubmit)="updatePlaylistItemEditing(f.valid)">

<div class="card-content" style="padding-top:0px">
<h4 class="card-title text-left" i18n="@@editLiveStreamCardTitle">
Edit Playlist
</h4>
<div class="form-group text-left">
<label i18n="@@newLiveStreamName">Playlist Name</label>
<input type="text" required minlength="4" name="playlistName"
i18n-placeholder="@@stream_name_place_holder"
placeholder="Stream name"
class="form-control" [(ngModel)]="playlistEditing.name"
#playlistName="ngModel" >
<small [hidden]="playlistName.valid || (!f.submitted)"
class="text-danger" i18n="@@playlistNameIsRequired">
Playlist name should be at least 4 characters.
</small>

</div>
</div>

<div class="form-group">

<div class="form-group">


<div class="row">

<div >
<div class="col-sm-12 col-md-12">

<div class="col-sm-12 col-md-12">
<div style="overflow-x: hidden;overflow-y:auto;height: 250px;padding-right:10px;">
<div *ngIf="playlistEditing.playListItemList.length!=0" >
<div class="col-xs-12 col-sm-12 text-left">
<span class="help-block" i18n="@@ResolutionHeight">Playlist URL</span>
Expand All @@ -51,36 +51,35 @@ <h4 class="card-title text-left" i18n="@@editLiveStreamCardTitle">
</ng-container>
</div>

</div>


<div class="row">
<button type="button" class="btn btn-default" (click)="addPlaylistItemEditing()" i18n="@@newPlaylistCreateButton">
Add Playlist Item</button>
</div>
<div class="row">
<button type="button" class="btn btn-default" (click)="addPlaylistItemEditing()" i18n="@@newPlaylistCreateButton">
Add Playlist Item</button>
</div>

<div>
<div class="col-xs-12">
<div class="checkbox">
<input
[(ngModel)]="playlistEditing.playlistLoopEnabled"
id="playlistLoopEnabled"
name="playlistLoopEnabled" type="checkbox">

<label for="playlistLoopEnabled"
i18n="@@playlistLoopEnabled">
Loop Playlist
</label>
<div>
<div class="col-xs-12">
<div class="checkbox">
<input
[(ngModel)]="playlistEditing.playlistLoopEnabled"
id="playlistLoopEnabled"
name="playlistLoopEnabled" type="checkbox">

<label for="playlistLoopEnabled"
i18n="@@playlistLoopEnabled">
Loop Playlist
</label>
</div>
</div>
</div>
</div>

<div class="row text-center" style="padding-top: 20px">
<div class="row text-center" style="padding-top: 20px">

<button type="submit" class="btn btn-fill btn-success" i18n="@@newLiveStreamCreateButton">
<i class="fa fa-spinner fa-pulse fa-1x fa-fw" *ngIf="newPlaylistAdding" aria-hidden="true"></i>Save</button>
<button type="submit" class="btn btn-fill btn-success" i18n="@@newLiveStreamCreateButton">
<i class="fa fa-spinner fa-pulse fa-1x fa-fw" *ngIf="newPlaylistAdding" aria-hidden="true"></i>Save</button>

<button type="button" class="btn btn-simple" i18n="@@newLiveStreamCancelButton" (click)="cancelEditPlaylist()">Cancel</button>
</div>

<button type="button" class="btn btn-simple" i18n="@@newLiveStreamCancelButton" (click)="cancelEditPlaylist()">Cancel</button>
</div>

</div>
Expand All @@ -89,8 +88,6 @@ <h4 class="card-title text-left" i18n="@@editLiveStreamCardTitle">

</div>

</div>

</form>
</form>
</div>

10 changes: 1 addition & 9 deletions src/app/rest/rest.service.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {Injectable} from '@angular/core';
import {Router} from '@angular/router';
import {Observable} from 'rxjs';
import {AppSettings, ServerSettings, SslSettings} from "../app.page/app.definitions";
import {AppSettings, ServerSettings} from "../app.page/app.definitions";
import 'rxjs/add/operator/map';
import 'rxjs/add/operator/catch';
import 'rxjs/add/operator/toPromise';
Expand Down Expand Up @@ -419,9 +419,6 @@ export class RestService {
public getServerSettings(): Observable<Object> {
return this.http.get(REST_SERVICE_ROOT + "/server-settings/" );
}
public getSslSettings(): Observable<Object>{
return this.http.get(REST_SERVICE_ROOT + "/ssl-settings/" );
}

public changeSettings(appName: string, appSettings: AppSettings ): Observable<Object> {
return this.http.post(REST_SERVICE_ROOT + '/applications/settings/' + appName, appSettings);
Expand All @@ -432,11 +429,6 @@ export class RestService {
return this.http.post(REST_SERVICE_ROOT + '/server-settings', serverSettings);
}

public changeSslSettings(sslSettings: SslSettings ): Observable<Object>
{
return this.http.post(REST_SERVICE_ROOT + '/ssl-settings', sslSettings);
}

public getDeviceAuthParameters(appName: string, networkName: string): Observable<Object> {
return this.http.post(REST_SERVICE_ROOT + "/request?_path=" + appName + "/rest/v2/broadcasts/social-networks/" + networkName, {});
}
Expand Down
14 changes: 0 additions & 14 deletions src/app/server.settings/dialog/server.settings.ssl.error.dialog.component.html
View file

This file was deleted.

27 changes: 0 additions & 27 deletions src/app/server.settings/dialog/server.settings.ssl.error.dialog.component.ts
View file

This file was deleted.

0 comments on commit 970118b

Please sign in to comment.