mirror of
https://github.com/KRTirtho/spotube.git
synced 2025-09-13 07:55:18 +00:00
fix: spotify login broken due to new totp requirement #2494
This commit is contained in:
parent
bbe3394e9e
commit
59f298a935
@ -1,4 +1,5 @@
|
|||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
|
import 'dart:convert';
|
||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:collection/collection.dart';
|
import 'package:collection/collection.dart';
|
||||||
@ -15,6 +16,9 @@ import 'package:spotube/extensions/context.dart';
|
|||||||
import 'package:spotube/models/database/database.dart';
|
import 'package:spotube/models/database/database.dart';
|
||||||
import 'package:spotube/provider/database/database.dart';
|
import 'package:spotube/provider/database/database.dart';
|
||||||
import 'package:spotube/utils/platform.dart';
|
import 'package:spotube/utils/platform.dart';
|
||||||
|
import 'package:otp_util/otp_util.dart';
|
||||||
|
// ignore: implementation_imports
|
||||||
|
import 'package:otp_util/src/utils/generic_util.dart';
|
||||||
|
|
||||||
extension ExpirationAuthenticationTableData on AuthenticationTableData {
|
extension ExpirationAuthenticationTableData on AuthenticationTableData {
|
||||||
bool get isExpired => DateTime.now().isAfter(expiration);
|
bool get isExpired => DateTime.now().isAfter(expiration);
|
||||||
@ -100,6 +104,83 @@ class AuthenticationNotifier extends AsyncNotifier<AuthenticationTableData?> {
|
|||||||
.insert(refreshedCredentials, mode: InsertMode.replace);
|
.insert(refreshedCredentials, mode: InsertMode.replace);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String base32FromBytes(Uint8List e, String secretSauce) {
|
||||||
|
var t = 0;
|
||||||
|
var n = 0;
|
||||||
|
var r = "";
|
||||||
|
for (int i = 0; i < e.length; i++) {
|
||||||
|
n = n << 8 | e[i];
|
||||||
|
t += 8;
|
||||||
|
while (t >= 5) {
|
||||||
|
r += secretSauce[n >>> t - 5 & 31];
|
||||||
|
t -= 5;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (t > 0) {
|
||||||
|
r += secretSauce[n << 5 - t & 31];
|
||||||
|
}
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
|
Uint8List cleanBuffer(String e) {
|
||||||
|
e = e.replaceAll(" ", "");
|
||||||
|
final t = List.filled(e.length ~/ 2, 0);
|
||||||
|
final n = Uint8List.fromList(t);
|
||||||
|
for (int r = 0; r < e.length; r += 2) {
|
||||||
|
n[r ~/ 2] = int.parse(e.substring(r, r + 2), radix: 16);
|
||||||
|
}
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<String> generateTotp() async {
|
||||||
|
const secretSauce = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
|
||||||
|
final secretCipherBytes = const [
|
||||||
|
12,
|
||||||
|
56,
|
||||||
|
76,
|
||||||
|
33,
|
||||||
|
88,
|
||||||
|
44,
|
||||||
|
88,
|
||||||
|
33,
|
||||||
|
78,
|
||||||
|
78,
|
||||||
|
11,
|
||||||
|
66,
|
||||||
|
22,
|
||||||
|
22,
|
||||||
|
55,
|
||||||
|
69,
|
||||||
|
54
|
||||||
|
].mapIndexed((t, e) => e ^ t % 33 + 9).toList();
|
||||||
|
|
||||||
|
final secretBytes = cleanBuffer(
|
||||||
|
utf8
|
||||||
|
.encode(secretCipherBytes.join(""))
|
||||||
|
.map((e) => e.toRadixString(16))
|
||||||
|
.join(),
|
||||||
|
);
|
||||||
|
|
||||||
|
final secret = base32FromBytes(secretBytes, secretSauce);
|
||||||
|
|
||||||
|
final res = await dio.get("https://open.spotify.com/server-time");
|
||||||
|
final serverTimeSeconds = res.data["serverTime"] as int;
|
||||||
|
|
||||||
|
final totp = TOTP(
|
||||||
|
secret: secret,
|
||||||
|
algorithm: OTPAlgorithm.SHA1,
|
||||||
|
digits: 6,
|
||||||
|
interval: 30,
|
||||||
|
);
|
||||||
|
|
||||||
|
return totp.generateOTP(
|
||||||
|
input: Util.timeFormat(
|
||||||
|
time: DateTime.fromMillisecondsSinceEpoch(serverTimeSeconds * 1000),
|
||||||
|
interval: 30,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
Future<AuthenticationTableCompanion> credentialsFromCookie(
|
Future<AuthenticationTableCompanion> credentialsFromCookie(
|
||||||
String cookie,
|
String cookie,
|
||||||
) async {
|
) async {
|
||||||
@ -108,10 +189,17 @@ class AuthenticationNotifier extends AsyncNotifier<AuthenticationTableData?> {
|
|||||||
.split("; ")
|
.split("; ")
|
||||||
.firstWhereOrNull((c) => c.trim().startsWith("sp_dc="))
|
.firstWhereOrNull((c) => c.trim().startsWith("sp_dc="))
|
||||||
?.trim();
|
?.trim();
|
||||||
|
|
||||||
|
final totp = await generateTotp();
|
||||||
|
final timestamp = (DateTime.now().millisecondsSinceEpoch / 1000).floor();
|
||||||
|
|
||||||
|
final accessTokenUrl = Uri.parse(
|
||||||
|
"https://open.spotify.com/get_access_token?reason=transport&productType=web_player"
|
||||||
|
"&totp=$totp&totpVer=5&ts=$timestamp",
|
||||||
|
);
|
||||||
|
|
||||||
final res = await dio.getUri(
|
final res = await dio.getUri(
|
||||||
Uri.parse(
|
accessTokenUrl,
|
||||||
"https://open.spotify.com/get_access_token?reason=transport&productType=web_player",
|
|
||||||
),
|
|
||||||
options: Options(
|
options: Options(
|
||||||
headers: {
|
headers: {
|
||||||
"Cookie": spDc ?? "",
|
"Cookie": spDc ?? "",
|
||||||
|
18
pubspec.lock
18
pubspec.lock
@ -166,6 +166,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "3.0.0"
|
version: "3.0.0"
|
||||||
|
base32:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: base32
|
||||||
|
sha256: ddad4ebfedf93d4500818ed8e61443b734ffe7cf8a45c668c9b34ef6adde02e2
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.1.3"
|
||||||
bonsoir:
|
bonsoir:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
@ -440,7 +448,7 @@ packages:
|
|||||||
source: hosted
|
source: hosted
|
||||||
version: "0.3.4+2"
|
version: "0.3.4+2"
|
||||||
crypto:
|
crypto:
|
||||||
dependency: "direct dev"
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: crypto
|
name: crypto
|
||||||
sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
|
sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
|
||||||
@ -1639,6 +1647,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.0.3"
|
version: "0.0.3"
|
||||||
|
otp_util:
|
||||||
|
dependency: "direct main"
|
||||||
|
description:
|
||||||
|
name: otp_util
|
||||||
|
sha256: dd8956c6472bacc3ffabe62c03f8a9782d1e5a5a3f2674420970f549d642b1cf
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "1.0.2"
|
||||||
package_config:
|
package_config:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
@ -140,10 +140,10 @@ dependencies:
|
|||||||
url: https://github.com/KRTirtho/flutter_new_pipe_extractor.git
|
url: https://github.com/KRTirtho/flutter_new_pipe_extractor.git
|
||||||
http_parser: ^4.1.2
|
http_parser: ^4.1.2
|
||||||
collection: any
|
collection: any
|
||||||
|
otp_util: ^1.0.2
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
build_runner: ^2.4.13
|
build_runner: ^2.4.13
|
||||||
crypto: ^3.0.3
|
|
||||||
envied_generator: ^1.0.0
|
envied_generator: ^1.0.0
|
||||||
flutter_gen_runner: ^5.4.0
|
flutter_gen_runner: ^5.4.0
|
||||||
flutter_launcher_icons: ^0.14.2
|
flutter_launcher_icons: ^0.14.2
|
||||||
|
Loading…
Reference in New Issue
Block a user