@saooti/octopus-sdk 31.0.43 → 31.0.44

package/README.md

@@ -634,3 +634,4 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
  * 31.0.41 #11220
  * 31.0.42 #11222
  * 31.0.43 #10963
+ * 31.0.44 Début CRUD API

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saooti/octopus-sdk",
-  "version": "31.0.43",
+  "version": "31.0.44",
   "private": false,
   "description": "Javascript SDK for using octopus",
   "author": "Saooti",
@@ -14,7 +14,7 @@
   },
   "main": "./dist/octopus.common.js",
   "dependencies": {
-    "@saooti/octopus-api": "^0.31.5",
+    "@saooti/octopus-api": "^0.31.7",
     "@vue/cli": "^5.0.4",
     "@vue/compat": "^3.2.31",
     "axios": "^0.24.0",

package/src/api/classicCrud.ts

@@ -0,0 +1,29 @@
+import { StoreState } from "@/store/typeAppStore";
+import axios from "axios";
+enum ModuleApi {
+    DEFAULT = 0,
+    MEDIA = 1,
+    COMMENT = 2,
+    KEYCLOAK = 3,
+    FRONTOFFICE = 4,
+    FTP = 5,
+    PLAYER = 6,
+    RSS=7,
+    STORAGE = 8,
+    STUDIO = 9,
+  }
+/* eslint-disable */
+export default {
+    async postData<Type>(state: StoreState,moduleName: ModuleApi,wsPath:string, elementToCreate: unknown): Promise<Type>{
+        console.log(state,moduleName,wsPath);
+        const response = await axios.post('/mock', elementToCreate, {
+        headers: {'Content-Type': 'application/json; charset=utf-8' },
+        });
+        return response.data;
+    },
+    async deleteData(state: StoreState,moduleName: ModuleApi,wsPath:string): Promise<void>{
+        console.log(state,moduleName,wsPath);
+        await axios.delete('/mock');
+    },
+};
+/* eslint-enable */ 

package/src/components/display/categories/CategoryList.vue

@@ -162,9 +162,9 @@ export default defineComponent({
       }
     },
     async fetchCategories(organisationId: string): Promise<void> {
-      const data = await octopusApi.fetchCategories({
+      const data = await octopusApi.fetchDataWithParams<Array<Category>>(0, `iab/list/${organisationId}`,{
         lang: this.$i18n.locale,
-      }, organisationId);
+      });
       this.$store.commit('categoriesOrgaSet', data);
     },
   },

package/src/components/display/comments/CommentInput.vue

@@ -90,7 +90,7 @@
 
 <script lang="ts">
 import octopusApi from '@saooti/octopus-api';
-import commentApi from '@/api/comments';
+import crudApi from '@/api/classicCrud';
 import { cookies } from '../../mixins/functions';
 import { state } from '../../../store/paramStore';
 import { Podcast } from '@/store/class/general/podcast';
