-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* More OAuth work * Lint fix * tweaks --------- Co-authored-by: github-action linter <[email protected]>
- Loading branch information
Showing
11 changed files
with
382 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
import "pkg:/source/AsyncTask/AsyncTask.bs" | ||
import "pkg:/source/AsyncTask/Tasks.bs" | ||
import "pkg:/source/utils/Locale.bs" | ||
import "pkg:/source/utils/Types.bs" | ||
|
||
function Init() | ||
m.qrCode = m.top.findNode("QrCodePoster") | ||
|
||
codeLabel = m.top.findNode("codeLabel") | ||
if codeLabel <> invalid | ||
codeLabel = codeLabel.getChild(0) | ||
if codeLabel <> invalid | ||
codeFont = m.top.findNode("codeFont") | ||
codeLabel.font = codeFont | ||
end if | ||
end if | ||
|
||
m.top.width = "920" | ||
m.top.observeFieldScoped("buttonSelected", FuncName(Close)) | ||
m.top.observeFieldScoped("wasClosed", FuncName(OnWasClosed)) | ||
scanLabel = m.top.findNode("scanLabel") | ||
' TODO:P2 localize all dialog items | ||
scanLabel.text = Tr(Locale.Dialogs.ScanTheQrCode) | ||
end function | ||
|
||
function OnNodeReady() | ||
m.task = AsyncTask.Start(Tasks.YouTubeLoginTask, { | ||
dialog: m.top | ||
profilesService: m.top.profilesService | ||
}) | ||
end function | ||
|
||
function OnCodeSet(event as object) | ||
code = event.getData() | ||
m.qrCode.text = code | ||
end function | ||
|
||
function Close() | ||
m.top.close = true | ||
end function | ||
|
||
function OnWasClosed() | ||
if m.task <> invalid | ||
m.task.cancel = true | ||
m.task = invalid | ||
end if | ||
end function | ||
|
||
function OnUrlSet() | ||
m.qrCode.text = m.top.url | ||
end function |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
<component name="YouTubeLoginDialog" extends="StandardDialog" initialFocus="buttonArea" includes="AutoBind"> | ||
<interface> | ||
<field id="profilesService" type="node" bind="/ProfilesService" /> | ||
<field id="code" type="string" alias="codeLabel.text" /> | ||
<field id="url" type="string" onChange="OnUrlSet" /> | ||
<field id="alwaysOnTop" type="boolean" /> | ||
</interface> | ||
<children> | ||
<Font id="codeFont" uri="font:MediumSystemFontFile" size="36" /> | ||
|
||
<StdDlgTitleArea primaryTitle="Login to YouTube" /> | ||
<StdDlgContentArea> | ||
<StdDlgTextItem text="Open the link 'https://yt.be/activate' and enter the following code:" /> | ||
<StdDlgTextItem id="codeLabel" text="Loading..." /> | ||
</StdDlgContentArea> | ||
<StdDlgButtonArea id="buttonArea"> | ||
<StdDlgButton text="OK" /> | ||
</StdDlgButtonArea> | ||
<StdDlgSideCardArea | ||
id="sideCarArea" | ||
horizAlign="right" | ||
width="400" | ||
extendToDialogEdge="false" | ||
showDivider="false"> | ||
<Label | ||
id="scanLabel" | ||
text="Scan the QR Code" | ||
horizAlign="center" | ||
wrap="true" width="400"> | ||
<Font role="font" uri="font:SystemFontFile" size="24" /> | ||
</Label> | ||
<QrCodePoster | ||
id="QrCodePoster" | ||
width="300" | ||
height="300" | ||
loadWidth="300" | ||
loadHeight="300" | ||
padding="10" | ||
translation="[50, 50]" /> | ||
<Label | ||
horizAlign="center" | ||
width="400" | ||
translation="[0, 380]" | ||
text="https://yt.be/activate"> | ||
<Font role="font" uri="font:MediumSystemFontFile" size="18" /> | ||
</Label> | ||
</StdDlgSideCardArea> | ||
</children> | ||
</component> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,118 @@ | ||
import "pkg:/components/Dialog/DialogUtils.bs" | ||
import "pkg:/components/Services/Innertube/InnertubeService.bs" | ||
import "pkg:/source/utils/CancellationUtils.bs" | ||
import "pkg:/source/utils/Logging.bs" | ||
|
||
@asynctask | ||
function YouTubeLoginTask(input as object) as object | ||
profilesNode = input.profilesService | ||
dialogNode = input.dialog | ||
|
||
cancellation = m.top.cancellation | ||
' TODO:P2 cache client identity | ||
authCode = InnertubeService.AuthGetCode(cancellation) | ||
|
||
if CancellationUtils.IsCancelled(cancellation) | ||
return invalid | ||
end if | ||
|
||
if authCode.error <> invalid | ||
LogError(authCode.error) | ||
DialogUtils.ShowDialogEx({ | ||
title: "Error" | ||
message: authCode.error | ||
large: true | ||
}) | ||
return invalid | ||
end if | ||
|
||
url = InnertubeService.AuthGetActivationUrl(authCode) | ||
|
||
LogInfo("Login url:", url) | ||
|
||
dialogNode.url = url | ||
dialogNode.code = authCode.userCode | ||
|
||
accessToken = InnertubeService.AuthPollForAccessToken(authCode, cancellation) | ||
|
||
if CancellationUtils.IsCancelled(cancellation) | ||
return invalid | ||
end if | ||
|
||
if accessToken.error <> invalid | ||
LogError(accessToken.error) | ||
DialogUtils.ShowDialogEx({ | ||
title: "Error" | ||
message: accessToken.error | ||
large: true | ||
}) | ||
return invalid | ||
end if | ||
|
||
accounts = InnertubeService.AuthListAccounts(accessToken.accessToken, cancellation) | ||
|
||
if CancellationUtils.IsCancelled(cancellation) | ||
return invalid | ||
end if | ||
|
||
if IsAssociativeArray(accounts) and accounts.error <> invalid | ||
LogError(accounts.error) | ||
DialogUtils.ShowDialogEx({ | ||
title: "Error" | ||
message: accounts.error | ||
large: true | ||
}) | ||
return invalid | ||
end if | ||
|
||
if not IsArray(accounts) or accounts.Count() = 0 | ||
LogError("No accounts found") | ||
DialogUtils.ShowDialogEx({ | ||
title: "Error" | ||
message: "No accounts found" | ||
large: true | ||
}) | ||
return invalid | ||
end if | ||
|
||
selectedAccount = invalid | ||
for each account in accounts | ||
if ValidBool(account.isSelected) | ||
selectedAccount = account | ||
exit for | ||
end if | ||
end for | ||
|
||
if selectedAccount = invalid | ||
selectedAccount = accounts[0] | ||
end if | ||
|
||
profile = CreateProfileContentNode(selectedAccount, accessToken) | ||
profilesNode@.LoginWithProfile(profile) | ||
|
||
dialogNode.close = true | ||
|
||
return invalid | ||
end function | ||
|
||
function CreateProfileContentNode(account as object, accessToken as object) as object | ||
profile = CreateObject("roSGNode", "ProfileContentNode") | ||
profile.type = "youtube" | ||
profile.serverUrl = "http://127.0.0.1:8888/playlet-invidious-backend" | ||
username = account.channelHandle | ||
if StringUtils.IsNullOrEmpty(username) | ||
username = account.accountByline | ||
end if | ||
profile.username = username | ||
profile.thumbnail = account.accountPhoto | ||
profile.accessToken = accessToken.accessToken | ||
profile.refreshToken = accessToken.refreshToken | ||
profile.scope = accessToken.scope | ||
profile.tokenType = accessToken.tokenType | ||
profile.expiresIn = accessToken.expiresIn | ||
profile.expiresTimestamp = accessToken.expiresTimestamp | ||
profile.clientId = accessToken.clientId | ||
profile.clientSecret = accessToken.clientSecret | ||
|
||
return profile | ||
end function |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.