Skip to content
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

Jump to bottom

room name and user name as GET parameters #95

Closed
wants to merge 1 commit into from
Closed

room name and user name as GET parameters #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Expand Up @@ -23,6 +23,7 @@
"lint-staged": "^9.5.0",
"lodash.throttle": "^4.1.1",
"prettier": "^1.19.1",
"query-string": "^6.11.1",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should've updated the package-lock.json. Can you please push up the changes?

"react": "^16.12.0",
"react-dom": "^16.12.0",
"react-router-dom": "^5.1.2",
Expand Down
19 changes: 17 additions & 2 deletions src/components/MenuBar/MenuBar.tsx
View file
Open in desktop
Expand Up @@ -42,7 +42,14 @@ const useStyles = makeStyles((theme: Theme) =>

export default function MenuBar() {
const classes = useStyles();
const { URLRoomName } = useParams();
let { URLRoomName } = useParams();

if (!URLRoomName) {
URLRoomName = window.sessionStorage.getItem('room') || '';
}

const URLUserName = window.sessionStorage.getItem('user') || '';
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this come from useParams() the same way that URLRoomName does?


const { user, getToken } = useAppState();
const { isConnecting, connect } = useVideoContext();
const roomState = useRoomState();
Expand All @@ -54,7 +61,15 @@ export default function MenuBar() {
if (URLRoomName) {
setRoomName(URLRoomName);
}
}, [URLRoomName]);

if (URLUserName) {
setName(URLUserName);
}

if (URLRoomName && URLUserName) {
getToken(URLUserName, URLRoomName).then(token => connect(token));
}
}, [URLRoomName, URLUserName]);

const handleNameChange = (event: ChangeEvent<HTMLInputElement>) => {
setName(event.target.value);
Expand Down
39 changes: 37 additions & 2 deletions src/state/usePasscodeAuth/usePasscodeAuth.ts
View file
Open in desktop
@@ -1,9 +1,22 @@
import { useCallback, useEffect, useState } from 'react';
import { useHistory } from 'react-router-dom';
const queryString = require('query-string');
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use import here?


export function getRoomName() {
const parsed = queryString.parse(window.location.search);
const room = parsed.room ? parsed.room : window.sessionStorage.getItem('room');
return room;
}

export function getUserName() {
const parsed = queryString.parse(window.location.search);
const user = parsed.user ? parsed.user : window.sessionStorage.getItem('user');
return user;
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we are sharing this url, I would expect we want the user to enter their own username. Why are we setting it in the url? Can you please provide the use case for this?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@charliesantos there are a few use-cases where prefilling a user's name could be useful.

For example, I click a button to send an SMS link to the video room. The button trigger's a controller that queries by DB based on the phone entered and pulls the first name based on the phone number. Then, the controller adds that param to the link and sends an SMS -> user has a one-click join experience.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good use case @cweems. In that case, I think we can keep this feature in this PR.


export function getPasscode() {
const match = window.location.search.match(/passcode=(.*)&?/);
const passcode = match ? match[1] : window.sessionStorage.getItem('passcode');
const parsed = queryString.parse(window.location.search);
const passcode = parsed.passcode ? parsed.passcode : window.sessionStorage.getItem('passcode');
return passcode;
}

Expand Down Expand Up @@ -58,13 +71,24 @@ export default function usePasscodeAuth() {

useEffect(() => {
const passcode = getPasscode();
const room = getRoomName();
const user = getUserName();

if (passcode) {
verifyPasscode(passcode)
.then(verification => {
if (verification?.isValid) {
setUser({ passcode } as any);
window.sessionStorage.setItem('passcode', passcode);

if (user) {
window.sessionStorage.setItem('user', user);
}

if (room) {
window.sessionStorage.setItem('room', room);
}

history.replace(window.location.pathname);
}
})
Expand All @@ -79,6 +103,17 @@ export default function usePasscodeAuth() {
if (verification?.isValid) {
setUser({ passcode } as any);
window.sessionStorage.setItem('passcode', passcode);

const room = getRoomName();
const user = getUserName();

if (user) {
window.sessionStorage.setItem('user', user);
}

if (room) {
window.sessionStorage.setItem('room', room);
}
} else {
throw new Error(getErrorMessage(verification?.error));
}
Expand Down