Skip to content

Enable running using http #451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HelgeKrueger wants to merge 5 commits into
base: main
Choose a base branch
from
+33 −20
Open

Enable running using http #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
99e5c10
Enable running using http
HelgeKrueger Mar 9, 2024
5f90502
Merge branch 'main' into main
HelgeKrueger Dec 4, 2024
a5de91a
Run prettier
HelgeKrueger Dec 4, 2024
2372379
Merge branch 'main' into main
HelgeKrueger Sep 11, 2025
c286c05
Updating to latest phanpy
HelgeKrueger Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/locales/en.po
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 12 additions & 4 deletions src/pages/login.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ import {
} from '../utils/store-utils';
import useTitle from '../utils/useTitle';

const { PHANPY_DEFAULT_INSTANCE: DEFAULT_INSTANCE } = import.meta.env;
const {
PHANPY_DEFAULT_INSTANCE: DEFAULT_INSTANCE,
PHANPY_SCHEME: SCHEME = 'https',
} = import.meta.env;

function Login() {
const { t } = useLingui();
Expand Down Expand Up @@ -69,7 +72,9 @@ function Login() {
// WEB_DOMAIN vs LOCAL_DOMAIN negotiation time
// https://docs.joinmastodon.org/admin/config/#web_domain
try {
const res = await fetch(`https://${instanceURL}/.well-known/host-meta`); // returns XML
const res = await fetch(
`${PHANPY_SCHEME}://${instanceURL}/.well-known/host-meta`,
); // returns XML
const text = await res.text();
// Parse XML
const parser = new DOMParser();
Expand Down Expand Up @@ -148,8 +153,11 @@ function Login() {
.trim()
: null;
const instanceTextLooksLikeDomain =
/[^\s\r\n\t\/\\]+\.[^\s\r\n\t\/\\]+/.test(cleanInstanceText) &&
!/[\s\/\\@]/.test(cleanInstanceText);
(/[^\s\r\n\t\/\\]+\.[^\s\r\n\t\/\\]+/.test(cleanInstanceText) &&
!/[\s\/\\@]/.test(cleanInstanceText)) ||
SCHEME === 'http';

console.log(SCHEME);

const instancesSuggestions = cleanInstanceText
? searcher.current
Expand Down
6 changes: 5 additions & 1 deletion src/utils/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import {
setCurrentAccountID,
} from './store-utils';

const { PHANPY_SCHEME: SCHEME = 'https' } = import.meta.env;

// Default *fallback* instance
const DEFAULT_INSTANCE = 'mastodon.social';

Expand Down Expand Up @@ -40,7 +42,9 @@ export function initClient({ instance, accessToken }) {
.replace(/\/+$/, '')
.toLowerCase();
}
const url = instance ? `https://${instance}` : `https://${DEFAULT_INSTANCE}`;
const url = instance
? `${SCHEME}://${instance}`
: `${SCHEME}://${DEFAULT_INSTANCE}`;

const masto = createRestAPIClient({
url,
Expand Down
7 changes: 4 additions & 3 deletions src/utils/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const {
DEV,
PHANPY_CLIENT_NAME: CLIENT_NAME,
PHANPY_WEBSITE: WEBSITE,
PHANPY_SCHEME: SCHEME = 'https',
} = import.meta.env;

const SCOPES = 'read write follow push';
Expand Down Expand Up @@ -31,7 +32,7 @@ export async function registerApplication({ instanceURL }) {
website: WEBSITE,
});
const registrationResponse = await fetch(
`https://${instanceURL}/api/v1/apps`,
`${SCHEME}://${instanceURL}/api/v1/apps`,
{
method: 'POST',
headers: {
Expand Down Expand Up @@ -78,7 +79,7 @@ export async function getAuthorizationURL({
response_type: 'code',
});
if (forceLogin) authorizationParams.append('force_login', true);
const authorizationURL = `https://${instanceURL}/oauth/authorize?${authorizationParams.toString()}`;
const authorizationURL = `${SCHEME}://${instanceURL}/oauth/authorize?${authorizationParams.toString()}`;
return authorizationURL;
}

Expand All @@ -104,7 +105,7 @@ export async function getAccessToken({
if (code_verifier) {
params.append('code_verifier', code_verifier);
}
const tokenResponse = await fetch(`https://${instanceURL}/oauth/token`, {
const tokenResponse = await fetch(`${SCHEME}://${instanceURL}/oauth/token`, {
method: 'POST',
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
Expand Down
Loading