@saooti/octopus-sdk 31.0.1 → 31.0.4

package/src/components/misc/modal/NewsletterModal.vue

@@ -242,9 +242,7 @@ export default defineComponent({
           `" title="` +
           this.$t('Listen this episode') +
           `">
-          <img width="44" height="44" style="display: inline-block;vertical-align: middle" src="` +
-          this.resourcesUrl +
-          `/img/play-podcast.png">
+          <img width="44" height="44" style="display: inline-block;vertical-align: middle" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABmJLR0QA/wD/AP+gvaeTAAAAxElEQVRIie3WMWpCURBG4Q8FSRrtbC2SPhvICmzchVuwtXQLbsE2pVUIkjqQHVgqNmIj6EvxGHhFQAIvcxt/OPVhhrlzh3sKZ4MvTLLFVYNPvJYQB294LiGucMYSw2xxcMQcj9niYIsputni4BvjEuJgjZcS4goXrDDKFgcnLDDIFgd7zNDLFgfvTUHnL23ISJuV7iS3Ooarn1VxkeeUvkDSV2b6J3FQT+pDW8Jb4vRD4Kqe1Kf/Ev4mTj32PhQ6b+9pPT+XHgysHrPM6QAAAABJRU5ErkJggg=="/>
         </a>
         <a style="color: #000;text-decoration: none; margin-right:8px" href="` +
           window.location.href +
@@ -283,6 +281,9 @@ export default defineComponent({
       });
     },
   },
+  created(){
+    this.initColor();
+  },
   methods: {
     closePopup(event: { preventDefault: () => void }): void {
       event.preventDefault();
@@ -302,12 +303,18 @@ export default defineComponent({
     },
     afterCopy(): void{
       (this.$refs.snackbar as InstanceType<typeof SnackbarVue>).open(this.$t('Data in clipboard'));
+    },
+    initColor(): void {
+      if(state.generalParameters.podcastmaker && state.generalParameters.podcastmakerColor){
+        this.color = state.generalParameters.podcastmakerColor;
+      }
     }
   },
 })
 </script>
 
 <style lang="scss">
