Skip to content

Automatically select secure/not secure protocols #219

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

Merged
bennettrwu merged 2 commits into from
Sep 9, 2025
Merged

Automatically select secure/not secure protocols #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5b0cc3
Automatically select secure/not secure protocols
bennettrwu Sep 9, 2025
66b1abb
update qr code fetch
bennettrwu Sep 9, 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
9 changes: 6 additions & 3 deletions src/components/navbars/topbar/apiDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ export default function ApiDropdown(props) {
const serverAddress = urlParams.get('serverAddress');
const accessToken = urlParams.get('accessToken');
const sourceToken = urlParams.get('sourceToken');
const wsProtocol = window.isSecureContext ? 'wss' : 'ws';
const httpProtocol = window.isSecureContext ? 'https' : 'http';

// Automatically use scribear server as sink when in student mode or as sourcesink if in kiosk mode
useEffect(() => {
Expand All @@ -63,10 +65,10 @@ export default function ApiDropdown(props) {
}

if (mode === 'kiosk') {
switchToScribeARServer(`ws://${kioskServerAddress}/api/sourcesink`, undefined);
switchToScribeARServer(`${wsProtocol}://${kioskServerAddress}/api/sourcesink`, undefined);
} else if (mode === 'student') {
console.log("Sending startSession POST with accessToken:", accessToken);
fetch(`http://${serverAddress}/api/startSession`, {
fetch(`${httpProtocol}://${serverAddress}/api/startSession`, {
method: 'POST',
headers: {
'Content-Type': 'application/json'
Expand All @@ -77,7 +79,7 @@ export default function ApiDropdown(props) {
.then(data => {
console.log('Session token:', data.sessionToken);

const scribearServerAddress = `ws://${serverAddress}/api/sink`;
const scribearServerAddress = `${wsProtocol}://${serverAddress}/api/sink`;

switchToScribeARServer(scribearServerAddress, data.sessionToken);
})
Expand Down Expand Up @@ -148,3 +150,4 @@ export default function ApiDropdown(props) {
</React.Fragment>
);
}

3 changes: 2 additions & 1 deletion src/components/navbars/topbar/qrCodeScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export default function QRCodeComponent() {
const isStudentMode = urlParams.get('mode') === 'student';
const scribearURLParam = urlParams.get('scribearURL');
const sourceToken = urlParams.get('sourceToken');
const httpProtocol = window.isSecureContext ? 'https' : 'http';

useEffect(() => {
if (!isKioskMode) return;
Expand All @@ -29,7 +30,7 @@ export default function QRCodeComponent() {

let updateAccessTokenTimeout;
function updateAccessToken() {
fetch(`${kioskServerAddress}/api/accessToken`, {
fetch(`${httpProtocol}://${kioskServerAddress}/api/accessToken`, {
method: 'POST',
headers: {
'Content-Type': 'application/json'
Expand Down