diff --git a/bin/generate_rest.sh b/bin/generate_rest.sh
index 8e642723..ab9523c8 100755
--- a/bin/generate_rest.sh
+++ b/bin/generate_rest.sh
@@ -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
\ No newline at end of file
diff --git a/controller/frontendDetail.go b/controller/frontendDetail.go
index 7d8fa2db..ac5308e4 100644
--- a/controller/frontendDetail.go
+++ b/controller/frontendDetail.go
@@ -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(),
diff --git a/controller/orgAccountOverview.go b/controller/orgAccountOverview.go
index 2bea8b6a..7306f532 100644
--- a/controller/orgAccountOverview.go
+++ b/controller/orgAccountOverview.go
@@ -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(),
diff --git a/controller/overview.go b/controller/overview.go
index d75b79e1..bfde1d8d 100644
--- a/controller/overview.go
+++ b/controller/overview.go
@@ -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(),
diff --git a/rest_model_zrok/frontend.go b/rest_model_zrok/frontend.go
index 5e13f2c9..acc99a15 100644
--- a/rest_model_zrok/frontend.go
+++ b/rest_model_zrok/frontend.go
@@ -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"`
diff --git a/rest_server_zrok/embedded_spec.go b/rest_server_zrok/embedded_spec.go
index c5915a75..3481d0e3 100644
--- a/rest_server_zrok/embedded_spec.go
+++ b/rest_server_zrok/embedded_spec.go
@@ -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"
},
diff --git a/sdk/nodejs/sdk/src/zrok/api/model/frontend.ts b/sdk/nodejs/sdk/src/zrok/api/model/frontend.ts
index 6da24eca..0b94d65a 100644
--- a/sdk/nodejs/sdk/src/zrok/api/model/frontend.ts
+++ b/sdk/nodejs/sdk/src/zrok/api/model/frontend.ts
@@ -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"
},
{
diff --git a/sdk/python/sdk/zrok/docs/Frontend.md b/sdk/python/sdk/zrok/docs/Frontend.md
index 5a2a8f57..386e480a 100644
--- a/sdk/python/sdk/zrok/docs/Frontend.md
+++ b/sdk/python/sdk/zrok/docs/Frontend.md
@@ -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]
diff --git a/sdk/python/sdk/zrok/zrok_api/models/frontend.py b/sdk/python/sdk/zrok/zrok_api/models/frontend.py
index aa06fa74..8d6c8be8 100644
--- a/sdk/python/sdk/zrok/zrok_api/models/frontend.py
+++ b/sdk/python/sdk/zrok/zrok_api/models/frontend.py
@@ -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):
diff --git a/specs/zrok.yml b/specs/zrok.yml
index dd71a9d0..56abac2f 100644
--- a/specs/zrok.yml
+++ b/specs/zrok.yml
@@ -1215,7 +1215,7 @@ definitions:
properties:
id:
type: integer
- token:
+ feToken:
type: string
shrToken:
type: string
diff --git a/ui/src/AccessPanel.tsx b/ui/src/AccessPanel.tsx
index 4464249e..b4958188 100644
--- a/ui/src/AccessPanel.tsx
+++ b/ui/src/AccessPanel.tsx
@@ -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) => {
{String(access.data.label)}
- A private access frontend with the token {access.id}
+ A private access frontend with the frontend token {access.id}
diff --git a/ui/src/SharePanel.tsx b/ui/src/SharePanel.tsx
index 661f3b2d..4fc30920 100644
--- a/ui/src/SharePanel.tsx
+++ b/ui/src/SharePanel.tsx
@@ -92,7 +92,7 @@ const SharePanel = ({ share }: SharePanelProps) => {
{String(share.data.label)}
- A {detail ? detail.shareMode : ''}{detail && detail.reserved ? ', reserved ' : ''} {detail?.backendMode} share with the token {share.id}
+ A {detail ? detail.shareMode : ''}{detail && detail.reserved ? ', reserved ' : ''} {detail?.backendMode} share with the share token {share.id}
diff --git a/ui/src/api/models/Frontend.ts b/ui/src/api/models/Frontend.ts
index f7bfe3ab..b59425f1 100644
--- a/ui/src/api/models/Frontend.ts
+++ b/ui/src/api/models/Frontend.ts
@@ -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'],
diff --git a/ui/src/model/graph.ts b/ui/src/model/graph.ts
index bb9422c9..5dd7aaf3 100644
--- a/ui/src/model/graph.ts
+++ b/ui/src/model/graph.ts
@@ -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,