CatAClock/Fedi.CrowdedGames.Group
CatAClock/Fedi.CrowdedGames.Group
0
0
Fork 0
Code Issues 5 Pull requests Activity

Mastodon Bug Fixes

Browse source
This commit is contained in:
CatAClock 2025-04-28 15:22:29 -07:00
parent a3498f5a03
commit 9cc7038273
4 changed files with 40 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
HTML/mail.html
View file

@ -17,8 +17,12 @@
<section style="position: absolute; width: 100%; height: 100%" class="Notifications"></section> <section style="position: absolute; width: 100%; height: 100%" class="Notifications"></section>
<header style="position: relative; z-index: 1;"> <header style="position: relative; z-index: 1;">
<h1>Mail</h1> <h1>Mail</h1>
<p class="Login"><em>Login</em></p> <p class="Login Mastodon"><em>Login</em></p>
<p class="Logout" style="visibility: hidden;"><em>Logout</em></p> <input type="text" minlength="6" class="WebInput Mastodon" required />
<p class="Logout Mastodon" style="visibility: hidden;"><em>Logout</em></p>
<p class="Login Bluesky"><em>Login</em></p>
<input type="text" minlength="6" class="WebInput Bluesky" required />
<p class="Logout Bluesky" style="visibility: hidden;"><em>Logout</em></p>
<p onclick="history.back()"><b>Back</b></p> <p onclick="history.back()"><b>Back</b></p>
</header> </header>
</body> </body>

11
JS/BlueskyAPI.js
View file

@ -36,14 +36,9 @@ export async function CreatePKCECodeChallenge(CodeVerifier) {
} }
// Component 3/4 // Component 3/4
export async function CreatePAR() { export async function PARrequest(PAREndpoint, State, ChallengeCode) {
let WellKnown = await GetPDSWellKnown(); return await fetch(PAREndpoint, {method: "POST", body: new URLSearchParams({ response_type: "code", code_challenge_method: "S256", scope: "atproto transition:generic", client_id: "https://fedi.crowdedgames.group/oauth/client-metadata.json", redirect_uri: "https://fedi.crowdedgames.group/HTML/mail.html", code_challenge: ChallengeCode, state: State, login_hint: "crowdedgames.group" }), "Content-Type": "application/x-www-form-urlencoded"})
// Some verification mechanism with PAR .then((response) => response.json());
let PAREndpoint = WellKnown.pushed_authorization_request_endpoint;
// Token goes into the authorization endpoint
let AuthEndpoint = WellKnown.authorization_endpoint;
} }
// Component 4/4 // Component 4/4

10
JS/MastodonAPI.js
View file

