feat: align environment parmas names (#38)

align with kaltura BE naming convention beUrl => serviceUrl baseUrl => cdn url
kaltura · Dec 10, 2017 · 78f5a64 · 78f5a64
1 parent cab5932
commit 78f5a64
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/src/k-provider/ovp/config.js b/src/k-provider/ovp/config.js
@@ -1,8 +1,8 @@
 //@flow
 
 const defaultConfig: Object = {
-  beUrl: "//www.kaltura.com/api_v3",
-  baseUrl: "//cdnapisec.kaltura.com",
+  serviceUrl: "//www.kaltura.com/api_v3",
+  cdnUrl: "//cdnapisec.kaltura.com",
   serviceParams: {
     apiVersion: '3.3.0',
     format: 1

diff --git a/src/k-provider/ovp/loaders/media-entry-loader.js b/src/k-provider/ovp/loaders/media-entry-loader.js
@@ -60,9 +60,9 @@ export default class MediaEntryLoader implements ILoader {
    */
   buildRequests(params: Object): Array<RequestBuilder> {
     let requests: Array<RequestBuilder> = [];
-    requests.push(BaseEntryService.list(config.beUrl, params.ks, params.entryId));
-    requests.push(BaseEntryService.getPlaybackContext(config.beUrl, params.ks, params.entryId));
-    requests.push(MetaDataService.list(config.beUrl, params.ks, params.entryId));
+    requests.push(BaseEntryService.list(config.serviceUrl, params.ks, params.entryId));
+    requests.push(BaseEntryService.getPlaybackContext(config.serviceUrl, params.ks, params.entryId));
+    requests.push(MetaDataService.list(config.serviceUrl, params.ks, params.entryId));
     return requests;
   }
 

diff --git a/src/k-provider/ovp/loaders/session-loader.js b/src/k-provider/ovp/loaders/session-loader.js
@@ -56,7 +56,7 @@ export default class SessionLoader implements ILoader {
    */
   buildRequests(params: Object): Array<RequestBuilder> {
     let requests: Array<RequestBuilder> = [];
-    requests.push(SessionService.anonymousSession(config.beUrl, params.partnerId));
+    requests.push(SessionService.anonymousSession(config.serviceUrl, params.partnerId));
     return requests;
   }
 

diff --git a/src/k-provider/ovp/loaders/ui-config-loader.js b/src/k-provider/ovp/loaders/ui-config-loader.js
@@ -62,7 +62,7 @@ export default class UiConfigLoader implements ILoader {
    */
   buildRequests(params: Object): Array<RequestBuilder> {
     let requests: Array<RequestBuilder> = [];
-    requests.push(UiConfService.get(config.beUrl, params.ks, params.uiConfId));
+    requests.push(UiConfService.get(config.serviceUrl, params.ks, params.uiConfId));
     return requests;
   }
 

diff --git a/src/k-provider/ovp/play-source-url-builder.js b/src/k-provider/ovp/play-source-url-builder.js
@@ -17,7 +17,7 @@ export default class PlaySourceUrlBuilder {
    * @static
    */
   static build(urlParams: Object): string {
-    let baseUrl: string = config.baseUrl;
+    let cdnUrl: string = config.cdnUrl;
     let partnerId: string = urlParams.partnerId;
     let entryId: string = urlParams.entryId;
     let ks: string = urlParams.ks;
@@ -27,12 +27,12 @@ export default class PlaySourceUrlBuilder {
     let extension: string = urlParams.extension;
     let flavorIds: string = urlParams.flavorIds;
 
-    if (baseUrl == "" && partnerId == "" && entryId == "" && extension == "" && format == "") {
+    if (cdnUrl == "" && partnerId == "" && entryId == "" && extension == "" && format == "") {
       return "";
     }
 
-    let playUrl = baseUrl;
-    if (!baseUrl.endsWith("/")) {
+    let playUrl = cdnUrl;
+    if (!cdnUrl.endsWith("/")) {
       playUrl += "/";
     }
     playUrl += "p/" + partnerId + "/sp/" + partnerId + "00" + "/playManifest/entryId/" + entryId + "/protocol/" + protocol + "/format/" + format;

diff --git a/src/k-provider/ovp/provider-parser.js b/src/k-provider/ovp/provider-parser.js
@@ -288,7 +288,7 @@ export default class ProviderParser {
    */
   static _getBaseProtocol(): string {
     const protocolRegex = /^https?:/;
-    const result = protocolRegex.exec(config.baseUrl);
+    const result = protocolRegex.exec(config.cdnUrl);
     const protocol = result ? result[0] : document.location.protocol;
     if (typeof protocol === "string") {
       return protocol.slice(0, -1) // remove ':' from the end

diff --git a/src/k-provider/ovp/services/ovp-service.js b/src/k-provider/ovp/services/ovp-service.js
@@ -30,7 +30,7 @@ export default class OvpService {
     let multiReq = new MultiRequestBuilder(headers);
     multiReq.method = "POST";
     multiReq.service = SERVICE_NAME;
-    multiReq.url = multiReq.getUrl(config.beUrl);
+    multiReq.url = multiReq.getUrl(config.serviceUrl);
     multiReq.params = ovpParams;
     return multiReq;
   }