Remove old iphone method. Heinekingmedia took it offline.

Author: TheNoim

Diff for: .gitignore

@@ -59,4 +59,6 @@ _test.js
 
 docs/
 
-dist/
+dist/
+
+.env

Diff for: package.json

@@ -8,6 +8,7 @@
 	"devDependencies": {
 		"babel-register": "^6.26.0",
 		"chai": "^4.1.2",
+		"dotenv": "^8.1.0",
 		"esdoc": "^1.1.0",
 		"esdoc-external-ecmascript-plugin": "^1.0.0",
 		"esdoc-external-nodejs-plugin": "^1.0.0",

Diff for: src/index.js

@@ -40,13 +40,7 @@ export default class DSB {
 			login: 'https://mobile.dsbcontrol.de/dsbmobilepage.aspx',
 			main: 'https://www.dsbmobile.de/',
 			Data: 'http://www.dsbmobile.de/JsonHandlerWeb.ashx/GetData',
-			default: 'https://www.dsbmobile.de/default.aspx',
-			loginV1: `https://iphone.dsbcontrol.de/iPhoneService.svc/DSB/authid/${
-				this.username
-			}/${this.password}`,
-			timetables:
-				'https://iphone.dsbcontrol.de/iPhoneService.svc/DSB/timetables/',
-			news: 'https://iphone.dsbcontrol.de/iPhoneService.svc/DSB/news/'
+			default: 'https://www.dsbmobile.de/default.aspx'
 		};
 		/**
 		 * @private
@@ -121,49 +115,6 @@ export default class DSB {
 		return decoded;
 	}
 
-	/**
-	 * Fetch data from the original iphone api (Only news and timetables supported)
-	 * @param {ProgressCallback} [progress]
-	 * @returns {Promise.<Object>}
-	 */
-	async fetchV1(progress = () => {}) {
-		let currentProgress = 0;
-		const loginV1Response = await this.axios({
-			method: 'GET',
-			url: this.urls.loginV1
-		});
-		if (loginV1Response.data === '00000000-0000-0000-0000-000000000000')
-			throw new Error('Login failed.');
-		const id = loginV1Response.data;
-		currentProgress++;
-		progress(percentage.from(currentProgress, 5));
-		const data = await Promise.all([
-			this.axios(this.urls.timetables + id).then(response => {
-				currentProgress++;
-				progress(percentage.from(currentProgress, 5));
-				return Promise.resolve({ timetables: response.data });
-			}),
-			this.axios(this.urls.news + id).then(response => {
-				currentProgress++;
-				progress(percentage.from(currentProgress, 5));
-				return Promise.resolve({ news: response.data });
-			})
-		]);
-		currentProgress++;
-		progress(percentage.from(currentProgress, 5));
-		let newData = {};
-		for (let fragment of data) {
-			for (let key in fragment) {
-				if (fragment.hasOwnProperty(key)) {
-					newData[key] = fragment[key];
-				}
-			}
-		}
-		currentProgress++;
-		progress(percentage.from(currentProgress, 5));
-		return newData;
-	}
-
 	/**
 	 * Login with username and password
 	 * @param {String|Number} [username=this.username]

Diff for: test/test.js

@@ -3,6 +3,9 @@ const chai = require('chai');
 const expect = chai.expect;
 const assert = chai.assert;
 
+// Load .env for testing purpose
+require('dotenv').config();
+
 chai.should();
 
 describe('Library', function() {
@@ -35,11 +38,6 @@ describe('DSB Instance', function() {
 		assert.isDefined(dsb.fetch);
 		assert.isFunction(dsb.fetch);
 	});
-
-	it('should have fetchV1()', function() {
-		assert.isDefined(dsb.fetchV1);
-		assert.isFunction(dsb.fetchV1);
-	});
 });
 
 describe('functions', function() {
@@ -95,36 +93,4 @@ describe('functions', function() {
 				'Method timetable, tiles and news are all not an object.'
 			);
 	});
-});
-
-describe('functions v1', function() {
-	const DSB = require('../dist/index');
-	const dsb = new DSB(process.env.DSBUSERNAME, process.env.PASSWORD);
-
-	it('should not throw', function(done) {
-		dsb.fetchV1()
-			.then(() => {
-				done();
-			})
-			.catch(e => {
-				done(e);
-			});
-	});
-
-	it('should return an object', async function() {
-		const data = await dsb.fetchV1();
-		assert.isObject(data);
-	});
-
-	it('should be at least one an array', async function() {
-		const data = await dsb.fetchV1();
-		if (
-			!(
-				Array.isArray(data.timetables) ||
-				Array.isArray(data.tiles) ||
-				Array.isArray(data.news)
-			)
-		)
-			throw new Error('timetables, tiles and news are all not an array.');
-	});
-});
+});