extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-06-25 20:22:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

frontend token shorthand 'feToken' (#820, #834)

Browse Source
This commit is contained in:
Michael Quigley 2025-02-04 11:30:28 -05:00
parent 5821280dff
commit 503dd432c9
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
14 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/generate_rest.sh
View File

@ -37,16 +37,16 @@ swagger generate server -P rest_model_zrok.Principal -f "$zrokSpec" -s rest_serv
echo "...generating zrok client"
swagger generate client -P rest_model_zrok.Principal -f "$zrokSpec" -c rest_client_zrok -t "$zrokDir" -m "rest_model_zrok"
echo "...generating ui api console ts client"
echo "...generating api console ts client"
openapi-generator-cli generate -i specs/zrok.yml -o ui/src/api -g typescript-fetch
echo "...generating agent console js client"
echo "...generating agent console ts client"
openapi-generator-cli generate -i agent/agentGrpc/agent.swagger.json -o agent/agentUi/src/api -g typescript-fetch
echo "...generating ts client"
echo "...generating nodejs sdk ts client"
openapi-generator-cli generate -i specs/zrok.yml -o sdk/nodejs/sdk/src/zrok/api -g typescript-node
echo "...generating python client"
echo "...generating python sdk client"
swagger-codegen generate -i specs/zrok.yml -o sdk/python/sdk/zrok -c $pythonConfig -l python
git checkout rest_server_zrok/configure_zrok.go

2
controller/frontendDetail.go
View File

@ -47,7 +47,7 @@ func (h *getFrontendDetailHandler) Handle(params metadata.GetFrontendDetailParam
}
payload := &rest_model_zrok.Frontend{
ID: int64(fe.Id),
Token: fe.Token,
FeToken: fe.Token,
ZID: fe.ZId,
CreatedAt: fe.CreatedAt.UnixMilli(),
UpdatedAt: fe.UpdatedAt.UnixMilli(),

2
controller/orgAccountOverview.go
View File

@ -121,7 +121,7 @@ func (h *orgAccountOverviewHandler) Handle(params metadata.OrgAccountOverviewPar
for _, fe := range fes {
envFe := &rest_model_zrok.Frontend{
ID: int64(fe.Id),
Token: fe.Token,
FeToken: fe.Token,
ZID: fe.ZId,
CreatedAt: fe.CreatedAt.UnixMilli(),
UpdatedAt: fe.UpdatedAt.UnixMilli(),

2
controller/overview.go
View File

@ -87,7 +87,7 @@ func (h *overviewHandler) Handle(_ metadata.OverviewParams, principal *rest_mode
for _, fe := range fes {
envFe := &rest_model_zrok.Frontend{
ID: int64(fe.Id),
Token: fe.Token,
FeToken: fe.Token,
ZID: fe.ZId,
CreatedAt: fe.CreatedAt.UnixMilli(),
UpdatedAt: fe.UpdatedAt.UnixMilli(),

6
rest_model_zrok/frontend.go
View File

@ -20,15 +20,15 @@ type Frontend struct {
// created at
CreatedAt int64 `json:"createdAt,omitempty"`
// fe token
FeToken string `json:"feToken,omitempty"`
// id
ID int64 `json:"id,omitempty"`
// shr token
ShrToken string `json:"shrToken,omitempty"`
// token
Token string `json:"token,omitempty"`
// updated at
UpdatedAt int64 `json:"updatedAt,omitempty"`

12
rest_server_zrok/embedded_spec.go
View File

@ -1952,15 +1952,15 @@ func init() {
"createdAt": {
"type": "integer"
},
"feToken": {
"type": "string"
},
"id": {
"type": "integer"
},
"shrToken": {
"type": "string"
},
"token": {
"type": "string"
},
"updatedAt": {
"type": "integer"
},
@ -4154,15 +4154,15 @@ func init() {
"createdAt": {
"type": "integer"
},
"feToken": {
"type": "string"
},
"id": {
"type": "integer"
},
"shrToken": {
"type": "string"
},
"token": {
"type": "string"
},
"updatedAt": {
"type": "integer"
},

6
sdk/nodejs/sdk/src/zrok/api/model/frontend.ts
View File

@ -14,7 +14,7 @@ import { RequestFile } from './models';
export class Frontend {
'id'?: number;
'token'?: string;
'feToken'?: string;
'shrToken'?: string;
'zId'?: string;
'createdAt'?: number;
@ -29,8 +29,8 @@ export class Frontend {
"type": "number"
},
{
"name": "token",
"baseName": "token",
"name": "feToken",
"baseName": "feToken",
"type": "string"
},
{

2
sdk/python/sdk/zrok/docs/Frontend.md
View File

@ -4,7 +4,7 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**id** | **int** | | [optional]
**token** | **str** | | [optional]
**fe_token** | **str** | | [optional]
**shr_token** | **str** | | [optional]
**z_id** | **str** | | [optional]
**created_at** | **int** | | [optional]

30
sdk/python/sdk/zrok/zrok_api/models/frontend.py
View File

@ -29,7 +29,7 @@ class Frontend(object):
"""
swagger_types = {
'id': 'int',
'token': 'str',
'fe_token': 'str',
'shr_token': 'str',
'z_id': 'str',
'created_at': 'int',
@ -38,17 +38,17 @@ class Frontend(object):
attribute_map = {
'id': 'id',
'token': 'token',
'fe_token': 'feToken',
'shr_token': 'shrToken',
'z_id': 'zId',
'created_at': 'createdAt',
'updated_at': 'updatedAt'
}
def __init__(self, id=None, token=None, shr_token=None, z_id=None, created_at=None, updated_at=None): # noqa: E501
def __init__(self, id=None, fe_token=None, shr_token=None, z_id=None, created_at=None, updated_at=None): # noqa: E501
"""Frontend - a model defined in Swagger""" # noqa: E501
self._id = None
self._token = None
self._fe_token = None
self._shr_token = None
self._z_id = None
self._created_at = None
@ -56,8 +56,8 @@ class Frontend(object):
self.discriminator = None
if id is not None:
self.id = id
if token is not None:
self.token = token
if fe_token is not None:
self.fe_token = fe_token
if shr_token is not None:
self.shr_token = shr_token
if z_id is not None:
@ -89,25 +89,25 @@ class Frontend(object):
self._id = id
@property
def token(self):
"""Gets the token of this Frontend. # noqa: E501
def fe_token(self):
"""Gets the fe_token of this Frontend. # noqa: E501
:return: The token of this Frontend. # noqa: E501
:return: The fe_token of this Frontend. # noqa: E501
:rtype: str
"""
return self._token
return self._fe_token
@token.setter
def token(self, token):
"""Sets the token of this Frontend.
@fe_token.setter
def fe_token(self, fe_token):
"""Sets the fe_token of this Frontend.
:param token: The token of this Frontend. # noqa: E501
:param fe_token: The fe_token of this Frontend. # noqa: E501
:type: str
"""
self._token = token
self._fe_token = fe_token
@property
def shr_token(self):

2
specs/zrok.yml
View File

@ -1215,7 +1215,7 @@ definitions:
properties:
id:
type: integer
token:
feToken:
type: string
shrToken:
type: string

4
ui/src/AccessPanel.tsx
View File

@ -44,7 +44,7 @@ const AccessPanel = ({ access }: AccessPanelProps) => {
const labels = {
createdAt: "Created",
shrToken: "Share Token",
token: "Frontend Token",
feToken: "Frontend Token",
updatedAt: "Updated",
}
@ -58,7 +58,7 @@ const AccessPanel = ({ access }: AccessPanelProps) => {
<Grid2 display="flex" component="h3">{String(access.data.label)}</Grid2>
</Grid2>
<Grid2 container sx={{ flexGrow: 1, mt: 0, mb: 2, p: 0 }} alignItems="center">
<h5 style={{ margin: 0 }}>A private access frontend with the token <code>{access.id}</code></h5>
<h5 style={{ margin: 0 }}>A private access frontend with the frontend token <code>{access.id}</code></h5>
</Grid2>
<Grid2 container sx={{ flexGrow: 1, mb: 3 }} alignItems="left">
<Tooltip title="Release Access">

2
ui/src/SharePanel.tsx
View File

@ -92,7 +92,7 @@ const SharePanel = ({ share }: SharePanelProps) => {
<Grid2 display="flex" component="h4">{String(share.data.label)}</Grid2>
</Grid2>
<Grid2 container sx={{ flexGrow: 1, mt: 0, mb: 2 }} alignItems="center">
<h5 style={{ margin: 0 }}>A {detail ? detail.shareMode : ''}{detail && detail.reserved ? ', reserved ' : ''} {detail?.backendMode} share with the token <code>{share.id}</code></h5>
<h5 style={{ margin: 0 }}>A {detail ? detail.shareMode : ''}{detail && detail.reserved ? ', reserved ' : ''} {detail?.backendMode} share with the share token <code>{share.id}</code></h5>
</Grid2>
<Grid2 container sx={{ flexGrow: 1, mb: 3 }} alignItems="left">
<Tooltip title="Share Metrics">

6
ui/src/api/models/Frontend.ts
View File

@ -30,7 +30,7 @@ export interface Frontend {
* @type {string}
* @memberof Frontend
*/
token?: string;
feToken?: string;
/**
*
* @type {string}
@ -75,7 +75,7 @@ export function FrontendFromJSONTyped(json: any, ignoreDiscriminator: boolean):
return {
'id': json['id'] == null ? undefined : json['id'],
'token': json['token'] == null ? undefined : json['token'],
'feToken': json['feToken'] == null ? undefined : json['feToken'],
'shrToken': json['shrToken'] == null ? undefined : json['shrToken'],
'zId': json['zId'] == null ? undefined : json['zId'],
'createdAt': json['createdAt'] == null ? undefined : json['createdAt'],
@ -90,7 +90,7 @@ export function FrontendToJSON(value?: Frontend | null): any {
return {
'id': value['id'],
'token': value['token'],
'feToken': value['feToken'],
'shrToken': value['shrToken'],
'zId': value['zId'],
'createdAt': value['createdAt'],

4
ui/src/model/graph.ts
View File

@ -78,9 +78,9 @@ export const mergeGraph = (oldVov: Graph, u: User, limited: boolean, newOv: Over
envNode.data.empty = false;
env.frontends.forEach(fe => {
let feNode = {
id: fe.token!,
id: fe.feToken!,
data: {
label: fe.token!,
label: fe.feToken!,
feId: fe.id,
target: fe.shrToken,
envZId: fe.zId,