Skip to content

Commit c20c78b

Browse files
committed
Fix GUI with new OpenBao's transitMountPath field
1 parent 563f037 commit c20c78b

File tree

5 files changed

+29
-2
lines changed

5 files changed

+29
-2
lines changed

client/src/components/devices/ChooseAuthentication.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@ async function onSSOLoginClicked(provider: OpenBaoAuthConfigTag): Promise<void>
310310
auth.tag,
311311
auth.mountPath,
312312
props.serverConfig.openbao.secret.mountPath,
313+
props.serverConfig.openbao.transitMountPath,
313314
);
314315
if (!result.ok) {
315316
if (result.error.type === OpenBaoErrorType.PopupFailed) {

client/src/parsec/login.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ export const AccessStrategy = {
277277
keyFile: device.keyFilePath,
278278
openbaoServerUrl: connInfo.server,
279279
openbaoSecretMountPath: connInfo.secretMountpoint,
280+
openbaoTransitMountPath: connInfo.transitMountpoint,
280281
openbaoEntityId: connInfo.userId,
281282
openbaoAuthToken: connInfo.token,
282283
};
@@ -310,6 +311,7 @@ export const AccessStrategy = {
310311
keyFile: device.keyFilePath,
311312
openbaoServerUrl: saveStrategy.openbaoServerUrl,
312313
openbaoSecretMountPath: saveStrategy.openbaoSecretMountPath,
314+
openbaoTransitMountPath: saveStrategy.openbaoTransitMountPath,
313315
openbaoEntityId: saveStrategy.openbaoEntityId,
314316
openbaoAuthToken: saveStrategy.openbaoAuthToken,
315317
};
@@ -347,6 +349,7 @@ export const SaveStrategy = {
347349
tag: DeviceSaveStrategyTag.OpenBao,
348350
openbaoServerUrl: connInfo.server,
349351
openbaoSecretMountPath: connInfo.secretMountpoint,
352+
openbaoTransitMountPath: connInfo.transitMountpoint,
350353
openbaoEntityId: connInfo.userId,
351354
openbaoAuthToken: connInfo.token,
352355
openbaoPreferredAuthId: connInfo.provider,

client/src/services/openBao.ts

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export interface OpenBaoConnectionInfo {
2626
server: string;
2727
provider: OpenBaoAuthConfigTag;
2828
secretMountpoint: string;
29+
transitMountpoint: string;
2930
}
3031

3132
type OpenBaoResult<T> = { ok: true; value: T } | { ok: false; error: OpenBaoError };
@@ -38,8 +39,17 @@ export class OpenBaoClient {
3839
_provider: OpenBaoAuthConfigTag;
3940
_mountpoint: string;
4041
_secretMountpoint: string;
42+
_transitMountpoint: string;
4143

42-
constructor(token: string, id: string, server: string, provider: OpenBaoAuthConfigTag, mountpoint: string, secretMountpoint: string) {
44+
constructor(
45+
token: string,
46+
id: string,
47+
server: string,
48+
provider: OpenBaoAuthConfigTag,
49+
mountpoint: string,
50+
secretMountpoint: string,
51+
transitMountpoint: string,
52+
) {
4353
this._server = server;
4454
this._client = axios.create({
4555
baseURL: this._server,
@@ -51,6 +61,7 @@ export class OpenBaoClient {
5161
this._provider = provider;
5262
this._mountpoint = mountpoint;
5363
this._secretMountpoint = secretMountpoint;
64+
this._transitMountpoint = transitMountpoint;
5465
}
5566

5667
getConnectionInfo(): OpenBaoConnectionInfo {
@@ -59,6 +70,7 @@ export class OpenBaoClient {
5970
token: this._token,
6071
server: this._server,
6172
secretMountpoint: this._secretMountpoint,
73+
transitMountpoint: this._transitMountpoint,
6274
provider: this._provider,
6375
};
6476
}
@@ -177,6 +189,7 @@ async function openBaoConnect(
177189
provider: OpenBaoAuthConfigTag,
178190
mountpoint: string,
179191
secretMountpoint: string,
192+
transitMountpoint: string,
180193
): Promise<OpenBaoResult<OpenBaoClient>> {
181194
const connResult = await getConnectionUrl(openBaoServer, mountpoint);
182195
if (!connResult.ok) {
@@ -229,7 +242,15 @@ async function openBaoConnect(
229242
if (!result.ok) {
230243
return result;
231244
}
232-
const client = new OpenBaoClient(result.value.token, result.value.id, openBaoServer, provider, mountpoint, secretMountpoint);
245+
const client = new OpenBaoClient(
246+
result.value.token,
247+
result.value.id,
248+
openBaoServer,
249+
provider,
250+
mountpoint,
251+
secretMountpoint,
252+
transitMountpoint,
253+
);
233254
return { ok: true, value: client };
234255
} catch (err: any) {
235256
return { ok: false, error: { type: OpenBaoErrorType.InitError, detail: err.toString() } };

client/src/views/home/LoginPage.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ async function onLoginSSOClick(provider: OpenBaoAuthConfigTag): Promise<void> {
136136
provInfo.tag,
137137
provInfo.mountPath,
138138
serverConfigResult.value.openbao.secret.mountPath,
139+
serverConfigResult.value.openbao.transitMountPath,
139140
);
140141
141142
if (!connResult.ok) {

client/src/views/users/UpdateAuthenticationModal.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ async function onSSOLoginClicked(): Promise<void> {
244244
auth.tag,
245245
auth.mountPath,
246246
props.serverConfig.openbao.secret.mountPath,
247+
props.serverConfig.openbao.transitMountPath,
247248
);
248249
if (!result.ok) {
249250
if (result.error.type === OpenBaoErrorType.PopupFailed) {

0 commit comments

Comments
 (0)