Merge pull request #2579 from iptv-org/tohenk/fix-web.magentatv.de

Update web.magentatv.de.

sites/web.magentatv.de/web.magentatv.de.config.js

@@ -5,7 +5,7 @@ const customParseFormat = require('dayjs/plugin/customParseFormat')
 const { upperCase } = require('lodash')
 
 let X_CSRFTOKEN
-let COOKIE
+let Cookie
 const cookiesToExtract = ['JSESSIONID', 'CSESSIONID', 'CSRFSESSION']
 
 dayjs.extend(utc)
@@ -17,10 +17,9 @@ module.exports = {
   url: 'https://api.prod.sngtv.magentatv.de/EPG/JSON/PlayBillList',
   request: {
     method: 'POST',
-    headers: function () {
+    async headers() {
-      return setHeaders()
+      return await setHeaders()
     },
-
     data({ channel, date }) {
       return {
         count: -1,
@@ -40,8 +39,8 @@ module.exports = {
       }
     }
   },
-  parser: function ({ content }) {
+  parser({ content }) {
-    let programs = []
+    const programs = []
     const items = parseItems(content)
     items.forEach(item => {
       programs.push({
@@ -166,23 +165,13 @@ function parseItems(content) {
 
 async function fetchCookieAndToken() {
   // Only fetch the cookies and csrfToken if they are not already set
-  if (X_CSRFTOKEN && COOKIE) {
+  if (X_CSRFTOKEN && Cookie) {
     return
   }
 
   try {
     const response = await axios.request({
       url: 'https://api.prod.sngtv.magentatv.de/EPG/JSON/Authenticate',
-      headers: {
-        accept: 'application/json, text/javascript, */*; q=0.01',
-        'content-type': 'application/x-www-form-urlencoded; charset=UTF-8',
-        'sec-fetch-dest': 'empty',
-        'sec-fetch-mode': 'cors',
-        'sec-fetch-site': 'same-origin',
-        'x-requested-with': 'XMLHttpRequest',
-        Referer: 'https://web.magentatv.de/',
-        'Referrer-Policy': 'strict-origin-when-cross-origin'
-      },
       params: {
         SID: 'firstup',
         T: 'Windows_chrome_118'
@@ -191,10 +180,9 @@ async function fetchCookieAndToken() {
       data: '{"terminalid":"00:00:00:00:00:00","mac":"00:00:00:00:00:00","terminaltype":"WEBTV","utcEnable":1,"timezone":"Etc/GMT0","userType":3,"terminalvendor":"Unknown"}',
     })
 
-
     // Extract the cookies specified in cookiesToExtract
     const setCookieHeader = response.headers['set-cookie'] || []
-    let extractedCookies = []
+    const extractedCookies = []
     cookiesToExtract.forEach(cookieName => {
       const regex = new RegExp(`${cookieName}=(.+?)(;|$)`)
       const match = setCookieHeader.find(header => regex.test(header))
@@ -205,7 +193,6 @@ async function fetchCookieAndToken() {
       }
     })
 
-
     // check if we recieved a csrfToken only then store the values
     if (!response.data.csrfToken) {
       console.log('csrfToken not found in the response.')
@@ -213,19 +200,15 @@ async function fetchCookieAndToken() {
     }
 
     X_CSRFTOKEN = response.data.csrfToken
-    COOKIE = extractedCookies.join(' ')
+    Cookie = extractedCookies.join(' ')
 
   } catch(error) {
     console.error(error)
   }
 }
 
-function setHeaders() {
+async function setHeaders() {
-  return fetchCookieAndToken().then(() => {
+  await fetchCookieAndToken()
-    return {
+
-      X_CSRFTOKEN: X_CSRFTOKEN,
+  return { X_CSRFTOKEN, Cookie }
-      'Content-Type': 'application/json',
-      Cookie: COOKIE
-    }
-  })
 }

sites/web.magentatv.de/web.magentatv.de.test.js

@@ -1,18 +1,43 @@
 const { parser, url, request } = require('./web.magentatv.de.config.js')
 const fs = require('fs')
 const path = require('path')
+const axios = require('axios')
 const dayjs = require('dayjs')
 const utc = require('dayjs/plugin/utc')
 const customParseFormat = require('dayjs/plugin/customParseFormat')
+
 dayjs.extend(customParseFormat)
 dayjs.extend(utc)
 
+jest.mock('axios')
+
 const date = dayjs.utc('2022-03-09', 'YYYY-MM-DD').startOf('d')
 const channel = {
   site_id: '255',
   xmltv_id: '13thStreet.de'
 }
 
+axios.request.mockImplementation(req => {
+  const result = {}
+  if (req.url === 'https://api.prod.sngtv.magentatv.de/EPG/JSON/Authenticate') {
+    Object.assign(result, {
+      headers: {
+        'set-cookie': [
+          'JSESSIONID=2147EBA9C59BCDC33822CFD2764E5C0B; Path=/EPG; HttpOnly; SameSite=None; Secure',
+          'JSESSIONID=2147EBA9C59BCDC33822CFD2764E5C0B; Path=/EPG/; HttpOnly; SameSite=None; Secure',
+          'CSESSIONID=1CF187ABCA12ED1B01ADF84C691048ED; Path=/EPG/; Secure; HttpOnly; SameSite=None',
+          'CSRFSESSION=ea2329ba213271192bffd77c2fa276086a8e828c1a4ee379; Path=/EPG/; SameSite=None; Secure'
+        ] 
+      },
+      data: {
+        csrfToken: '6f678415702493d2c28813747c413aa05c87d8f87ecf05fe'
+      }
+    })
+  }
+
+  return Promise.resolve(result)
+})
+
 it('can generate valid url', () => {
   expect(url).toBe('https://api.prod.sngtv.magentatv.de/EPG/JSON/PlayBillList')
 })
@@ -30,7 +55,6 @@ it('can generate valid request headers', async () => {
   expect(headers.Cookie).toMatch(/JSESSIONID=[\dA-F]+;/i)
   expect(headers.Cookie).toMatch(/CSESSIONID=[\dA-F]+;/i)
   expect(headers.Cookie).toMatch(/CSRFSESSION=[\dA-F]+;/i)
-  expect(headers.Cookie).toMatch(/JSESSIONID=[\dA-F]+;/i)
   expect(headers.X_CSRFTOKEN).toMatch(/[\dA-F]/i)
 })