Implements PKCE Authorization to enable access to HiRess files. #221

exislow · 2024-01-23T08:19:34Z

This is a straight forward user interactions based PKCE authorization implementation, which fixes #188 and #217.

You simply use login_pkce() and follow the instructions.

Feel free to comment and / or merge.

Due to lack of time no tests have been implemented but comments / doc strings are in place.

…#188

tidalapi/session.py

tehkillerbee · 2024-01-23T10:28:13Z

Thanks, will look at this ASAP, need to test with a HiFi enabled account.

exislow · 2024-01-23T11:03:29Z

Thanks, will look at this ASAP, need to test with a HiFi enabled account.

Let me know if you need any help on this.

exislow · 2024-01-25T05:16:13Z

@tehkillerbee: Any updates on this?

jozefKruszynski · 2024-01-23T14:14:48Z

tidalapi/session.py

+        fn_print(url_login)
+
+        # Get redirect URL from user input.
+        url_redirect: str = input("Paste 'Ooops' page URL here and press <ENTER>:")


Is there a way to get this url programmatically rather than require the copy paste?

If not, can we then make other called functions non-private?

Didn't realise that my pending comment needed to actually be set as a review, also, did not necessarily mean to review, rather just leave a comment.
I actually mean to submit this days ago. Apologies for taking so long to realise my mistake

tehkillerbee · 2024-01-26T13:38:52Z

@tehkillerbee: Any updates on this?

Sorry, I have been occupied by other responsibilities. I will take a look at it no later than this weekend.

tehkillerbee · 2024-01-26T15:46:01Z

@exislow I got a chance testing this today with a HiFi enabled account. However, I get requests.exceptions.HTTPError: 401 Client Error: Unauthorized for url .. when I call get_url() on a track, no matter what I do and irrespective of the Quality configured.

exislow · 2024-01-26T17:40:52Z

@exislow I got a chance testing this today with a HiFi enabled account. However, I get requests.exceptions.HTTPError: 401 Client Error: Unauthorized for url .. when I call get_url() on a track, no matter what I do and irrespective of the Quality configured.

Just double checked this. I cannot re-produce it. Whether with a PKCE nor with a OAuth authorized token. Can you please more verbose? I need the full error log and the TIDAL link to the track you are working with. In my case get_url() on a track works as expected!

tehkillerbee · 2024-01-26T17:57:30Z

@exislow I got a chance testing this today with a HiFi enabled account. However, I get requests.exceptions.HTTPError: 401 Client Error: Unauthorized for url .. when I call get_url() on a track, no matter what I do and irrespective of the Quality configured.

Just double checked this. I cannot re-produce it. Whether with a PKCE nor with a OAuth authorized token. Can you please more verbose? I need the full error log and the TIDAL link to the track you are working with. In my case get_url() on a track works as expected!

In the response I get "401 Asset is not ready for playback"

This issue only occurs with PKCE not with normal OAuth.

Which track/album have you tested with? I did try a few, at least one of them should have HiRes

import tidalapi
from tidalapi import Quality

session = tidalapi.Session()
# Will run until you visit the printed url and link your account
session.login_pkce()

# Override the required playback quality, if necessary
# Note: Set the quality according to your subscription.
# Normal: Quality.low_320k
# HiFi: Quality.high_lossless
# HiFi+ Quality.hi_res_lossless
session.audio_quality = Quality.hi_res_lossless.value

album = session.album(110827651) # Let's Rock // The Black Keys
tracks = album.tracks()
# list album tracks
for track in tracks:
    print(track.name)
    print(track.get_url())
    for artist in track.artists:
        print(' by: ', artist.name)

tehkillerbee · 2024-01-26T22:10:39Z

Sorry for closing this PR, that was an accident and I have reopened it. Anyways see my notes below after doing some testing:

@exislow I got a chance testing this today with a HiFi enabled account. However, I get requests.exceptions.HTTPError: 401 Client Error: Unauthorized for url .. when I call get_url() on a track, no matter what I do and irrespective of the Quality configured.

Just double checked this. I cannot re-produce it. Whether with a PKCE nor with a OAuth authorized token. Can you please more verbose? I need the full error log and the TIDAL link to the track you are working with. In my case get_url() on a track works as expected!

When a streaming link is requested, no Auth error is given so that part works fine. But it does NOT work with direct URL on my side, unless I switch back to standard Oauth.

I think this just confirms what we already know from the tidal2 documentation lists, i.e. MPEG-Dash is allowed but normal https is not: https://github.com/arnesongit/plugin.audio.tidal2

exislow · 2024-01-26T22:27:14Z

Sorry for closing this PR, that was an accident and I have reopened it. Anyways see my notes below after doing some testing:

@exislow I got a chance testing this today with a HiFi enabled account. However, I get requests.exceptions.HTTPError: 401 Client Error: Unauthorized for url .. when I call get_url() on a track, no matter what I do and irrespective of the Quality configured.

