@serve.zone/interfaces 1.0.74 → 1.0.76

package/dist_ts/00_commitinfo_data.d.ts

@@ -1,5 +1,5 @@
 /**
- * autocreated commitinfo by @pushrocks/commitinfo
+ * autocreated commitinfo by @push.rocks/commitinfo
  */
 export declare const commitinfo: {
     name: string;

package/dist_ts/00_commitinfo_data.js

@@ -1,9 +1,9 @@
 /**
- * autocreated commitinfo by @pushrocks/commitinfo
+ * autocreated commitinfo by @push.rocks/commitinfo
  */
 export const commitinfo = {
     name: '@serve.zone/interfaces',
-    version: '1.0.74',
+    version: '1.0.76',
     description: 'interfaces for working with containers'
 };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHdDQUF3QztDQUN0RCxDQUFBIn0=

package/dist_ts/data/cluster.d.ts

@@ -1,20 +1,19 @@
 import * as plugins from '../plugins.js';
 import type { IServer } from './server.js';
-export interface IClusterIdentifier {
-    clusterId: string;
-    clusterName: string;
-    jwt: string;
-}
 export interface ICluster {
     id: string;
     data: {
         name: string;
-        jumpCode: string;
+        initialJumpToken: string;
+        /**
+         * a cluster has a machine user that governs access rights.
+         */
+        userId: string;
         /**
          * when was the jump code used
          * avoid replay attacks
          */
-        jumpCodeUsedAt: number;
+        initialJumpTokenUsedAt?: number;
         /**
          * how can the cluster reach cloudly
          */

package/dist_ts/data/user.d.ts

@@ -1,8 +1,28 @@
+export interface IToken {
+    token: string;
+    expiresAt: number;
+    assignedRoles: string[];
+}
+/**
+ * an identity is assumed by authentication as a user
+ * an identity is ephemeral and has to be renewed regularly
+ */
+export interface IIdentity {
+    name: string;
+    userId: string;
+    type: 'machine' | 'human';
+    role: 'admin' | 'user' | 'api' | 'cluster';
+    expiresAt: number;
+    /** the jwt token should contain above data for verification */
+    jwt: string;
+}
 export interface IUser {
     id: string;
     data: {
+        type: 'machine' | 'human';
         role: 'admin' | 'user' | 'api' | 'cluster';
-        username: string;
-        password: string;
+        username?: string;
+        password?: string;
+        tokens?: IToken[];
     };
 }

package/dist_ts/requests/cluster.d.ts

@@ -1,4 +1,5 @@
-import type { ICluster } from '../data/cluster.js';
+import * as userInterfaces from '../data/user.js';
+import * as clusterInterfaces from '../data/cluster.js';
 import * as plugins from '../plugins.js';
 /**
  * get all clusters
@@ -6,20 +7,20 @@ import * as plugins from '../plugins.js';
 export interface IRequest_GetAllClusters extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_GetAllClusters> {
     method: 'getAllClusters';
     request: {
-        jwt: string;
+        identity: userInterfaces.IIdentity;
     };
     response: {
-        clusters: ICluster[];
+        clusters: clusterInterfaces.ICluster[];
     };
 }
 export interface IRequest_CreateCluster extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_CreateCluster> {
     method: 'createCluster';
     request: {
-        jwt: string;
+        identity: userInterfaces.IIdentity;
         clusterName: string;
     };
     response: {
-        clusterConfig: ICluster;
+        clusterConfig: clusterInterfaces.ICluster;
     };
 }
 /**
@@ -28,11 +29,11 @@ export interface IRequest_CreateCluster extends plugins.typedrequestInterfaces.i
 export interface IRequest_UpdateCluster extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_UpdateCluster> {
     method: 'updateCluster';
     request: {
-        jwt: string;
-        clusterConfig: ICluster;
+        identity: userInterfaces.IIdentity;
+        clusterConfig: clusterInterfaces.ICluster;
     };
     response: {
-        clusterConfig: ICluster;
+        clusterConfig: clusterInterfaces.ICluster;
     };
 }
 /**
@@ -41,7 +42,7 @@ export interface IRequest_UpdateCluster extends plugins.typedrequestInterfaces.i
 export interface IRequest_DeleteCluster extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_DeleteCluster> {
     method: 'deleteCluster';
     request: {
-        jwt: string;
+        identity: userInterfaces.IIdentity;
         clusterId: string;
     };
     response: {

package/dist_ts/requests/cluster.js

@@ -1,2 +1,4 @@
+import * as userInterfaces from '../data/user.js';
+import * as clusterInterfaces from '../data/cluster.js';
 import * as plugins from '../plugins.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2x1c3Rlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL3JlcXVlc3RzL2NsdXN0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLE9BQU8sTUFBTSxlQUFlLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2x1c3Rlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL3JlcXVlc3RzL2NsdXN0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLGNBQWMsTUFBTSxpQkFBaUIsQ0FBQztBQUNsRCxPQUFPLEtBQUssaUJBQWlCLE1BQU0sb0JBQW9CLENBQUM7QUFDeEQsT0FBTyxLQUFLLE9BQU8sTUFBTSxlQUFlLENBQUMifQ==

package/dist_ts/requests/config.d.ts

@@ -1,11 +1,12 @@
 import * as plugins from '../plugins.js';
 import * as clusterInterfaces from '../data/cluster.js';
 import * as serverInterfaces from '../data/server.js';
+import * as userInterfaces from '../data/user.js';
 import type { IDeploymentDirective } from '../data/deploymentdirective.js';
 export interface IRequest_Any_Cloudly_GetServerConfig extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_Any_Cloudly_GetServerConfig> {
     method: 'getServerConfig';
     request: {
-        jwt: string;
+        identity: userInterfaces.IIdentity;
         serverId: string;
     };
     response: {
@@ -15,8 +16,7 @@ export interface IRequest_Any_Cloudly_GetServerConfig extends plugins.typedreque
 export interface IRequest_Any_Cloudly_GetClusterConfig extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_Any_Cloudly_GetClusterConfig> {
     method: 'getClusterConfig';
     request: {
-        jwt: string;
-        clusterIdentifier: clusterInterfaces.IClusterIdentifier;
+        identity: userInterfaces.IIdentity;
     };
     response: {
         configData: clusterInterfaces.ICluster;

package/dist_ts/requests/config.js

@@ -1,4 +1,5 @@
 import * as plugins from '../plugins.js';
 import * as clusterInterfaces from '../data/cluster.js';
 import * as serverInterfaces from '../data/server.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvcmVxdWVzdHMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sZUFBZSxDQUFDO0FBQ3pDLE9BQU8sS0FBSyxpQkFBaUIsTUFBTSxvQkFBb0IsQ0FBQztBQUN4RCxPQUFPLEtBQUssZ0JBQWdCLE1BQU0sbUJBQW1CLENBQUMifQ==
+import * as userInterfaces from '../data/user.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvcmVxdWVzdHMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sZUFBZSxDQUFDO0FBQ3pDLE9BQU8sS0FBSyxpQkFBaUIsTUFBTSxvQkFBb0IsQ0FBQztBQUN4RCxPQUFPLEtBQUssZ0JBQWdCLE1BQU0sbUJBQW1CLENBQUM7QUFDdEQsT0FBTyxLQUFLLGNBQWMsTUFBTSxpQkFBaUIsQ0FBQyJ9

package/dist_ts/requests/identity.d.ts

@@ -1,5 +1,5 @@
 import * as plugins from '../plugins.js';
-import * as clusterInterfaces from '../data/cluster.js';
+import * as userInterfaces from '../data/user.js';
 /**
  * get the identity that then will be used to get the config
  */
@@ -9,6 +9,6 @@ export interface IRequest_Any_Cloudly_CoreflowManager_GetIdentityByJumpCode exte
         jumpCode: string;
     };
     response: {
-        clusterIdentifier: clusterInterfaces.IClusterIdentifier;
+        clusterIdentifier: userInterfaces.IIdentity;
     };
 }

package/dist_ts/requests/identity.js

@@ -1,3 +1,3 @@
 import * as plugins from '../plugins.js';
-import * as clusterInterfaces from '../data/cluster.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9yZXF1ZXN0cy9pZGVudGl0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGVBQWUsQ0FBQztBQUN6QyxPQUFPLEtBQUssaUJBQWlCLE1BQU0sb0JBQW9CLENBQUMifQ==
+import * as userInterfaces from '../data/user.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9yZXF1ZXN0cy9pZGVudGl0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGVBQWUsQ0FBQztBQUN6QyxPQUFPLEtBQUssY0FBYyxNQUFNLGlCQUFpQixDQUFBIn0=

package/dist_ts/requests/image.d.ts

@@ -1,9 +1,10 @@
 import * as plugins from '../plugins.js';
+import * as userInterfaces from '../data/user.js';
 import type { IImage } from '../data/index.js';
 export interface IRequest_GetAllImages extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_GetAllImages> {
     method: 'getAllImages';
     request: {
-        jwt: string;
+        identity: userInterfaces.IIdentity;
     };
     response: {
         images: IImage[];
@@ -15,7 +16,7 @@ export interface IRequest_GetAllImages extends plugins.typedrequestInterfaces.im
 export interface IRequest_GetImageMetadata extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_GetImageMetadata> {
     method: 'getImageMetadata';
     request: {
-        jwt: string;
+        identity: userInterfaces.IIdentity;
         imageId: string;
     };
     response: {
@@ -25,7 +26,7 @@ export interface IRequest_GetImageMetadata extends plugins.typedrequestInterface
 export interface IRequest_CreateImage extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_CreateImage> {
     method: 'createImage';
     request: {
-        jwt: string;
+        identity: userInterfaces.IIdentity;
         name: string;
         description: string;
     };
@@ -36,7 +37,7 @@ export interface IRequest_CreateImage extends plugins.typedrequestInterfaces.imp
 export interface IRequest_PushImageVersion extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_PushImageVersion> {
     method: 'pushImageVersion';
     request: {
-        jwt: string;
+        identity: userInterfaces.IIdentity;
         imageId: string;
         versionString: string;
         imageStream: plugins.typedrequestInterfaces.IVirtualStream;
@@ -48,7 +49,7 @@ export interface IRequest_PushImageVersion extends plugins.typedrequestInterface
 export interface IRequest_PullImageVersion extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_PullImageVersion> {
     method: 'pullImageVersion';
     request: {
-        jwt: string;
+        identity: userInterfaces.IIdentity;
         imageId: string;
         versionString: string;
     };
@@ -59,7 +60,7 @@ export interface IRequest_PullImageVersion extends plugins.typedrequestInterface
 export interface IRequest_DeleteImage extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_DeleteImage> {
     method: 'deleteImage';
     request: {
-        jwt: string;
+        identity: userInterfaces.IIdentity;
         imageId: string;
     };
     response: {};

package/dist_ts/requests/image.js

@@ -1,2 +1,3 @@
 import * as plugins from '../plugins.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1hZ2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9yZXF1ZXN0cy9pbWFnZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGVBQWUsQ0FBQyJ9
+import * as userInterfaces from '../data/user.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1hZ2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9yZXF1ZXN0cy9pbWFnZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGVBQWUsQ0FBQztBQUN6QyxPQUFPLEtBQUssY0FBYyxNQUFNLGlCQUFpQixDQUFDIn0=

package/dist_ts/requests/secret.d.ts

@@ -1,5 +1,6 @@
 import * as plugins from '../plugins.js';
 import * as data from '../data/index.js';
+import * as userInterfaces from '../data/user.js';
 export interface IReq_GetEnvBundle extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_GetEnvBundle> {
     method: 'getEnvBundle';
     request: {
@@ -20,13 +21,13 @@ export interface IReq_Admin_LoginWithUsernameAndPassword extends plugins.typedre
         password: string;
     };
     response: {
-        jwt: string;
+        identity: userInterfaces.IIdentity;
     };
 }
 export interface IReq_Admin_GetConfigBundlesAndSecretGroups extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Admin_GetConfigBundlesAndSecretGroups> {
     method: 'adminGetConfigBundlesAndSecretGroups';
     request: {
-        jwt: string;
+        identity: userInterfaces.IIdentity;
     };
     response: {
         secretBundles: data.ISecretBundle[];
@@ -36,7 +37,7 @@ export interface IReq_Admin_GetConfigBundlesAndSecretGroups extends plugins.type
 export interface IReq_Admin_CreateConfigBundlesAndSecretGroups extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Admin_CreateConfigBundlesAndSecretGroups> {
     method: 'adminCreateConfigBundlesAndSecretGroups';
     request: {
-        jwt: string;
+        identity: userInterfaces.IIdentity;
         secretBundles: data.ISecretBundle[];
         secretGroups: data.ISecretGroup[];
     };
@@ -47,7 +48,7 @@ export interface IReq_Admin_CreateConfigBundlesAndSecretGroups extends plugins.t
 export interface IReq_Admin_UpdateConfigBundlesAndSecretGroups extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Admin_UpdateConfigBundlesAndSecretGroups> {
     method: 'adminUpdateConfigBundlesAndSecretGroups';
     request: {
-        jwt: string;
+        identity: userInterfaces.IIdentity;
         configBundles: data.ISecretBundle[];
         secretGroups: data.ISecretGroup[];
     };
@@ -58,7 +59,7 @@ export interface IReq_Admin_UpdateConfigBundlesAndSecretGroups extends plugins.t
 export interface IReq_Admin_DeleteConfigBundlesAndSecretGroups extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Admin_DeleteConfigBundlesAndSecretGroups> {
     method: 'adminDeleteConfigBundlesAndSecretGroups';
     request: {
-        jwt: string;
+        identity: userInterfaces.IIdentity;
         secretBundleIds: string[];
         secretGroupIds: string[];
     };

package/dist_ts/requests/secret.js

@@ -1,3 +1,4 @@
 import * as plugins from '../plugins.js';
 import * as data from '../data/index.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VjcmV0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvcmVxdWVzdHMvc2VjcmV0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sZUFBZSxDQUFDO0FBQ3pDLE9BQU8sS0FBSyxJQUFJLE1BQU0sa0JBQWtCLENBQUMifQ==
+import * as userInterfaces from '../data/user.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VjcmV0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvcmVxdWVzdHMvc2VjcmV0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sZUFBZSxDQUFDO0FBQ3pDLE9BQU8sS0FBSyxJQUFJLE1BQU0sa0JBQWtCLENBQUM7QUFDekMsT0FBTyxLQUFLLGNBQWMsTUFBTSxpQkFBaUIsQ0FBQyJ9

package/dist_ts/requests/status.d.ts

@@ -1,11 +1,11 @@
-import * as clusterInterfaces from '../data/cluster.js';
+import * as userInterfaces from '../data/user.js';
 /**
  * a status update dashboard
  */
 export interface IRequest_Coreflow_Cloudly_CoreflowManagerStatusupdate {
     method: 'cloudlyStatus';
     request: {
-        clusterIdentifier: clusterInterfaces.IClusterIdentifier;
+        identity: userInterfaces.IIdentity;
     };
     response: {};
 }

package/dist_ts/requests/status.js

@@ -1,2 +1,2 @@
-import * as clusterInterfaces from '../data/cluster.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhdHVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvcmVxdWVzdHMvc3RhdHVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxpQkFBaUIsTUFBTSxvQkFBb0IsQ0FBQyJ9
+import * as userInterfaces from '../data/user.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhdHVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvcmVxdWVzdHMvc3RhdHVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxjQUFjLE1BQU0saUJBQWlCLENBQUMifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serve.zone/interfaces",
-  "version": "1.0.74",
+  "version": "1.0.76",
   "private": false,
   "description": "interfaces for working with containers",
   "main": "dist_ts/index.js",

package/ts/00_commitinfo_data.ts

@@ -1,8 +1,8 @@
 /**
- * autocreated commitinfo by @pushrocks/commitinfo
+ * autocreated commitinfo by @push.rocks/commitinfo
  */
 export const commitinfo = {
   name: '@serve.zone/interfaces',
-  version: '1.0.74',
+  version: '1.0.76',
   description: 'interfaces for working with containers'
 }

package/ts/data/cluster.ts

@@ -3,23 +3,22 @@ import * as plugins from '../plugins.js';
 import { type IDockerRegistryInfo } from '../data/docker.js';
 import type { IServer } from './server.js';
 
-export interface IClusterIdentifier {
-  clusterId: string;
-  clusterName: string;
-  jwt: string;
-}
-
 export interface ICluster {
   id: string;
   data: {
     name: string;
-    jumpCode: string;
+    initialJumpToken: string;
+
+    /**
+     * a cluster has a machine user that governs access rights.
+     */
+    userId: string;
 
     /**
      * when was the jump code used
      * avoid replay attacks
      */
-    jumpCodeUsedAt: number;
+    initialJumpTokenUsedAt?: number;
     
     /**
      * how can the cluster reach cloudly

package/ts/data/user.ts

@@ -1,8 +1,30 @@
+export interface IToken {
+  token: string;
+  expiresAt: number;
+  assignedRoles: string[];
+}
+
+/**
+ * an identity is assumed by authentication as a user
+ * an identity is ephemeral and has to be renewed regularly
+ */
+export interface IIdentity {
+  name: string;
+  userId: string;
+  type: 'machine' | 'human';
+  role: 'admin' | 'user' | 'api' | 'cluster';
+  expiresAt: number;
+  /** the jwt token should contain above data for verification */
+  jwt: string;
+}
+
 export interface IUser {
   id: string;
   data: {
+    type: 'machine' | 'human';
     role: 'admin' | 'user' | 'api' | 'cluster';
-    username: string;
-    password: string;
+    username?: string;
+    password?: string;
+    tokens?: IToken[];
   }
 }

package/ts/requests/cluster.ts

@@ -1,4 +1,5 @@
-import type { ICluster } from '../data/cluster.js';
+import * as userInterfaces from '../data/user.js';
+import * as clusterInterfaces from '../data/cluster.js';
 import * as plugins from '../plugins.js';
 
 /**
@@ -10,10 +11,10 @@ export interface IRequest_GetAllClusters extends plugins.typedrequestInterfaces.
 > {
   method: 'getAllClusters';
   request: {
-    jwt: string;
+    identity: userInterfaces.IIdentity;
   };
   response: {
-    clusters: ICluster[];
+    clusters: clusterInterfaces.ICluster[];
   };
 }
 
@@ -23,11 +24,11 @@ export interface IRequest_CreateCluster extends plugins.typedrequestInterfaces.i
 > {
   method: 'createCluster';
   request: {
-    jwt: string;
+    identity: userInterfaces.IIdentity;
     clusterName: string;
   };
   response: {
-    clusterConfig: ICluster;
+    clusterConfig: clusterInterfaces.ICluster;
   };
 }
 
@@ -40,11 +41,11 @@ export interface IRequest_UpdateCluster extends plugins.typedrequestInterfaces.i
 > {
   method: 'updateCluster';
   request: {
-    jwt: string;
-    clusterConfig: ICluster;
+    identity: userInterfaces.IIdentity;
+    clusterConfig: clusterInterfaces.ICluster;
   };
   response: {
-    clusterConfig: ICluster;
+    clusterConfig: clusterInterfaces.ICluster;
   };
 }
 
@@ -57,7 +58,7 @@ export interface IRequest_DeleteCluster extends plugins.typedrequestInterfaces.i
 > {
   method: 'deleteCluster';
   request: {
-    jwt: string;
+    identity: userInterfaces.IIdentity;
     clusterId: string;
   };
   response: {

package/ts/requests/config.ts

@@ -1,6 +1,7 @@
 import * as plugins from '../plugins.js';
 import * as clusterInterfaces from '../data/cluster.js';
 import * as serverInterfaces from '../data/server.js';
+import * as userInterfaces from '../data/user.js';
 import type { IService } from '../data/service.js';
 import type { IDeploymentDirective } from '../data/deploymentdirective.js';
 
@@ -11,7 +12,7 @@ extends plugins.typedrequestInterfaces.implementsTR<
 > {
   method: 'getServerConfig';
   request: {
-    jwt: string;
+    identity: userInterfaces.IIdentity;
     serverId: string;
   };
   response: {
@@ -26,8 +27,7 @@ extends plugins.typedrequestInterfaces.implementsTR<
 > {
   method: 'getClusterConfig';
   request: {
-    jwt: string;
-    clusterIdentifier: clusterInterfaces.IClusterIdentifier;
+    identity: userInterfaces.IIdentity;
   };
   response: {
     configData: clusterInterfaces.ICluster;

package/ts/requests/identity.ts

@@ -1,5 +1,5 @@
 import * as plugins from '../plugins.js';
-import * as clusterInterfaces from '../data/cluster.js';
+import * as userInterfaces from '../data/user.js'
 
 // ========
 // IDENTITY
@@ -18,6 +18,6 @@ extends plugins.typedrequestInterfaces.implementsTR<
     jumpCode: string;
   };
   response: {
-    clusterIdentifier: clusterInterfaces.IClusterIdentifier;
+    clusterIdentifier: userInterfaces.IIdentity;
   };
 }

package/ts/requests/image.ts

@@ -1,4 +1,5 @@
 import * as plugins from '../plugins.js';
+import * as userInterfaces from '../data/user.js';
 
 import type { IImage } from '../data/index.js';
 
@@ -8,7 +9,7 @@ export interface IRequest_GetAllImages extends plugins.typedrequestInterfaces.im
 > {
   method: 'getAllImages';
   request: {
-    jwt: string;
+    identity: userInterfaces.IIdentity;
   };
   response: {
     images: IImage[];
@@ -24,7 +25,7 @@ export interface IRequest_GetImageMetadata extends plugins.typedrequestInterface
 > {
   method: 'getImageMetadata';
   request: {
-    jwt: string;
+    identity: userInterfaces.IIdentity;
     imageId: string;
   };
   response: {
@@ -38,7 +39,7 @@ export interface IRequest_CreateImage extends plugins.typedrequestInterfaces.imp
 > {
   method: 'createImage';
   request: {
-    jwt: string;
+    identity: userInterfaces.IIdentity;
     name: string;
     description: string;
   };
@@ -54,7 +55,7 @@ export interface IRequest_PushImageVersion extends plugins.typedrequestInterface
 > {
   method: 'pushImageVersion';
   request: {
-    jwt: string;
+    identity: userInterfaces.IIdentity;
     imageId: string;
     versionString: string;
     imageStream: plugins.typedrequestInterfaces.IVirtualStream;
@@ -70,7 +71,7 @@ export interface IRequest_PullImageVersion extends plugins.typedrequestInterface
 > {
   method: 'pullImageVersion';
   request: {
-    jwt: string;
+    identity: userInterfaces.IIdentity;
     imageId: string;
     versionString: string;
   };
@@ -85,7 +86,7 @@ export interface IRequest_DeleteImage extends plugins.typedrequestInterfaces.imp
 > {
   method: 'deleteImage';
   request: {
-    jwt: string;
+    identity: userInterfaces.IIdentity;
     imageId: string;
   };
   response: {

package/ts/requests/secret.ts

@@ -1,5 +1,6 @@
 import * as plugins from '../plugins.js';
 import * as data from '../data/index.js';
+import * as userInterfaces from '../data/user.js';
 
 export interface IReq_GetEnvBundle extends plugins.typedrequestInterfaces.implementsTR<
   plugins.typedrequestInterfaces.ITypedRequest,
@@ -28,7 +29,7 @@ export interface IReq_Admin_LoginWithUsernameAndPassword extends plugins.typedre
     password: string;
   };
   response: {
-    jwt: string;
+    identity: userInterfaces.IIdentity;
   }
 }
 
@@ -38,7 +39,7 @@ export interface IReq_Admin_GetConfigBundlesAndSecretGroups extends plugins.type
 > {
   method: 'adminGetConfigBundlesAndSecretGroups';
   request: {
-    jwt: string;
+    identity: userInterfaces.IIdentity;
   };
   response: {
     secretBundles: data.ISecretBundle[];
@@ -53,7 +54,7 @@ export interface IReq_Admin_CreateConfigBundlesAndSecretGroups extends plugins.t
 > {
   method: 'adminCreateConfigBundlesAndSecretGroups';
   request: {
-    jwt: string;
+    identity: userInterfaces.IIdentity;
     secretBundles: data.ISecretBundle[];
     secretGroups: data.ISecretGroup[];
   };
@@ -68,7 +69,7 @@ export interface IReq_Admin_UpdateConfigBundlesAndSecretGroups extends plugins.t
 > {
   method: 'adminUpdateConfigBundlesAndSecretGroups';
   request: {
-    jwt: string;
+    identity: userInterfaces.IIdentity;
     configBundles: data.ISecretBundle[];
     secretGroups: data.ISecretGroup[];
   };
@@ -83,7 +84,7 @@ export interface IReq_Admin_DeleteConfigBundlesAndSecretGroups extends plugins.t
 > {
   method: 'adminDeleteConfigBundlesAndSecretGroups';
   request: {
-    jwt: string;
+    identity: userInterfaces.IIdentity;
     secretBundleIds: string[];
     secretGroupIds: string[];
   };

package/ts/requests/status.ts

@@ -1,4 +1,4 @@
-import * as clusterInterfaces from '../data/cluster.js';
+import * as userInterfaces from '../data/user.js';
 
 /**
  * a status update dashboard
@@ -6,7 +6,7 @@ import * as clusterInterfaces from '../data/cluster.js';
 export interface IRequest_Coreflow_Cloudly_CoreflowManagerStatusupdate {
   method: 'cloudlyStatus';
   request: {
-    clusterIdentifier: clusterInterfaces.IClusterIdentifier;
+    identity: userInterfaces.IIdentity;
   };
   response: {};
 }