Skip to content

feat: allow magic string to generate session token for external apps #9878

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
merged 3 commits into from
Sep 26, 2023
Merged

feat: allow magic string to generate session token for external apps #9878

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8c61ae
fix: make non-http external app links open in the current window
kylecarbs Sep 26, 2023
d0710a7
Allow magic string to be replaced with a session token for external apps
kylecarbs Sep 26, 2023
d0ddd4e
Improve readibility
kylecarbs Sep 26, 2023
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
Prev Previous commit
Improve readibility
  • Loading branch information
@kylecarbs
kylecarbs committed Sep 26, 2023
commit d0ddd4e9f573ad8d736729d1c907cf2007edea81
22 changes: 6 additions & 16 deletions site/src/components/Resources/AppLink/AppLink.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export const AppLink: FC<AppLinkProps> = ({ app, workspace, agent }) => {
className={canClick ? styles.link : styles.disabledLink}
onClick={
canClick
? (event) => {
? async (event) => {
event.preventDefault();
// This is an external URI like "vscode://", so
// it needs to be opened with the browser protocol handler.
Expand All @@ -115,24 +115,14 @@ export const AppLink: FC<AppLinkProps> = ({ app, workspace, agent }) => {
// be used internally, and is highly subject to break.
const magicTokenString = "$SESSION_TOKEN";
const hasMagicToken = href.indexOf(magicTokenString);
let url = href;
if (hasMagicToken !== -1) {
setFetchingSessionToken(true);
getApiKey()
.then((key) => {
const url = href.replaceAll(
magicTokenString,
key.key,
);
window.location.href = url;
setFetchingSessionToken(false);
})
.catch((ex) => {
console.error(ex);
setFetchingSessionToken(false);
});
} else {
window.location.href = href;
const key = await getApiKey();
url = href.replaceAll(magicTokenString, key.key);
setFetchingSessionToken(false);
}
window.location.href = url;
} else {
window.open(
href,
Expand Down