Just double checked this. I cannot re-produce it. Whether with a PKCE nor with a OAuth authorized token. Can you please more verbose? I need the full error log and the TIDAL link to the track you are working with. In my case get_url() on a track works as expected!

When a streaming link is requested, no Auth error is given so that part works fine. But it does NOT work with direct URL on my side, unless I switch back to standard Oauth.

I think this just confirms what we already know from the tidal2 documentation lists, i.e. MPEG-Dash is allowed but normal https is not: https://github.com/arnesongit/plugin.audio.tidal2

Ohh sorry, I thought this was already clear: HiRes ONLY works with MPEG-DASH. This is why have built an MPEG-DASH parses for https://github.com/exislow/tidal-dl-ng/blob/a348909897b8a4453ec0b8764f564a4970b6e238/tidal_dl_ng/download.py#L390-L451

By the way, this works:

import tidalapi
from tidalapi import Quality

session = tidalapi.Session()
# Will run until you visit the printed url and link your account
session.login_pkce()

# Override the required playback quality, if necessary
# Note: Set the quality according to your subscription.
# Normal: Quality.low_320k
# HiFi: Quality.high_lossless
# HiFi+ Quality.hi_res_lossless
session.audio_quality = Quality.hi_res_lossless

album = session.album(110827651) # Let's Rock // The Black Keys
tracks = album.tracks()
# list album tracks
for track in tracks:
    print(track.name)
    # Only MPEG-DASH works for HiRes
    #print(track.get_url())
    print(track.stream())
    for artist in track.artists:
        print(' by: ', artist.name)

# TOTO - Rosana https://tidal.com/browse/track/542179
media = session.track(542179)
print(media.stream())

tehkillerbee · 2024-01-26T22:35:44Z

Ohh sorry, I thought this was already clear: HiRes ONLY works with MPEG-DASH.

Ok, you mentioned that you managed to download a HiRes FLAC file in an earlier comment so I assumed get_url() was used. And you also mentioned using get_url() successfully in the comments in this PR so I thought I was doing something wrong. But good to know it works as expected with MPEG-DASH.

I noticed tidal2 uses a similar approach to parse the MPEG-DASH stream so it can be passed on to ffmpeg. I'll probably look into implementing something similar, either directly in tidalapi or in the projects relying on it for streaming (mopidy-tidal)

exislow · 2024-01-26T22:38:09Z

Oh I actually never mentioned get_url() nor used it. Sorry for the confusion.

exislow · 2024-01-27T14:32:17Z

How can I help to get this PR accepted and create a new release of tidalapi?

tehkillerbee · 2024-01-27T14:49:59Z

@exislow You'd need to rebase to master, then we can merge it.

Regarding next release, I was planning to add MPEG-DASH parsing as well, similar to how it is done with tidal2.

EDIT: On second thought, I think we'll skip that for now so v0.7.4 can be released immediately after merging this PR, in case you need it right away.

Bumps [pillow](https://github.com/python-pillow/Pillow) from 10.0.1 to 10.2.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](python-pillow/Pillow@10.0.1...10.2.0) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]>

…#188

exislow · 2024-01-27T15:49:43Z

@tehkillerbee: Rebase is done.

Regarding the release: When are you going to implement the MPEG-DASH parser? And why it is not possible to have two releases: One now and another after the parser is implemented? Release don't cost anything, right? Would be happy if you could release this ASAP. A lot of user waiting for HiRes support for a long time already. Thanks :-)

tehkillerbee · 2024-01-27T15:54:56Z

Regarding the release: When are you going to implement the MPEG-DASH parser?

See my comment above. :-)

I think we'll stick to PKCE login for now and worry about MPEG-DASH later and/or leave it up to the users to implement in their own libraries so there is nothing stopping us to release v0.7.4

exislow · 2024-01-27T16:00:27Z

Ohh sorry, haven't seen the edited part, since I was only checking the mail notification. Thank you for your effort!

tehkillerbee · 2024-01-28T11:14:06Z

tidalapi/session.py

+        self.process_auth_token(json)
+
+        # Swap the client_id and secret
+        #self.client_enable_hires()


@exislow Any reason this was not enabled in this PR?

It works with and without this. To avoid a possible break of existing functions I have decided to comment it out. But if you are sure, that all tests are running correct with an OAuth2 token you could also enable line 494. If you like I can also get you a pull request for this. Just let me know, how you decide.

exislow added 5 commits January 19, 2024 19:07

✨ First working PKCE login implement. HiRes downloads are possible now.

6f031a0

✨ Set appropriate User-Agent. Fixes #217

60a3bad

✨ Implemented PKCE authorization to enable HiRes FLAC downloads. Fixes …

d557286

…#188

♻️ Minor refactoring of urls.

69bf50c

♻️ Code format.

3b1d285

exislow mentioned this pull request Jan 23, 2024

Support for 24bit 192kHz #188

Closed

tehkillerbee reviewed Jan 23, 2024

View reviewed changes

tidalapi/session.py Show resolved Hide resolved

🛠️ Reverted to actual login credentials for device linking.

