Skip to content

feat: allow access Joule from VS Code #319

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.

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 13 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/app-studio-remote-access/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"@microsoft/dev-tunnels-ssh": "3.11.2",
"@microsoft/dev-tunnels-ssh-keys": "3.11.2",
"@microsoft/dev-tunnels-ssh-tcp": "3.11.2",
"@sap/bas-sdk": "^3.8.9",
"@sap/bas-sdk": "^3.9.0",
"@vscode-logging/wrapper": "2.0.0",
"lodash": "4.17.21",
"ssh-config": "4.2.1",
Expand Down
43 changes: 39 additions & 4 deletions packages/app-studio-toolkit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,20 @@
"light": "resources/devspace/login.svg",
"dark": "resources/devspace/login.svg"
}
},
{
"command": "app-studio-toolkit.devspace-manager.landscape.default-on",
"title": "Set as default landscape",
"icon": "$(vm-outline)"
},
{
"command": "app-studio-toolkit.devspace-manager.landscape.default-off",
"title": "Remove as default landscape",
"icon": "$(vm-active)"
},
{
"command": "app-studio-toolkit.devspace-manager.get-default-landscape",
"title": "Returns the landscape marked as the default"
}
],
"configuration": [
Expand Down Expand Up @@ -182,6 +196,18 @@
}
],
"commandPalette": [
{
"when": "false",
"command": "app-studio-toolkit.devspace-manager.get-default-landscape"
},
{
"when": "false",
"command": "app-studio-toolkit.devspace-manager.landscape.default-on"
},
{
"when": "false",
"command": "app-studio-toolkit.devspace-manager.landscape.default-off"
},
{
"when": "false",
"command": "local-extension.landscape.add"
Expand Down Expand Up @@ -302,8 +328,18 @@
},
{
"command": "local-extension.login",
"when": "view == dev-spaces && viewItem =~ /.*log-out.*/",
"group": "inline"
"when": "view == dev-spaces && viewItem =~ /.*landscape-log-out.*/",
"group": "inline@2"
},
{
"command": "app-studio-toolkit.devspace-manager.landscape.default-on",
"when": "view == dev-spaces && viewItem =~ /.*landscape-.*default-off.*/",
"group": "inline@1"
},
{
"command": "app-studio-toolkit.devspace-manager.landscape.default-off",
"when": "view == dev-spaces && viewItem =~ /.*landscape-.*default-on.*/",
"group": "inline@1"
}
]
},
Expand Down Expand Up @@ -337,14 +373,13 @@
],
"dependencies": {
"@sap/artifact-management": "1.39.0",
"@sap/bas-sdk": "^3.8.9",
"@sap/bas-sdk": "^3.9.0",
"@vscode-logging/wrapper": "2.0.0",
"axios": "^1.7.4",
"body-parser": "1.20.2",
"cors": "2.8.5",
"express": "4.19.2",
"http-terminator": "3.2.0",
"jwt-decode": "3.1.2",
"lodash": "4.17.21",
"ssh-config": "4.2.1",
"ts-enum-util": "4.0.2",
Expand Down
24 changes: 1 addition & 23 deletions packages/app-studio-toolkit/src/authentication/auth-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import express from "express";
import cors from "cors";
import * as bodyParser from "body-parser";
import { createHttpTerminator, HttpTerminator } from "http-terminator";
import jwtDecode, { JwtPayload } from "jwt-decode";
import { platform } from "os";
import { getLogger } from "../logger/logger";
import { BasRemoteAuthenticationProvider } from "./authProvider";
Expand Down Expand Up @@ -131,27 +130,6 @@ async function getJwtFromServer(landscapeUrl: string): Promise<string> {
: expressGetJwtFromServer(landscapeUrl);
}

function getJwtExpiration(jwt: string): number {
const decodedJwt: JwtPayload = jwtDecode<JwtPayload>(jwt);
return (
(decodedJwt.exp ??
/* istanbul ignore next: test's dummy jwt always has 'exp' attribute */ 0) *
1000
);
}

function isJwtExpired(jwt: string): boolean {
const expired = getJwtExpiration(jwt);
getLogger().info(`jwt expires at ${new Date(expired).toString()}`);
return Date.now() >= expired;
}

export function timeUntilJwtExpires(jwt: string): number {
const untilExpired = getJwtExpiration(jwt) - Date.now();
getLogger().info(`jwt expires in ${untilExpired / 1000} seconds`);
return untilExpired;
}

async function getJwtFromServerWithTimeout(
ms: number,
promise: Promise<string>
Expand Down Expand Up @@ -222,6 +200,6 @@ export async function getJwt(landscapeUrl: string): Promise<string> {

export async function hasJwt(landscapeUrl: string): Promise<boolean> {
return getJwt(landscapeUrl)
.then((jwt) => !isJwtExpired(jwt))
.then((jwt) => !core.isJwtExpired(jwt))
.catch((_) => false);
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ export const messages = {
lbl_dev_space_explorer_loading: `Loading...`,
lbl_icon_missing: (iconName: string): string =>
`Could not find an icon named '${iconName}'. Make sure you imported the matching file.`,
lbl_logged_in: `Logged in`,
lbl_not_logged_in: `Not logged in`,
lbl_landscape_context_status: (isLoggedIn: boolean) =>
`landscape-${isLoggedIn ? "log-in" : "log-out"}`,
lbl_logged_in: `Logged in.`,
lbl_not_logged_in: `Not logged in.`,
lbl_landscape_context_status: (isLoggedIn: boolean, isDefaultOn?: boolean) =>
`landscape-log-${isLoggedIn ? "in" : "out"}-default-${
isDefaultOn ? "on" : "off"
}`,
lbl_devspace_status_runnig: `running`,
lbl_devspace_status_not_runnig: `not_running`,
lbl_devspace_status_error: `error`,
Expand All @@ -22,6 +24,7 @@ export const messages = {
` Are you sure you want to delete the '${label}' (${id}) dev space?`,
lbl_yes: `Yes`,
lbl_no: `No`,
lbl_ai_enabled: `Default landscape is enabled.`,

err_incorrect_jwt: (url: string) =>
`Incorrect token recieved for ${url}. Login failed.`,
Expand Down
34 changes: 32 additions & 2 deletions packages/app-studio-toolkit/src/devspace-manager/instance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,15 @@ import {
cmdDevSpaceOpenInBAS,
} from "./devspace/connect";
import { BasRemoteAuthenticationProvider } from "../authentication/authProvider";
import { cmdLoginToLandscape } from "./landscape/landscape";
import {
clearDefaultLandscape,
cmdLoginToLandscape,
getDefaultLandscape,
setDefaultLandscape,
} from "./landscape/landscape";
import { getBasUriHandler } from "./handler/basHandler";
import { cmdOpenInVSCode } from "./devspace/open";
import { getJwt } from "../authentication/auth-utils";
import { LandscapeNode } from "./tree/treeItems";

export function initBasRemoteExplorer(context: ExtensionContext): void {
context.subscriptions.push(
Expand All @@ -30,6 +35,31 @@ export function initBasRemoteExplorer(context: ExtensionContext): void {
const devSpaceExplorer = new DevSpacesExplorer(context.extensionPath);

/* istanbul ignore next */
context.subscriptions.push(
commands.registerCommand(
"app-studio-toolkit.devspace-manager.landscape.default-on",
async (node?: LandscapeNode): Promise<boolean> =>
setDefaultLandscape(node?.url)
)
);

context.subscriptions.push(
commands.registerCommand(
"app-studio-toolkit.devspace-manager.landscape.default-off",
async (node: LandscapeNode): Promise<void> => {
await clearDefaultLandscape();
void commands.executeCommand("local-extension.tree.refresh");
}
)
);

context.subscriptions.push(
commands.registerCommand(
"app-studio-toolkit.devspace-manager.get-default-landscape",
getDefaultLandscape
)
);

context.subscriptions.push(
commands.registerCommand("local-extension.tree.refresh", () =>
devSpaceExplorer.refreshTree()
Expand Down
Loading
Loading