+.octopus-app{
 #newsletter-modal {
   textarea {
     border: 2px solid #eee;
@@ -323,4 +330,5 @@ export default defineComponent({
     max-width: 60%;
   }
 }
+}
 </style>

package/src/components/misc/modal/ShareModalPlayer.vue

@@ -139,6 +139,7 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
+.octopus-app{
 .share-modal-border {
   border-right: solid 1px rgb(222, 226, 230);
   border-left: solid 1px rgb(222, 226, 230);
@@ -178,4 +179,5 @@ export default defineComponent({
     align-self: center;
   }
 }
+}
 </style>

package/src/components/mixins/handle403.ts

@@ -0,0 +1,17 @@
+import { AxiosError } from 'axios';
+import { defineComponent } from 'vue';
+export const handle403 = defineComponent({
+  methods: {
+    handle403(error: AxiosError): void {
+      if (403 === error.response?.status) {
+        if(!this.$store.state.authentication.isAuthenticated){
+          this.$router.push("/sso/login");
+        }else{
+          this.$router.push({
+            path: '/main/pub/error'
+          });
+        }
+      }
+    },
+  },
+});

package/src/components/pages/Emission.vue

@@ -103,9 +103,11 @@
 import octopusApi from '@saooti/octopus-api';
 import { state } from '../../store/paramStore';
 import { displayMethods } from '../mixins/functions';
+import { handle403 } from '../mixins/handle403';
 import { Emission } from '@/store/class/general/emission';
 import ClassicLoading from '../form/ClassicLoading.vue';
 import { defineComponent, defineAsyncComponent } from 'vue';
+import { AxiosError } from 'axios';
 const PodcastFilterList = defineAsyncComponent(() => import('../display/podcasts/PodcastFilterList.vue'));
 const SharePlayer = defineAsyncComponent(() => import('../display/sharing/SharePlayer.vue'));
 const ShareButtons = defineAsyncComponent(() => import('../display/sharing/ShareButtons.vue'));
@@ -126,7 +128,7 @@ export default defineComponent({
     LiveHorizontalList,
     ClassicLoading
   },
-  mixins: [displayMethods],
+  mixins: [displayMethods, handle403],
   props: {
     emissionId: { default: undefined, type: Number},
     isEducation: { default: false, type: Boolean},
@@ -220,6 +222,9 @@ export default defineComponent({
       }
       return count;
     },
+    filterOrga(): string {
+      return this.$store.state.filter.organisationId;
+    },
   },
   watch: {
     emissionId(): void {
@@ -231,12 +236,20 @@ export default defineComponent({
     this.getEmissionDetails();
   },
   methods: {
+    initError():void{
+      this.error = true;
+      this.loaded = true;
+    },
     async getEmissionDetails(): Promise<void> {
       this.loaded = false;
       this.error = false;
       try {
         const data: Emission = await octopusApi.fetchEmission(this.emissionId);
         this.emission = data;
+        if(this.emission.orga.private && this.filterOrga!==this.emission.orga.id){
+          this.initError();
+          return;
+        }
         this.$emit('emissionTitle', this.name);
         this.loaded = true;
         if (!this.emission.annotations) return;
@@ -252,9 +265,9 @@ export default defineComponent({
           this.notExclusive =
             'true' === this.emission.annotations.notExclusive ? true : false;
         }
-      } catch {
-        this.error = true;
-        this.loaded = true;
+      } catch(error) {
+        this.handle403((error as AxiosError));
+        this.initError();
       }
     },
     fetch(/* podcasts */) {

package/src/components/pages/Error403Page.vue

@@ -0,0 +1,24 @@
+<template>
+  <div class="page-box page-box-absolute bg-white justify-content-evenly">
+    <img
+      class="logo-octopus"
+      src="/img/logo_octopus_final.svg"
+      :alt="$t('Logo of main page')"
+    >
+    <h2>{{ $t('You do not have the right to access this page' ) }}</h2>
+    <a
+      class="btn btn-link"
+      href="/sso/logout"
+    >{{ $t('Logout') }}</a>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+export default defineComponent({
+  name: 'Error403Page',
+  mounted() {
+    document.title = this.$store.state.general.metaTitle;
+  },
+});
+</script>

package/src/components/pages/Participant.vue

@@ -82,9 +82,11 @@
 import octopusApi from '@saooti/octopus-api';
 import { state } from '../../store/paramStore';
 import { displayMethods } from '../mixins/functions';
+import { handle403 } from '../mixins/handle403';
 import { Participant } from '@/store/class/general/participant';
 import ClassicLoading from '../form/ClassicLoading.vue';
 import { defineComponent, defineAsyncComponent } from 'vue';
+import { AxiosError } from 'axios';
 const ShareButtons = defineAsyncComponent(() => import('../display/sharing/ShareButtons.vue'));
 const PodcastFilterList = defineAsyncComponent(() => import('../display/podcasts/PodcastFilterList.vue'));
 const EditBox = defineAsyncComponent(() => import('@/components/display/edit/EditBox.vue'));
@@ -97,7 +99,7 @@ export default defineComponent({
     PodcastList,
     ClassicLoading
   },
-  mixins: [displayMethods],
+  mixins: [displayMethods, handle403],
   props: {
     participantId: { default: undefined, type: Number},
   },
@@ -160,6 +162,9 @@ export default defineComponent({
       }
       return false;
     },
+    filterOrga(): string {
+      return this.$store.state.filter.organisationId;
+    },
   },
   watch: {
     participant: {
@@ -173,16 +178,24 @@ export default defineComponent({
     this.getParticipantDetails();
   },
   methods: {
+    initError():void{
+      this.error = true;
+      this.loaded = true;
+    },
     async getParticipantDetails(): Promise<void> {
       this.loaded = false;
       try {
         const data = await octopusApi.fetchParticipant(this.participantId ? this.participantId.toString(): "");
+        if(data && data.orga && data.orga.private && this.filterOrga!==data.orga.id){
+          this.initError();
+          return;
+        }
         this.participant = data;
         this.$emit('participantTitle', this.name);
         this.loaded = true;
-      } catch {
-        this.error = true;
-        this.loaded = true;
+      } catch(error) {
+        this.handle403((error as AxiosError));
+        this.initError();
       }
     },
     updateParticipant(participant: Participant): void {
@@ -194,10 +207,12 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
+.octopus-app{
 @media (min-width: 950px) {
   .participant-desc {
     max-width: 50%;
     line-height: 1.5em;
   }
 }
+}
 </style>

package/src/components/pages/Playlist.vue

@@ -53,8 +53,10 @@ import PodcastList from '../display/playlist/PodcastList.vue';
 import octopusApi from '@saooti/octopus-api';
 import { state } from '../../store/paramStore';
 import { displayMethods } from '../mixins/functions';
+import { handle403 } from '../mixins/handle403';
 import { Playlist } from '@/store/class/general/playlist';
 import { defineComponent, defineAsyncComponent } from 'vue';
+import { AxiosError } from 'axios';
 const ShareButtons = defineAsyncComponent(() => import('../display/sharing/ShareButtons.vue'));
 const EditBox = defineAsyncComponent(() => import('@/components/display/edit/EditBox.vue'));
 const SharePlayer = defineAsyncComponent(() => import('../display/sharing/SharePlayer.vue'));
@@ -66,7 +68,7 @@ export default defineComponent({
     SharePlayer,
     ClassicLoading
   },
-  mixins:[displayMethods],
+  mixins:[displayMethods, handle403],
   props: {
     playlistId: { default: undefined, type: Number},
     isEducation: { default: false, type: Boolean},
@@ -117,6 +119,9 @@ export default defineComponent({
       }
       return false;
     },
+    filterOrga(): string {
+      return this.$store.state.filter.organisationId;
+    },
   },
   watch: {
     playlistId() {
@@ -128,15 +133,24 @@ export default defineComponent({
     this.getPlaylistDetails();
   },
   methods: {
+    initError():void{
+      this.error = true;
+      this.loaded = true;
+    },
     async getPlaylistDetails(): Promise<void> {
       try {
         this.loaded = false;
         this.error = false;
         const data: Playlist = await octopusApi.fetchPlaylist(this.playlistId ? this.playlistId.toString(): "");
         this.playlist = data;
+        if(this.playlist.organisation.private && this.filterOrga!==this.playlist.organisation.id){
+          this.initError();
+          return;
+        }
         this.$emit('playlistTitle', this.playlist.title);
-      } catch {
-        this.error = true;
+      } catch(error) {
+        this.handle403((error as AxiosError));
+        this.initError();
       }
       this.loaded = true;
     },

package/src/components/pages/Podcast.vue

@@ -1,14 +1,16 @@
 <template>
   <div class="page-box">
     <template v-if="loaded && !error">
-      <h1 v-if="!isOuestFrance">
-        {{ titlePage }}
-      </h1>
-      <Countdown
-        v-if="isCounter"
-        :time-remaining="timeRemaining"
-      />
-      <div class="d-flex">
+      <div class="page-podcast-title">
+        <h1 v-if="!isOuestFrance">
+          {{ titlePage }}
+        </h1>
+        <Countdown
+          v-if="isCounter"
+          :time-remaining="timeRemaining"
+        />
+      </div>
+      <div class="d-flex page-podcast">
         <div class="d-flex flex-column flex-super-grow">
           <RecordingItemButton
             v-if="
@@ -101,11 +103,12 @@ import { state } from '../../store/paramStore';
 import moment from 'moment';
 import { Podcast } from '@/store/class/general/podcast';
 import { Conference } from '@/store/class/conference/conference';
-
+import { handle403 } from '../mixins/handle403';
 import { defineComponent, defineAsyncComponent } from 'vue';
 import CommentSectionVue from '../display/comments/CommentSection.vue';
 import { CommentPodcast } from '@/store/class/general/comment';
 import { Category } from '@/store/class/general/category';
+import { AxiosError } from 'axios';
 const ShareButtons = defineAsyncComponent(() => import('../display/sharing/ShareButtons.vue'));
 const SharePlayer = defineAsyncComponent(() => import('../display/sharing/SharePlayer.vue'));
 const EditBox = defineAsyncComponent(() => import('@/components/display/edit/EditBox.vue'));
@@ -128,6 +131,8 @@ export default defineComponent({
     ClassicLoading
   },
 
+  mixins: [handle403],
+
   props: {
     updateStatus: { default: undefined, type: String},
     playingPodcast: { default: undefined, type: Object as ()=> Podcast},
@@ -264,6 +269,9 @@ export default defineComponent({
       if(!this.podcast){return "";}
       return moment(this.podcast.pubDate).diff(moment(), 'seconds').toString();
     },
+    filterOrga(): string {
+      return this.$store.state.filter.organisationId;
+    },
   },
   watch: {
     updateStatus(): void {
@@ -312,9 +320,17 @@ export default defineComponent({
     updatePodcast(podcastUpdated: Podcast): void {
       this.podcast = podcastUpdated;
     },
+    initError():void{
+      this.error = true;
+      this.loaded = true;
+    },
     async getPodcastDetails(podcastId: number): Promise<void> {
       try {
         const data : Podcast = await octopusApi.fetchPodcast(podcastId.toString());
+        if(data.organisation.private && this.filterOrga!==data.organisation.id){
+          this.initError();
+          return;
+        }
         this.podcast = data;
         this.$emit('podcastTitle', this.podcast.title);
         if (
@@ -348,9 +364,9 @@ export default defineComponent({
           this.error = true;
         }
         this.loaded = true;
-      } catch {
-        this.error = true;
-        this.loaded = true;
+      } catch(error) {
+        this.handle403((error as AxiosError));
+        this.initError();
       }
     },
     removeDeleted(): void {

package/src/components/pages/Podcasts.vue

@@ -90,6 +90,7 @@ export default defineComponent({
   props: {
     productor: { default: undefined, type: String},
     isEducation: { default: false, type: Boolean},
+    searchInit: { default: "", type: String}
   },
 
   data() {
@@ -154,6 +155,9 @@ export default defineComponent({
   },
 
   created() {
+    if(this.searchInit){
+      this.searchPattern = this.searchInit;
+    }
     if (this.productor) {
       this.organisationId = this.productor;
     } else if (this.$store.state.filter.organisationId) {

package/src/locale/en.ts

@@ -297,4 +297,5 @@ export default{
   'From RSS': "From an RSS feed",
   "User menu":"User menu",
   'Podcast tags': 'Podcast tags',
+  "You do not have the right to access this page":"You do not have the right to access this page",
 };

package/src/locale/fr.ts

@@ -297,4 +297,5 @@ export default{
   'From RSS': "Issu d'un flux RSS",
   "User menu":"Menu utilisateur",
   'Podcast tags': "Mot-clé de l'épisode",
+  "You do not have the right to access this page":"Vous n’avez pas le droit d’accéder à cette page",
 };