abf1643

jozefKruszynski reviewed Jan 25, 2024

View reviewed changes

orenskl mentioned this pull request Jan 26, 2024

Add support for TIDAL High Resolution (MAX) playback orenskl/HiFiStreamer#43

Open

✨ Changed from private to public methods.

2a43d9a

tehkillerbee closed this Jan 26, 2024

tehkillerbee reopened this Jan 26, 2024

exislow mentioned this pull request Jan 27, 2024

TIDAL-Downloader-NG_windows-x64 exislow/tidal-dl-ng#20

Closed

dependabot bot and others added 3 commits January 27, 2024 16:46

Use correct parse object

3d7d7b7

Add OAuth file login load/save functionality.

e058766

tehkillerbee and others added 14 commits January 27, 2024 16:47

Add misc gitignores (json, csv)

d227800

Added example script for transferring user favourites

33ab53d

Fixed header

b09f396

Update/cleanup readme, move example to subdir

e211b5e

Use oauth file login

6173d12

Use same oauth file path as other examples

dab095b

Fix formatting

34c05a3

Include request response on error. Print as warning.

b6c2aa2

Add path to both v1 and v2 api's

91226cb

Fix formatting

1858fc1

✨ First working PKCE login implement. HiRes downloads are possible now.

472a018

✨ Implemented PKCE authorization to enable HiRes FLAC downloads. Fixes …

7b07328

…#188

♻️ Code format.

c41d1f3

✨ Added PKCE secret and client id swap.

656833c

Merge branch 'master' into 188-support-for-hires

8a5f54b

tehkillerbee merged commit 4a08d05 into tamland:master Jan 27, 2024
4 of 5 checks passed

tehkillerbee mentioned this pull request Jan 27, 2024

PKCE as alternative login method #218

Closed

tehkillerbee reviewed Jan 28, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implements PKCE Authorization to enable access to HiRess files. #221

Implements PKCE Authorization to enable access to HiRess files. #221

exislow commented Jan 23, 2024 •

edited

Loading

tehkillerbee commented Jan 23, 2024

exislow commented Jan 23, 2024

exislow commented Jan 25, 2024 •

edited

Loading

jozefKruszynski Jan 23, 2024

jozefKruszynski Jan 25, 2024

tehkillerbee commented Jan 26, 2024

tehkillerbee commented Jan 26, 2024 •

edited

Loading

exislow commented Jan 26, 2024

tehkillerbee commented Jan 26, 2024 •

edited

Loading

tehkillerbee commented Jan 26, 2024 •

edited

Loading

exislow commented Jan 26, 2024 •

edited

Loading

tehkillerbee commented Jan 26, 2024 •

edited

Loading

exislow commented Jan 26, 2024

exislow commented Jan 27, 2024

tehkillerbee commented Jan 27, 2024 •

edited

Loading

exislow commented Jan 27, 2024

tehkillerbee commented Jan 27, 2024 •

edited

Loading

exislow commented Jan 27, 2024

tehkillerbee Jan 28, 2024

exislow Jan 29, 2024

Implements PKCE Authorization to enable access to HiRess files. #221

Implements PKCE Authorization to enable access to HiRess files. #221

Conversation

exislow commented Jan 23, 2024 • edited Loading

tehkillerbee commented Jan 23, 2024

exislow commented Jan 23, 2024

exislow commented Jan 25, 2024 • edited Loading

jozefKruszynski Jan 23, 2024

Choose a reason for hiding this comment

jozefKruszynski Jan 25, 2024

Choose a reason for hiding this comment

tehkillerbee commented Jan 26, 2024

tehkillerbee commented Jan 26, 2024 • edited Loading

exislow commented Jan 26, 2024

tehkillerbee commented Jan 26, 2024 • edited Loading

tehkillerbee commented Jan 26, 2024 • edited Loading

exislow commented Jan 26, 2024 • edited Loading

tehkillerbee commented Jan 26, 2024 • edited Loading

exislow commented Jan 26, 2024

exislow commented Jan 27, 2024

tehkillerbee commented Jan 27, 2024 • edited Loading

exislow commented Jan 27, 2024

tehkillerbee commented Jan 27, 2024 • edited Loading

exislow commented Jan 27, 2024

tehkillerbee Jan 28, 2024

Choose a reason for hiding this comment

exislow Jan 29, 2024

Choose a reason for hiding this comment

exislow commented Jan 23, 2024 •

edited

Loading

exislow commented Jan 25, 2024 •

edited

Loading

tehkillerbee commented Jan 26, 2024 •

edited

Loading

tehkillerbee commented Jan 26, 2024 •

edited

Loading

tehkillerbee commented Jan 26, 2024 •

edited

Loading

exislow commented Jan 26, 2024 •

edited

Loading

tehkillerbee commented Jan 26, 2024 •

edited

Loading

tehkillerbee commented Jan 27, 2024 •

edited

Loading

tehkillerbee commented Jan 27, 2024 •

edited

Loading