@ -1,4 +1,5 @@
export const Scopes = "read write follow push"; export const Scopes = "read write follow push";
let Origin = location.href;
// Gets the public timeline. // Gets the public timeline.
export async function GetPublicTimeline(Local = false, Remote = false, Website) { export async function GetPublicTimeline(Local = false, Remote = false, Website) {
@ -66,22 +67,21 @@ export async function GetNotifications(Website, MastodonAccessToken, MastodonTok
// The first step to using the app. // The first step to using the app.
export async function HandleAuthentication(Website, CookieClientID, CookieClientSecret) { export async function HandleAuthentication(Website, CookieClientID, CookieClientSecret) {
// See if the user is smart enough to put https. // See if the user is smart enough to put https.
let InstanceData; let InstanceData = "";
if (!Website.toLowerCase().split("://")[0].includes("https")) {
// Quickly check to see if it has something before :// so it doesn't screw the link. // Quickly check to see if it has something before :// so it doesn't screw the link.
if (Website.toLowerCase().split("://").length > 1) { if (Website.toLowerCase().split("://").length > 1) {
Website = "https://" + Website.split("://")[1]; Website = "https://" + Website.split("://")[1];
} else { } else {
Website = "https://" + Website; Website = "https://" + Website;
} }
InstanceData = await fetch(Website + "/api/v1/apps?client_name=Channel Viewer&redirect_uris=" + Origin + "&scopes=" + ActivityPub.Scopes, {method: "POST"}) console.log(Website);
InstanceData = await fetch(Website + "/api/v1/apps?client_name=Channel Viewer&redirect_uris=" + Origin + "&scopes=" + Scopes, {method: "POST"})
.then((response) => response.json()); .then((response) => response.json());
}
// Save the client stuff as cookies. // Save the client stuff as cookies.
document.cookie = CookieClientID + "=" + InstanceData.client_id + ";samesite=strict;path=/;expires=9999-01-01;"; document.cookie = CookieClientID + "=" + InstanceData.client_id + ";samesite=strict;path=/;expires=9999-01-01;";
document.cookie = CookieClientSecret + "=" + InstanceData.client_secret + ";samesite=strict;path=/;expires=9999-01-01;"; document.cookie = CookieClientSecret + "=" + InstanceData.client_secret + ";samesite=strict;path=/;expires=9999-01-01;";
// Now authenticate the app. // Now authenticate the app.
document.location.href = Website + "/oauth/authorize?client_id=" + InstanceData.client_id + "&redirect_uri=" + Origin + "&response_type=code&scope=" + ActivityPub.Scopes; document.location.href = Website + "/oauth/authorize?client_id=" + InstanceData.client_id + "&redirect_uri=" + Origin + "&response_type=code&scope=" + Scopes;
} }
// This specific functino goes after HandleAuthentication for when login happens. // This specific functino goes after HandleAuthentication for when login happens.

31
JS/mail.js
View file

@ -2,9 +2,12 @@ import * as MastodonAPI from "./MastodonAPI.js";
import * as BlueskyAPI from "./BlueskyAPI.js"; import * as BlueskyAPI from "./BlueskyAPI.js";
import * as TumblrAPI from "./TumblrAPI.js"; import * as TumblrAPI from "./TumblrAPI.js";
let LoginButton = document.getElementsByClassName("Login")[0]; let MastodonLoginButton = document.getElementsByClassName("Login Mastodon")[0];
let LogoutButton = document.getElementsByClassName("Logout")[0]; let MastodonWebInput = document.getElementsByClassName("WebInput Mastodon")[0];
let Origin = window.location.origin + "/HTML/mail" let MastodonLogoutButton = document.getElementsByClassName("Logout Mastodon")[0];
let BlueskyLoginButton = document.getElementsByClassName("Login Bluesky")[0];
let BlueskyWebInput = document.getElementsByClassName("WebInput Bluesky")[0];
let BlueskyLogoutButton = document.getElementsByClassName("Logout Bluesky")[0];
// Mastodon // Mastodon
let MastodonWebsite = "https://wetdry.world"; let MastodonWebsite = "https://wetdry.world";
@ -20,11 +23,13 @@ let BlueskyPDS = "https://bsky.social";
// Tumblr // Tumblr
let TumblrWebsite = "https://www.tumblr.com"; let TumblrWebsite = "https://www.tumblr.com";
LoginButton.onclick = (event) => { MastodonLoginButton.onclick = (event) => {
if (MastodonWebInput != "") {
MastodonAPI.HandleAuthentication(MastodonWebsite, MastodonClientID, MastodonClientSecret); MastodonAPI.HandleAuthentication(MastodonWebsite, MastodonClientID, MastodonClientSecret);
} }
}
LogoutButton.onclick = (event) => { MastodonLogoutButton.onclick = (event) => {
document.cookie = MastodonAccessToken + "=nothing;" + ";samesite=strict;path=/;expires=0000-01-01;"; document.cookie = MastodonAccessToken + "=nothing;" + ";samesite=strict;path=/;expires=0000-01-01;";
document.cookie = MastodonTokenType + "=nothing;" + ";samesite=strict;path=/;expires=0000-01-01;"; document.cookie = MastodonTokenType + "=nothing;" + ";samesite=strict;path=/;expires=0000-01-01;";
console.log("Cleared the access token."); console.log("Cleared the access token.");
@ -98,21 +103,23 @@ BlueskyAPI.ClientDPoP();
BlueskyAPI.AssertionJWT("Nothing"); BlueskyAPI.AssertionJWT("Nothing");
async function BlueskyTestingAuthorization() { async function BlueskyTestingAuthorization() {
// Declare Variables
let WellKnown = await BlueskyAPI.GetPDSWellKnown(); let WellKnown = await BlueskyAPI.GetPDSWellKnown();
let PAREndpoint = WellKnown.pushed_authorization_request_endpoint; let PAREndpoint = WellKnown.pushed_authorization_request_endpoint;
let TestingState = generateToken(64); let State = generateToken(64);
let TestingVerifier = await BlueskyAPI.CreatePKCECodeVerifier() let PKCEverifier = await BlueskyAPI.CreatePKCECodeVerifier();
let TestingChallenge = await BlueskyAPI.CreatePKCECodeChallenge(TestingVerifier); let PKCEchallenge = await BlueskyAPI.CreatePKCECodeChallenge(TestingVerifier);
let PAR = BlueskyAPI.PARrequest(WellKnown.pushed_authorization_request_endpoint, State, PKCEchallenge);
console.log(PAR);
let TestingRequest = fetch(PAREndpoint, {method: "POST", body: new URLSearchParams({ response_type: "code", code_challenge_method: "S256", scope: "atproto", client_id: "https://fedi.crowdedgames.group/oauth/client-metadata.json", redirect_uri: "https://fedi.crowdedgames.group/HTML/mail.html", code_challenge: TestingChallenge, state: TestingState, login_hint: "crowdedgames.group" }), "Content-Type": "application/x-www-form-urlencoded"});
console.log(TestingRequest);
} }
BlueskyTestingAuthorization(); // BlueskyTestingAuthorization();
// Stolen from Brave // Stolen from Search
// TODO: implement my own function. // TODO: implement my own function.
function generateToken(length) { function generateToken(length) {
var chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'; var chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';