@@ -290,9 +290,9 @@ export default defineComponent({
         let data;
         if (this.isCertified) {
           comment.status = 'Valid';
-          data = await commentApi.postComment(this.$store.state, comment);
+          data = await crudApi.postData<CommentPodcast>(this.$store.state,2, 'registeredComment/' + comment.userId, {...comment, ...{userId: undefined}});
         } else {
-          data = await octopusApi.postComment(comment);
+          data = await octopusApi.postDataPublic<CommentPodcast>(2,'unregisteredComment',comment);
         }
         this.$emit('newComment', data);
         this.newComment = '';

package/src/components/display/comments/CommentList.vue

@@ -41,6 +41,7 @@ import moment from 'moment';
 import { Podcast } from '@/store/class/general/podcast';
 import { Conference } from '@/store/class/conference/conference';
 import { CommentPodcast } from '@/store/class/general/comment';
+import { InterfacePageable } from '@/store/class/general/interfacePageable';
 import { defineComponent, defineAsyncComponent } from 'vue';
 import { FetchParam } from '@/store/class/general/fetchParam';
 /* eslint-disable */
@@ -126,7 +127,7 @@ export default defineComponent({
       let data;
       try {
         if (this.comId) {
-          data = await octopusApi.fetchCommentAnswers(this.comId, {first: this.first,size: this.size});
+          data = await octopusApi.postDataPublic<InterfacePageable<CommentPodcast>>(2, this.comId.toString(), {first: this.first,size: this.size});
         }else{
           const param: FetchParam = {
             first: this.first,
@@ -135,7 +136,7 @@ export default defineComponent({
             status:this.editRight && this.status?[this.status]: this.editRight? ['Valid','Pending', 'Invalid']:['Valid'],
             organisationId: undefined === this.podcastId? this.organisation: undefined,
           };
-          data = this.isFlat ? await octopusApi.fetchComments(param) : await octopusApi.fetchRootComments(param);
+          data = await octopusApi.postDataPublic<InterfacePageable<CommentPodcast>>(2, this.isFlat ?'':'getRootCom',param);
         }
         if(reset){
           this.comments.length = 0;

package/src/components/display/comments/CommentParentInfo.vue

@@ -38,7 +38,7 @@ export default defineComponent({
   },
   async created() {
     if(this.comId){
-      this.comment = await octopusApi.fetchComment(this.comId);
+      this.comment = await octopusApi.fetchData<CommentPodcast>(2, `comment/${this.comId}`);
     }
     this.loading = false;
   },

package/src/components/display/emission/EmissionChooser.vue

@@ -178,7 +178,8 @@ export default defineComponent({
           organisationId: this.organisationId,
         };
       }
-      const response = await octopusApi.fetchEmissions(standardParam);
+
+      const response = await octopusApi.fetchDataWithParams<{count: number;result:Array<Emission>;sort: string;}>(0, 'emission/search',standardParam, true);
       if (this.defaultanswer) {
         const emissionDefault = getDefaultEmission(this.defaultanswer);
         if(emissionDefault){

package/src/components/display/emission/EmissionInlineList.vue

@@ -72,6 +72,7 @@ import { Emission } from '@/store/class/general/emission';
 import { Rubrique } from '@/store/class/rubrique/rubrique';
 import { defineComponent } from 'vue'
 import { AxiosError } from 'axios';
+import { Rubriquage } from '@/store/class/rubrique/rubriquage';
 export default defineComponent({
   name: 'EmissionInlineList',
 
@@ -157,14 +158,15 @@ export default defineComponent({
   methods: {
     async fetchNext(): Promise<void> {
       try {
-        const data = await octopusApi.fetchEmissions({
+        const data = await octopusApi.fetchDataWithParams<{count: number;result:Array<Emission>;sort: string;}>(0, 'emission/search',{
           first: this.first,
           size: this.size + 1,
           organisationId: this.organisationId,
           rubriqueId: this.rubriqueId ?  [this.rubriqueId] : [],
           rubriquageId: this.rubriquageId ? [this.rubriquageId] : [],
           sort: 'LAST_PODCAST_DESC',
-        });
+        }, true);
+        
         this.loading = false;
         this.loaded = true;
         this.totalCount = data.count;
@@ -225,7 +227,7 @@ export default defineComponent({
       img.src = url;
     },
     async fetchRubriques(): Promise<void> {
-      const data = await octopusApi.fetchTopic(this.displayRubriquage);
+      const data = await octopusApi.fetchData<Rubriquage>(0, 'rubriquage/'+this.displayRubriquage);
       this.rubriques = data.rubriques;
     },
     rubriquesId(emission: Emission): string|undefined {

package/src/components/display/emission/EmissionItem.vue

@@ -63,6 +63,7 @@ import { state } from '../../../store/paramStore';
 import octopusApi from '@saooti/octopus-api';
 import { displayMethods } from '../../mixins/functions';
 import { defineComponent } from 'vue'
+import { Podcast } from '@/store/class/general/podcast';
 export default defineComponent({
   name: 'EmissionItem',
 
@@ -114,11 +115,11 @@ export default defineComponent({
   },
   methods: {
     async hasPodcast(): Promise<void> {
-      const data = await octopusApi.fetchPodcasts({
+      const data = await octopusApi.fetchDataWithParams<{count: number;result:Array<Podcast>;sort: string;}>(0, 'podcast/search',{
         emissionId: this.emission.emissionId,
         first: 0,
         size: 0,
-      });
+      }, true);
       if (0 === data.count) {
         this.activeEmission = false;
       }

package/src/components/display/emission/EmissionList.vue

@@ -59,6 +59,7 @@ import { defineComponent, defineAsyncComponent } from 'vue';
 import { FetchParam } from '@/store/class/general/fetchParam';
 import { AxiosError } from 'axios';
 import { emptyEmissionData } from '@/store/typeAppStore';
+import { Rubriquage } from '@/store/class/rubrique/rubriquage';
 const EmissionItem = defineAsyncComponent(() => import('./EmissionItem.vue'));
 const EmissionPlayerItem = defineAsyncComponent(() => import('./EmissionPlayerItem.vue'));
 export default defineComponent({
@@ -183,7 +184,7 @@ export default defineComponent({
         includeHidden:this.includeHidden,
       };
       try {
-        const data = await octopusApi.fetchEmissions(param);
+        const data = await octopusApi.fetchDataWithParams<{count: number;result:Array<Emission>;sort: string;}>(0, 'emission/search',param, true);
         this.afterFetching(reset, data);
       } catch (error) {
         this.handle403((error as AxiosError));
@@ -210,7 +211,7 @@ export default defineComponent({
       this.loading = false;
     },
     async fetchRubriques(): Promise<void> {
-      const data = await octopusApi.fetchTopic(this.displayRubriquage);
+      const data = await octopusApi.fetchData<Rubriquage>(0, 'rubriquage/'+this.displayRubriquage);
       this.rubriques = data.rubriques;
     },
     mainRubriquage(emission: Emission): string {

package/src/components/display/emission/EmissionPlayerItem.vue

@@ -207,10 +207,10 @@ export default defineComponent({
   methods: {
     async loadPodcasts(): Promise<void> {
       const nb = this.nbPodcasts ? this.nbPodcasts : 2;
-      const data = await octopusApi.fetchPodcasts({
+      const data =  await octopusApi.fetchDataWithParams<{count: number;result:Array<Podcast>;sort: string;}>(0, 'podcast/search',{
         emissionId: this.emission.emissionId,
         size: nb,
-      });
+      }, true);
       if (0 === data.count) {
         this.activeEmission = false;
       }

package/src/components/display/filter/RubriqueFilter.vue

@@ -209,7 +209,7 @@ export default defineComponent({
         this.arrayFilter.length = 0;
       }
       if (!this.organisation) return;
-      const data = await octopusApi.fetchTopics(this.organisation, undefined);
+      const data = await octopusApi.fetchDataWithParams<Array<Rubriquage>>(0, 'rubriquage/find/'+this.organisation,{}, true);
       this.rubriquageData = data.filter((element: Rubriquage)=>{
         return element.rubriques.length;
       });

package/src/components/display/live/LiveHorizontalList.vue

@@ -99,13 +99,13 @@ export default defineComponent({
       if (reset) {
         this.notEmpty = false;
       }
-      const param = {
+      const data = await octopusApi.fetchDataWithParams<{count: number;result:Array<Podcast>;sort: string;}>(0, 'podcast/search',{
         first: this.dfirst,
         size: this.dsize,
         emissionId: this.emissionId,
         sort: 'DATE',
-      };
-      const data = await octopusApi.fetchLives(param);
+        includeStatus:'READY_TO_RECORD'
+      }, true);
       this.afterFetching(reset, data);
     },
     afterFetching(reset: boolean, data: {count: number, result: Array<Podcast>, sort: string}): void {

package/src/components/display/live/LiveItem.vue

@@ -126,7 +126,7 @@
 import { state } from '../../../store/paramStore';
 import octopusApi from '@saooti/octopus-api';
 import PodcastImage from '../podcasts/PodcastImage.vue';
-import studioApi from '@/api/studio';
+import crudApi from '@/api/classicCrud';
 import moment from 'moment';
 // @ts-ignore
 import humanizeDuration from 'humanize-duration';
@@ -233,16 +233,11 @@ export default defineComponent({
     async fetchPodcastData(): Promise<void> {
       if (!this.fetchConference || !this.fetchConference.podcastId) return;
       try {
-        this.live = await octopusApi.fetchPodcast(
-          this.fetchConference.podcastId.toString()
-        );
+        this.live = await octopusApi.fetchData<Podcast>(0, 'podcast/'+this.fetchConference.podcastId);
       } catch {
         this.$emit('deleteItem', this.index);
         if(this.fetchConference.conferenceId){
-          studioApi.deleteConference(
-            this.$store.state,
-            this.fetchConference.conferenceId.toString()
-          );
+          await crudApi.deleteData(this.$store.state, 9 ,'conference/'+this.fetchConference.conferenceId);
         }
       }
     },

package/src/components/display/live/LiveList.vue

@@ -110,9 +110,7 @@ export default defineComponent({
   watch: {
     async organisationId(): Promise<void> {
       if(!this.organisationId){return;}
-      const isLive = await octopusApi.liveEnabledOrganisation(
-        this.organisationId
-      );
+      const isLive = await octopusApi.fetchData<boolean>(0, 'organisation/liveEnabled/'+this.organisationId);
       if (isLive) {
         if(!this.loading){
           this.fetchContent();
@@ -140,9 +138,7 @@ export default defineComponent({
     if(!this.filterOrgaUsed){
       return;
     }
-    const isLive = await octopusApi.liveEnabledOrganisation(
-      this.filterOrgaUsed
-    );
+    const isLive = await octopusApi.fetchData<boolean>(0, 'organisation/liveEnabled/'+this.filterOrgaUsed);
     if (isLive) {
       this.fetchContent();
     } else {
@@ -173,11 +169,11 @@ export default defineComponent({
           ("DEBRIEFING"===this.livesArray[i].status ||"ERROR"===this.livesArray[i].status ||"PUBLISHING"===this.livesArray[i].status)) {
             continue;
           }
-          const dataLives = await octopusApi.listConferences(
-            this.filterOrgaUsed,
-            true,
-            this.livesArray[i].status
-          );
+          const dataLives = await octopusApi.fetchDataWithParams<Array<Conference>>(9, 'conference/list',{
+            organisationId: this.filterOrgaUsed,
+            withPodcastId: true,
+            status: this.livesArray[i].status,
+          });
           if("PLANNED"!==this.livesArray[i].status && "PENDING"!==this.livesArray[i].status){
             this.livesArray[i].lives = dataLives.filter((p: Conference | null) => {
               return null !== p;

package/src/components/display/organisation/OrganisationChooser.vue

@@ -189,7 +189,7 @@ export default defineComponent({
       this.authenticated &&
       undefined === this.$store.state.organisation.imageUrl
     ) {
-      const data = await octopusApi.fetchOrganisation(this.myOrganisationId ?this.myOrganisationId:"");
+      const data = await octopusApi.fetchData<Organisation>(0,`organisation/${this.myOrganisationId ?this.myOrganisationId:""}`);
       this.myImage = data.imageUrl;
     }
     if (this.value) {
@@ -209,7 +209,7 @@ export default defineComponent({
     },
     async onSearchOrganisation(query?: string): Promise<void> {
       this.isLoading = true;
-      const response = await octopusApi.fetchOrganisations({
+      const response = await octopusApi.fetchDataWithParams<{count: number;result: Array<Organisation>;sort: string;}>(0, 'organisation/search',{
         query: query,
         first: 0,
         size: ELEMENTS_COUNT,
@@ -249,7 +249,7 @@ export default defineComponent({
         this.onSearchOrganisation();
       }
       if(!this.value){return;}
-      const data = await octopusApi.fetchOrganisation(this.value);
+      const data = await octopusApi.fetchData<Organisation>(0,`organisation/${this.value}`);
       this.organisation = data;
       this.init = true;
     },

package/src/components/display/organisation/OrganisationChooserLight.vue

@@ -73,7 +73,7 @@ export default defineComponent({
     },
     async fetchOrganisation(): Promise<void> {
       if(!this.value){return;}
-      const data = await octopusApi.fetchOrganisation(this.value);
+      const data = await octopusApi.fetchData<Organisation>(0,`organisation/${this.value}`);
       this.organisation = data;
       this.actual = data.id;
       this.init = true;

package/src/components/display/participant/ParticipantItem.vue

@@ -58,6 +58,7 @@ import { state } from '../../../store/paramStore';
 import { displayMethods } from '../../mixins/functions';
 import { orgaComputed } from '../../mixins/orgaComputed';
 import { defineComponent } from 'vue'
+import { Podcast } from '@/store/class/general/podcast';
 export default defineComponent({
   name: 'ParticpantItem',
   mixins: [displayMethods, orgaComputed],
@@ -107,11 +108,11 @@ export default defineComponent({
   },
   methods: {
     async hasPodcast(): Promise<void> {
-      const data = await octopusApi.fetchPodcasts({
+      const data =  await octopusApi.fetchDataWithParams<{count: number;result:Array<Podcast>;sort: string;}>(0, 'podcast/search',{
         participantId: this.participant.participantId,
         first: 0,
         size: 0,
-      });
+      }, true);
       if (0 === data.count) {
         this.activeParticipant = false;
       }

package/src/components/display/participant/ParticipantList.vue

@@ -108,12 +108,12 @@ export default defineComponent({
     async fetchContent(reset: boolean): Promise<void> {
       this.loading = true;
       try {
-        const data = await octopusApi.fetchParticipants({
+        const data = await octopusApi.fetchDataWithParams<{count: number;result:Array<Participant>;sort: string;}>(0, 'participant/search',{
           first: this.dfirst,
           size: this.dsize,
           query: this.query,
           organisationId: this.organisation,
-        });
+        }, true);
         if (reset) {
           this.participants.length = 0;
         }

package/src/components/display/playlist/PlaylistList.vue

@@ -118,7 +118,7 @@ export default defineComponent({
         sort: this.sort,
       };
       try {
-        const data = await octopusApi.fetchPlaylists(param);
+        const data = await octopusApi.fetchDataWithParams<{count: number;result:Array<Playlist>;sort: string;}>(0, 'playlist/search',param, true);
         this.afterFetching(reset, data);
       } catch (error) {
         this.handle403((error as AxiosError));

package/src/components/display/playlist/PodcastList.vue

@@ -126,9 +126,7 @@ export default defineComponent({
         this.podcasts.length = 0;
         this.loading = true;
         try {
-          const content = await octopusApi.fetchPlaylistContent(
-            this.playlist.playlistId.toString()
-          );
+          const content = await octopusApi.fetchData<Array<Podcast>>(0, 'playlist/'+this.playlist.playlistId+'/content');
           for (let index = 0, len = content.length; index < len; index++) {
             content[index].order = this.playlist.podcasts[content[index].podcastId];
           }

package/src/components/display/playlist/PodcastPlaylistInlineList.vue

@@ -148,10 +148,8 @@ export default defineComponent({
     async fetchContent(): Promise<void> {
       this.allPodcasts.length = 0;
       this.loading = true;
-      this.playlist = await octopusApi.fetchPlaylist(this.playlistId ? this.playlistId.toString(): "");
-      this.allPodcasts = await octopusApi.fetchPlaylistContent(
-        this.playlist.playlistId.toString()
-      );
+      this.playlist = await octopusApi.fetchData<Playlist>(0, 'playlist/'+this.playlistId);
+      this.allPodcasts = await octopusApi.fetchData<Array<Podcast>>(0, 'playlist/'+this.playlistId+'/content');
       if (!((state.generalParameters.authenticated && state.generalParameters.organisationId === this.playlist.organisation.id) ||
         state.generalParameters.isAdmin)) {
         this.allPodcasts = this.allPodcasts.filter((p: Podcast|null) => {

package/src/components/display/podcasts/PodcastInlineListClassic.vue

@@ -155,8 +155,8 @@ export default defineComponent({
   },
   methods: {
     async fetchNext(): Promise<void> {
-      const data = await octopusApi.fetchPodcasts({
-        first: this.first,
+      const data =  await octopusApi.fetchDataWithParams<{count: number;result:Array<Podcast>;sort: string;}>(0, 'podcast/search',{
+         first: this.first,
         size: this.size + 1,
         organisationId: this.organisation,
         emissionId: this.emissionId,
@@ -166,7 +166,7 @@ export default defineComponent({
         noRubriquageId: this.noRubriquageId.length ? this.noRubriquageId : undefined,
         sort: this.popularSort ? 'POPULARITY' : 'DATE',
         query: this.query,
-      });
+      }, true);
       this.loading = false;
       this.loaded = true;
       this.totalCount = data.count;

package/src/components/display/podcasts/PodcastList.vue

@@ -164,7 +164,7 @@ export default defineComponent({
         param.publisherId = this.$store.state.profile.userId;
       }
       try {
-        const data = await octopusApi.fetchPodcasts(param);
+        const data =await octopusApi.fetchDataWithParams<{count: number;result:Array<Podcast>;sort: string;}>(0, 'podcast/search',param, true);
         this.afterFetching(reset, data);
       } catch (error) {
         this.handle403((error as AxiosError));

package/src/components/display/podcasts/PodcastSwiperList.vue

@@ -139,7 +139,7 @@ export default defineComponent({
       this.numberItem = Math.floor(width / sixteen);
     },
     async fetchNext(): Promise<void> {
-      const data = await octopusApi.fetchPodcasts({
+      const data = await octopusApi.fetchDataWithParams<{count: number;result:Array<Podcast>;sort: string;}>(0, 'podcast/search',{
         first: 0,
         size: 10,
         organisationId: this.organisation,
@@ -150,7 +150,7 @@ export default defineComponent({
         noRubriquageId: this.noRubriquageId.length ? this.noRubriquageId : undefined,
         sort: this.popularSort ? 'POPULARITY' : 'DATE',
         query: this.query,
-      });
+      }, true);
       this.allPodcasts = this.allPodcasts.concat(
         data.result.filter((pod: Podcast|null) => null !== pod)
       );

package/src/components/display/sharing/QrCode.vue

@@ -85,9 +85,7 @@ export default defineComponent({
       if(this.$store.state.organisation && this.$store.state.organisation.attributes && Object.keys(this.$store.state.organisation.attributes).length > 1){
         data = this.$store.state.organisation.attributes;
       }else{
-        data= await octopusApi.fetchOrganisationAttributes(
-          state.generalParameters.organisationId ? state.generalParameters.organisationId : ""
-        );
+        data= await octopusApi.fetchData<{[key:string]:string}>(0, 'organisation/attributes/'+state.generalParameters.organisationId);
       }
       if (Object.prototype.hasOwnProperty.call(data,'COLOR')) {
         this.otherColor = data.COLOR;

package/src/components/display/sharing/ShareButtonsIntern.vue

@@ -187,7 +187,7 @@ export default defineComponent({
   },
   async created(){
     if(this.organisationId){
-      this.displayRss = await octopusApi.fetchDataPublic<boolean>(`rss/participants/allowed/${this.organisationId}`);
+      this.displayRss = await octopusApi.fetchDataPublic<boolean>(0,`rss/participants/allowed/${this.organisationId}`);
     }else{
       this.displayRss = true;
     }

package/src/components/display/sharing/ShareDistribution.vue

@@ -124,6 +124,7 @@
 </template>
 
 <script lang="ts">
+import { state } from '../../../store/paramStore';
 import octopusApi from '@saooti/octopus-api';
 import Snackbar from '../../misc/Snackbar.vue';
 import { displayMethods } from '../../mixins/functions';
@@ -156,11 +157,11 @@ export default defineComponent({
 
   methods: {
     async getEmissionDetails(): Promise<void> {
-      this.emission = await octopusApi.fetchEmission(this.emissionId);
+      this.emission = await octopusApi.fetchData<Emission>(0,'emission/'+this.emissionId);
     },
     getRSS(): void {
       if (!this.$props.emissionId || this.$props.emissionId <= 0) return;
-      this.rss = octopusApi.fetchRSS(this.emissionId) + '.rss';
+      this.rss = `${state.octopusApi.url}rss/emission/${this.emissionId}.rss`;
     },
     afterCopy(): void{
       (this.$refs.snackbar as InstanceType<typeof SnackbarVue>).open(this.$t('Link in clipboard'));

package/src/components/display/sharing/SharePlayer.vue

@@ -271,7 +271,7 @@ export default defineComponent({
       if(this.$store.state.organisation && this.$store.state.organisation.attributes && Object.keys(this.$store.state.organisation.attributes).length > 1){
         data = this.$store.state.organisation.attributes;
       }else{
-        data= await octopusApi.fetchOrganisationAttributes(this.myOrganisationId||'');
+        data= await octopusApi.fetchData<{[key:string]:string}>(0, 'organisation/attributes/'+this.myOrganisationId);
       }
       this.color = Object.prototype.hasOwnProperty.call(data,'COLOR') ? data.COLOR : '#40a372';
       this.theme = Object.prototype.hasOwnProperty.call(data,'THEME') ? data.THEME : '#000000';

package/src/components/display/sharing/SharePlayerTypes.vue

@@ -40,6 +40,7 @@ import { CustomPlayer } from '@/store/class/general/customPlayer';
 import { defineComponent } from 'vue';
 import { Emission } from '@/store/class/general/emission';
 import { Playlist } from '@/store/class/general/playlist';
+import { InterfacePageable } from '@/store/class/general/interfacePageable';
 export default defineComponent({
   props: {
     podcast: { default: undefined, type: Object as ()=> Podcast},
@@ -77,12 +78,12 @@ export default defineComponent({
   },
   methods: {
     async fetchCustomPlayers(type:string, trySelect: boolean): Promise<boolean>{
-      let players = await octopusApi.fetchCustomPlayer('customPlayer/type/'+ this.organisationId+'/'+type);
+      let players = await octopusApi.fetchDataPublic<InterfacePageable<CustomPlayer>>(6,'customPlayer/type/'+ this.organisationId+'/'+type);
       let playersContent = players.content;
       const totalCount = players.totalElements;
       let index = 1;
       while (totalCount > playersContent.length) {
-        players =  await octopusApi.fetchCustomPlayer('customPlayer/type/'+ this.organisationId+'/'+type+'?start='+index);
+        players =  await octopusApi.fetchDataPublic<InterfacePageable<CustomPlayer>>(6,'customPlayer/type/'+ this.organisationId+'/'+type+'?start='+index);
         playersContent = playersContent.concat(players.content);
         ++index;
       }

package/src/components/misc/Footer.vue

@@ -169,7 +169,7 @@ export default defineComponent({
       this.setCookie('octopus-language', this.language);
       loadLocaleMessages(this.$i18n, this.language, this.$store.state.general.isEducation);
       moment.locale(this.$i18n.locale);
-      octopusApi.fetchCategories({ lang: this.$i18n.locale }).then((data: Array<Category>) => {
+      octopusApi.fetchDataWithParams<Array<Category>>(0, `iab/list${state.octopusApi.organisationId? '/'+state.octopusApi.organisationId : ''}`, { lang: this.$i18n.locale }).then((data: Array<Category>) => {
         this.$store.commit('categoriesSet', data);
         if(this.$store.state.filter.iab){
           const category = this.$store.state.categories.filter((c: Category) => {

package/src/components/mixins/init.ts

@@ -9,7 +9,7 @@ export const initSDK = defineComponent({
   methods: {
     async initSdk() {
       if (0 === (state.generalParameters.allCategories as Array<Category>).length) {
-        octopusApi.fetchCategories({ lang: this.$i18n.locale }).then((data: Array<Category>) => {
+        octopusApi.fetchDataWithParams<Array<Category>>(0, `iab/list${state.octopusApi.organisationId? '/'+state.octopusApi.organisationId : ''}`, { lang: this.$i18n.locale }).then((data: Array<Category>) => {
           this.$store.commit('categoriesSet', data);
         });
       }else{

package/src/components/mixins/organisationFilter.ts

@@ -4,17 +4,18 @@ import { Rubriquage } from "@/store/class/rubrique/rubriquage";
 import octopusApi from '@saooti/octopus-api';
 import { defineComponent } from 'vue'
 import { AxiosError } from 'axios';
+import { Organisation } from '@/store/class/general/organisation';
 export const orgaFilter = defineComponent({
   mixins: [handle403],
   methods: {
     async selectOrganisation(organisationId: string): Promise<void> {
       try {
-        const response = await octopusApi.fetchOrganisation(organisationId);
-        const data = await octopusApi.fetchTopics(organisationId, {
+        const response = await octopusApi.fetchData<Organisation>(0,`organisation/${organisationId}`);
+        const data = await octopusApi.fetchDataWithParams<Array<Rubriquage>>(0, 'rubriquage/find/'+organisationId,{
           sort:'HOMEPAGEORDER',
           homePageOrder: true
-        });
-        const isLive = await octopusApi.liveEnabledOrganisation(organisationId);
+        }, true);
+        const isLive = await octopusApi.fetchData<boolean>(0, 'organisation/liveEnabled/'+organisationId);
         this.$store.commit('filterOrga', {
           orgaId: organisationId,
           imgUrl: response.imageUrl,

package/src/components/mixins/player/playerComment.ts

@@ -6,6 +6,7 @@ import { CommentPodcast } from '@/store/class/general/comment';
 import { StoreState } from '@/store/typeAppStore';
 import { defineComponent } from 'vue';
 import { FetchParam } from '@/store/class/general/fetchParam';
+import { InterfacePageable } from '@/store/class/general/interfacePageable';
 export const playerComment = defineComponent({
   data() {
     return {
@@ -85,7 +86,7 @@ export const playerComment = defineComponent({
         if (!this.editRight(organisation? organisation : '')) {
           param.status = ['Valid'];
         }
-        const data = await octopusApi.fetchRootComments(param);
+        const data = await octopusApi.postDataPublic<InterfacePageable<CommentPodcast>>(2, 'getRootCom',param);
         first += size;
         count = data.totalElements;
         this.comments = this.comments.concat(data.content).filter((c: CommentPodcast) => {

package/src/components/mixins/player/playerLive.ts

@@ -68,15 +68,12 @@ export const playerLive = defineComponent({
           if(!this.live){ return; }
           let downloadId = null;
           try {
-            downloadId = await octopusApi.requestLiveDownloadId(
-              this.live.livePodcastId
-            );
-            await octopusApi.markPlayingLive(
-              this.live.livePodcastId,
-              downloadId,
-              'octopus',
-              this.$store.state.authentication.organisationId
-            );
+            downloadId = await octopusApi.putDataPublic<string | null>(0, 'podcast/prepare/live/'+this.live.livePodcastId, undefined);
+            await octopusApi.fetchDataPublicWithParams<string | null>(0,'podcast/download/live/' + this.live.livePodcastId+".m3u8",{
+              'downloadId': null!==downloadId ? downloadId : undefined,
+              'origin':'octopus',
+              'distributorId':this.$store.state.authentication.organisationId
+            });
             this.setDownloadId(downloadId);
           } catch (error) {
             console.log('ERROR downloadId');
@@ -101,10 +98,7 @@ export const playerLive = defineComponent({
     async endListeningProgress(): Promise<void> {
       if (!this.downloadId) return;
       try {
-        await octopusApi.updatePlayerTime(
-          this.downloadId,
-          Math.round(this.listenTime)
-        );
+        await octopusApi.putDataPublic(0, 'podcast/listen/' + this.downloadId + '?seconds=' +  Math.round(this.listenTime), undefined);
       } catch{
         //Do nothing
       }

package/src/components/mixins/player/playerLogic.ts

@@ -51,7 +51,7 @@ export const playerLogic = defineComponent({
         this.audioUrlToPlay = this.audioUrl;
       }
       if(!this.podcast){return;}
-      const response = await octopusApi.fetchPodcastDownloadUrl("podcast/download/register/"+ this.audioUrl);
+      const response = await octopusApi.fetchDataPublic<{location:string, downloadId: number}>(0,"podcast/download/register/"+ this.audioUrl);
       this.setDownloadId(response.downloadId.toString());
       this.audioUrlToPlay = response.location;
     },
@@ -74,10 +74,7 @@ export const playerLogic = defineComponent({
         return;
       }
       this.lastSend = newVal;
-      await octopusApi.updatePlayerTime(
-        this.downloadId,
-        Math.round(newVal)
-      );
+      await octopusApi.putDataPublic(0, 'podcast/listen/' + this.downloadId + '?seconds=' +  Math.round(newVal), undefined);
     },
     playerSeekTime(){
       if(!this.playerSeekTime){return;}

package/src/components/pages/Emission.vue

@@ -214,7 +214,7 @@ export default defineComponent({
       this.loaded = false;
       this.error = false;
       try {
-        const data: Emission = await octopusApi.fetchEmission(this.emissionId);
+        const data: Emission = await octopusApi.fetchData<Emission>(0,'emission/'+this.emissionId);
         this.emission = data;
         if("PUBLIC"!==this.emission.orga.privacy && this.filterOrga!==this.emission.orga.id){
           this.initError();

package/src/components/pages/Participant.vue

@@ -157,7 +157,7 @@ export default defineComponent({
     async getParticipantDetails(): Promise<void> {
       this.loaded = false;
       try {
-        const data = await octopusApi.fetchParticipant(this.participantId ? this.participantId.toString(): "");
+        const data = await octopusApi.fetchData<Participant>(0, 'participant/'+this.participantId);
         if(data && data.orga && "PUBLIC"!==data.orga.privacy && this.filterOrga!==data.orga.id){
           this.initError();
           return;

package/src/components/pages/Playlist.vue

@@ -130,7 +130,7 @@ export default defineComponent({
       try {
         this.loaded = false;
         this.error = false;
-        const data: Playlist = await octopusApi.fetchPlaylist(this.playlistId ? this.playlistId.toString(): "");
+        const data: Playlist = await octopusApi.fetchData<Playlist>(0, 'playlist/'+this.playlistId);
         this.playlist = data;
         if("PUBLIC"!==this.playlist.organisation?.privacy && this.filterOrga!==this.playlist.organisation?.id){
           this.initError();

package/src/components/pages/Podcast.vue

@@ -93,7 +93,7 @@ import PodcastInlineList from '../display/podcasts/PodcastInlineList.vue';
 import PodcastModuleBox from '../display/podcasts/PodcastModuleBox.vue';
 import ClassicLoading from '../form/ClassicLoading.vue';
 import octopusApi from '@saooti/octopus-api';
-import studioApi from '@/api/studio';
+import crudApi from '@/api/classicCrud';
 import { state } from '../../store/paramStore';
 import moment from 'moment';
 import { Podcast } from '@/store/class/general/podcast';
@@ -269,10 +269,10 @@ export default defineComponent({
     async initConference(){
       if (!this.podcast || !this.isLiveReadyToRecord) return;
       if (this.isOctopusAndAnimator && undefined!==this.podcast.conferenceId) {
-        const data = await studioApi.getConference(this.$store.state,this.podcast.conferenceId.toString());
+        const data = await crudApi.fetchData<Conference>(this.$store.state,9,'conference/'+this.podcast.conferenceId);
         this.fetchConference = data ? data : {conferenceId:-1, title:''};
       } else if(undefined!==this.podcast.conferenceId){
-        const data = await octopusApi.getRealConferenceStatus(this.podcast.conferenceId.toString());
+        const data = await octopusApi.fetchData<string>(9, 'conference/realstatus/'+this.podcast.conferenceId);
         this.fetchConference = {
           status: data,
           conferenceId: this.podcast.conferenceId,
@@ -323,7 +323,7 @@ export default defineComponent({
       this.loaded = false;
       this.error = false;
       try {
-        const data : Podcast = await octopusApi.fetchPodcast(this.podcastId.toString());
+        const data : Podcast = await octopusApi.fetchData<Podcast>(0, 'podcast/'+this.podcastId); 
         if("PUBLIC"!==data.organisation.privacy && this.filterOrga!==data.organisation.id){
           this.initError();
           return;

package/src/components/pages/Rubrique.vue

@@ -13,6 +13,7 @@
 import octopusApi from '@saooti/octopus-api';
 import PodcastList from '../display/podcasts/PodcastList.vue';
 import { defineComponent } from 'vue'
+import { Rubrique } from '@/store/class/rubrique/rubrique';
 export default defineComponent({
   name:"Rubrique",
   components: {
@@ -32,7 +33,7 @@ export default defineComponent({
     rubriqueId: {
       immediate: true,
       async handler() {
-        const data = await octopusApi.fetchRubric(this.rubriqueId);
+        const data = await octopusApi.fetchData<Rubrique>(0, 'rubrique/'+this.rubriqueId); 
         this.title = data.name;
       },
     },

package/src/store/class/general/fetchParam.ts

@@ -1,33 +1,3 @@
-export interface FetchParam{
-    first?: number,
-    size?: number,
-    organisationId?: string,
-    emissionId?: number,
-    podcastId?:number,
-    iabId?: number,
-    participantId?: number,
-    query?: string,
-    monetisable?: string,
-    sort?: string,
-    before?: string,
-    after?: string,
-    noRubriquageId?: Array<number>,
-    rubriqueId?:Array<number>,
-    rubriquageId?: Array<number>|number,
-    status?:Array<string>,
-    distributedBy?: string,
-    includeHidden?:boolean,
-    validity?:boolean,
-    publisherId?: string,
-    lang?:string,
-    start?:string,
-    end?:string,
-    interval?: string,
-    tzId?: string,
-    role?: string,
-    includeNotValid?: boolean,
-    type?: string,
-    listening?: string,
-    top?: number,
-    homePageOrder?:boolean,
-  }
+export interface FetchParam {
+  [key: string]: string | number | undefined | Array<number>| Array<string>| boolean;
+}

package/src/store/class/general/interfacePageable.ts

@@ -0,0 +1,16 @@
+import { Pageable } from "./pageable";
+import { SortPageable } from "./sortPageable";
+
+export interface InterfacePageable<T>{
+    content: Array<T>;
+    empty: boolean;
+    first: boolean;
+    last: boolean;
+    number: number;
+    numberOfElements: number;
+    pageable: Pageable;
+    size: number;
+    sort: SortPageable;
+    totalElements: number;
+    totalPages: number;
+}

package/src/api/comments.ts

@@ -1,12 +0,0 @@
-import { CommentPodcast } from "@/store/class/general/comment";
-import { StoreState } from "@/store/typeAppStore";
-
-import octopusApi from '@saooti/octopus-api';
-/* eslint-disable */
-export default {
-  postComment(store: StoreState, parameters: CommentPodcast): void {
-    console.log(store);
-    octopusApi.postComment(parameters);
-  },
-};
-/* eslint-enable */

package/src/api/studio.ts

@@ -1,13 +0,0 @@
-import { StoreState } from "@/store/typeAppStore";
-/* eslint-disable */
-export default{
-    deleteConference(store?: StoreState,fetchConference?: string): any{
-        console.log(store, fetchConference);
-        return;
-    },
-    getConference(store?: StoreState,fetchConference?: string): any{
-        console.log(store, fetchConference);
-        return {};
-    },
-};
-/* eslint-enable */