Merge pull request #5543 from tsiegleauq/adjust-live-conf-perms

Adjust live stream permission

client/package.json

@@ -102,7 +102,7 @@
         "karma-jasmine": "~3.1.1",
         "karma-jasmine-html-reporter": "^1.4.0",
         "npm-license-crawler": "^0.2.1",
-        "prettier": "^2.0.5",
+        "prettier": "~2.0.5",
         "protractor": "^5.4.3",
         "resize-observer-polyfill": "^1.5.1",
         "ts-node": "~8.8.1",

client/src/app/shared/components/jitsi/jitsi.component.html

@@ -47,7 +47,7 @@
     </mat-card>
 </div>
 
-<div class="jitsi-integration" *ngIf="enableJitsi || (videoStreamUrl && canSeeLiveStream)">
+<div class="jitsi-integration" *ngIf="showConferenceBar">
     <!-- Audio-Conference-bar -->
     <div class="jitsi-bar">
         <span class="control-icon-wrapper apply-theme">

client/src/app/shared/components/jitsi/jitsi.component.ts

@@ -138,6 +138,30 @@ export class JitsiComponent extends BaseViewComponent implements OnInit, OnDestr
 
     public canManageSpeaker: boolean;
 
+    /**
+     * Jitsi|URL|Perm||Show
+     * =====|===|====||====
+     *   0  | 0 |  0 || 0
+     *   0  | 0 |  1 || 0
+     *   0  | 1 |  0 || 0
+     *   0  | 1 |  1 || 1
+     *   1  | 0 |  0 || 1
+     *   1  | 0 |  1 || 1
+     *   1  | 1 |  0 || 0
+     *   1  | 1 |  1 || 1
+     */
+    public get showConferenceBar(): boolean {
+        if (this.enableJitsi) {
+            if (this.videoStreamUrl && !this.canSeeLiveStream) {
+                return false;
+            } else {
+                return true;
+            }
+        } else {
+            return this.videoStreamUrl && this.canSeeLiveStream;
+        }
+    }
+
     public get isAccessPermitted(): boolean {
         return !this.restricted || this.canManageSpeaker || this.isOnCurrentLos;
     }