github-personal/openapi-ui
1
0
Fork 0
mirror of https://github.com/outbackdingo/openapi-ui.git synced 2026-01-28 02:19:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #90 from PRO-Robotech/feature/dev

Browse Source 
mp card standalone + backlink fixes | better status card | username auth field via envs
This commit is contained in:
typescreep
2025-08-06 17:16:30 +03:00
committed by GitHub
parent a44a186f4a 7058e49b8d
commit 7ffba2cd2c
8 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.env
View File

@@ -25,3 +25,4 @@ VITE_NODE_TERMINAL_DEFAULT_PROFILE=baseline
VITE_LOGIN_URL=/oauth/token
VITE_LOGOUT_URL=/oauth/logout
VITE_LOGIN_USERNAME_FIELD=name

1
.env.options.dist
View File

@@ -27,3 +27,4 @@ NODE_TERMINAL_DEFAULT_PROFILE=
VITE_LOGIN_URL=
VITE_LOGOUT_URL=
VITE_LOGIN_USERNAME_FIELD=

8
package-lock.json generated
View File

@@ -11,7 +11,7 @@
"@ant-design/icons": "5.6.0",
"@monaco-editor/react": "4.6.0",
"@originjs/vite-plugin-federation": "1.3.6",
"@prorobotech/openapi-k8s-toolkit": "^0.0.1-alpha.85",
"@prorobotech/openapi-k8s-toolkit": "^0.0.1-alpha.86",
"@readme/openapi-parser": "4.0.0",
"@reduxjs/toolkit": "2.2.5",
"@tanstack/react-query": "5.62.2",
@@ -2802,9 +2802,9 @@
}
},
"node_modules/@prorobotech/openapi-k8s-toolkit": {
"version": "0.0.1-alpha.85",
"resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-0.0.1-alpha.85.tgz",
"integrity": "sha512-fNs253E5+wtD5dmapwqGYwaErhfIKdjrLtRBq0yfPUeVtpakg1r+eUGreIHtHeezfFu48j8k0Ka1ZMMPhJgoWQ==",
"version": "0.0.1-alpha.86",
"resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-0.0.1-alpha.86.tgz",
"integrity": "sha512-/4U8TMTMIpUkeZ9rK2nY1fh3qRp7V32eKADaA1WJke13HerToCeJ3Y+eYivfZluw/DQysPveFQUV6oHtG2c2vQ==",
"license": "MIT",
"dependencies": {
"@monaco-editor/react": "4.6.0",

2
package.json
View File

@@ -20,7 +20,7 @@
"@ant-design/icons": "5.6.0",
"@monaco-editor/react": "4.6.0",
"@originjs/vite-plugin-federation": "1.3.6",
"@prorobotech/openapi-k8s-toolkit": "0.0.1-alpha.85",
"@prorobotech/openapi-k8s-toolkit": "0.0.1-alpha.86",
"@readme/openapi-parser": "4.0.0",
"@reduxjs/toolkit": "2.2.5",
"@tanstack/react-query": "5.62.2",

5
server/index.ts
View File

@@ -59,6 +59,8 @@ const NODE_TERMINAL_DEFAULT_PROFILE =
const LOGIN_URL = process.env.LOCAL === 'true' ? options?.LOGIN_URL : process.env.LOGIN_URL
const LOGOUT_URL = process.env.LOCAL === 'true' ? options?.LOGOUT_URL : process.env.LOGOUT_URL
const LOGIN_USERNAME_FIELD =
process.env.LOCAL === 'true' ? options?.LOGIN_USERNAME_FIELD : process.env.LOGIN_USERNAME_FIELD
const healthcheck = require('express-healthcheck')
const promBundle = require('express-prom-bundle')
@@ -181,7 +183,8 @@ app.get(`${basePrefix ? basePrefix : ''}/env.js`, (_, res) => {
INSTANCES_RESOURCE_NAME: ${JSON.stringify(INSTANCES_RESOURCE_NAME) || '"check envs"'},
NODE_TERMINAL_DEFAULT_PROFILE: ${JSON.stringify(NODE_TERMINAL_DEFAULT_PROFILE) || '"general"'},
LOGIN_URL: ${JSON.stringify(LOGIN_URL) || '"check envs"'},
LOGOUT_URL: ${JSON.stringify(LOGOUT_URL) || '"check envs"'}
LOGOUT_URL: ${JSON.stringify(LOGOUT_URL) || '"check envs"'},
LOGIN_USERNAME_FIELD: ${JSON.stringify(LOGIN_USERNAME_FIELD) || '"check envs"'}
}
`,
)

1
src/constants/customizationApiGroupAndVersion.ts
View File

@@ -31,3 +31,4 @@ export const NODE_TERMINAL_DEFAULT_PROFILE =
export const LOGIN_URL = window._env_.LOGIN_URL || import.meta.env.VITE_LOGIN_URL
export const LOGOUT_URL = window._env_.LOGOUT_URL || import.meta.env.VITE_LOGOUT_URL
export const LOGIN_USERNAME_FIELD = window._env_.LOGIN_USERNAME_FIELD || import.meta.env.VITE_LOGIN_USERNAME_FIELD

7
src/hooks/useAuth.ts
View File

@@ -1,5 +1,6 @@
import { useState, useEffect } from 'react'
import { login } from 'api/auth'
import { LOGIN_USERNAME_FIELD } from 'constants/customizationApiGroupAndVersion'
export const useAuth = () => {
const [fullName, setFullName] = useState<string>()
@@ -13,8 +14,10 @@ export const useAuth = () => {
login()
.then(data => {
if (data) {
setFullName(data.name)
setRequester({ name: data.name, email: data.email })
const userNameFieldKey = LOGIN_USERNAME_FIELD as keyof typeof data
const username = userNameFieldKey in data ? data[userNameFieldKey].toString() : 'No field'
setFullName(username)
setRequester({ name: username, email: data.email })
setLoadingAuth(false)
}
})

2
src/localTypes/auth.ts
View File

@@ -9,4 +9,4 @@ export type TAuthResponse = {
iss: string
name: string
sub: string
}
} & unknown