@ricsam/r5d-api 0.0.50 → 0.0.53

package/README.md

@@ -26,10 +26,12 @@ console.log(projects);
 ## Auth
 
 `R5dctlClient` supports:
-- interactive token (`r5dctl_tok_*`)
+
+- authorized device token (`r5d_device_*`)
 - API key (`r5dctl_key_*`)
 
 Set either `token` or `apiKey` in client options, or later via:
+
 - `client.setToken(...)`
 - `client.setApiKey(...)`
 
@@ -37,8 +39,11 @@ Trusted server-side callers that authenticate through custom headers, such as a
 
 ## Main API Surface
 
-- `auth.loginStart()`
-- `auth.loginPoll(requestId, { pollCode })`
+- `auth.deviceStart({ deviceName, workerLabel? })`
+- `auth.devicePoll(requestId, { deviceCode })`
+- `auth.deviceVerify({ userCode })`
+- `auth.deviceApprove({ userCode })` / `auth.deviceDeny({ userCode })`
+- `auth.devices.list()` / `auth.devices.revoke(id)`
 - `auth.status()`
 - `auth.logout()`
 - `auth.apiKeys.create/list/revoke`
@@ -67,6 +72,7 @@ Trusted server-side callers that authenticate through custom headers, such as a
 ## Errors
 
 Non-2xx responses throw `R5dctlApiError` with:
+
 - `status`
 - `path`
 - `body`

package/dist/cjs/index.cjs

@@ -119,22 +119,37 @@ class R5dctlClient {
     return payload;
   }
   auth = {
-    loginStart: (input) => this.request({
+    deviceStart: (input) => this.request({
       method: "POST",
-      path: "/api/r5dctl/auth/login/start",
+      path: "/api/auth/device/start",
       auth: "none",
-      body: {
-        baseUrl: input?.baseUrl
-      }
+      body: input
     }),
-    loginPoll: (requestId, input) => this.request({
-      method: "GET",
-      path: `/api/r5dctl/auth/login/poll/${encodeURIComponent(requestId)}`,
+    devicePoll: (requestId, input) => this.request({
+      method: "POST",
+      path: `/api/auth/device/poll/${encodeURIComponent(requestId)}`,
       auth: "none",
-      query: {
-        pollCode: input.pollCode
-      }
+      body: input
     }),
+    deviceVerify: (input) => this.request({
+      method: "POST",
+      path: "/api/auth/device/verify",
+      body: input
+    }),
+    deviceApprove: (input) => this.request({
+      method: "POST",
+      path: "/api/auth/device/approve",
+      body: input
+    }),
+    deviceDeny: (input) => this.request({
+      method: "POST",
+      path: "/api/auth/device/deny",
+      body: input
+    }),
+    devices: {
+      list: () => this.request({ method: "GET", path: "/api/auth/devices" }),
+      revoke: (id) => this.request({ method: "DELETE", path: `/api/auth/devices/${encodeURIComponent(id)}` })
+    },
     logout: () => this.request({
       method: "POST",
       path: "/api/r5dctl/auth/logout",
@@ -218,7 +233,8 @@ class R5dctlClient {
       path: "/api/user/managed-vcluster/resource-history",
       query: {
         workloadUid: input.workloadUid,
-        containerName: input.containerName
+        containerName: input.containerName,
+        window: input.window
       }
     })
   };

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-api",
-  "version": "0.0.50",
+  "version": "0.0.53",
   "type": "commonjs"
 }

package/dist/mjs/index.mjs

@@ -95,22 +95,37 @@ class R5dctlClient {
     return payload;
   }
   auth = {
-    loginStart: (input) => this.request({
+    deviceStart: (input) => this.request({
       method: "POST",
-      path: "/api/r5dctl/auth/login/start",
+      path: "/api/auth/device/start",
       auth: "none",
-      body: {
-        baseUrl: input?.baseUrl
-      }
+      body: input
     }),
-    loginPoll: (requestId, input) => this.request({
-      method: "GET",
-      path: `/api/r5dctl/auth/login/poll/${encodeURIComponent(requestId)}`,
+    devicePoll: (requestId, input) => this.request({
+      method: "POST",
+      path: `/api/auth/device/poll/${encodeURIComponent(requestId)}`,
       auth: "none",
-      query: {
-        pollCode: input.pollCode
-      }
+      body: input
     }),
+    deviceVerify: (input) => this.request({
+      method: "POST",
+      path: "/api/auth/device/verify",
+      body: input
+    }),
+    deviceApprove: (input) => this.request({
+      method: "POST",
+      path: "/api/auth/device/approve",
+      body: input
+    }),
+    deviceDeny: (input) => this.request({
+      method: "POST",
+      path: "/api/auth/device/deny",
+      body: input
+    }),
+    devices: {
+      list: () => this.request({ method: "GET", path: "/api/auth/devices" }),
+      revoke: (id) => this.request({ method: "DELETE", path: `/api/auth/devices/${encodeURIComponent(id)}` })
+    },
     logout: () => this.request({
       method: "POST",
       path: "/api/r5dctl/auth/logout",
@@ -194,7 +209,8 @@ class R5dctlClient {
       path: "/api/user/managed-vcluster/resource-history",
       query: {
         workloadUid: input.workloadUid,
-        containerName: input.containerName
+        containerName: input.containerName,
+        window: input.window
       }
     })
   };

package/dist/mjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-api",
-  "version": "0.0.50",
+  "version": "0.0.53",
   "type": "module"
 }

package/dist/types/index.d.ts

@@ -142,14 +142,16 @@ export type R5dctlAbortMergeResult = {
     status: "aborted";
     message: string;
 };
-export type R5dctlLoginStartResponse = {
+export type DeviceAuthorizationStartResponse = {
     requestId: string;
-    pollCode: string;
-    loginUrl: string;
+    deviceCode: string;
+    userCode: string;
+    verificationUri: string;
+    verificationUriComplete: string;
     expiresAt: string;
     intervalMs: number;
 };
-export type R5dctlLoginPollResponse = {
+export type DeviceAuthorizationPollResponse = {
     status: "pending";
     expiresAt: string;
     intervalMs: number;
@@ -158,11 +160,28 @@ export type R5dctlLoginPollResponse = {
     token: string;
     credentialId: string;
 } | {
-    status: "expired" | "consumed";
+    status: "denied" | "expired" | "consumed";
+};
+export type DeviceAuthorizationRequestDetails = {
+    requestId: string;
+    userCode: string;
+    deviceName: string;
+    workerLabel: string | null;
+    expiresAt: string;
+};
+export type AuthorizedDevice = {
+    id: string;
+    deviceName: string;
+    workerLabel: string | null;
+    createdAt: string;
+    lastUsedAt: string | null;
 };
 export type R5dctlAuthStatusResponse = {
     authenticated: true;
-    source: "session" | "r5dctl";
+    source: "session" | "device" | "api_key" | "user_worker";
+    credentialId: string | null;
+    credentialType: "device" | "api_key" | "user_worker" | null;
+    workerLabel: string | null;
     user: {
         id: string;
         email: string;
@@ -291,6 +310,7 @@ export type R5dctlK8sContainer = {
     pods: Array<R5dctlK8sUsage & {
         podUid: string;
         podName: string;
+        phase: string | null;
     }>;
 };
 export type R5dctlK8sWorkload = {
@@ -298,6 +318,8 @@ export type R5dctlK8sWorkload = {
     kind: "Deployment" | "StatefulSet" | "DaemonSet" | "CronJob" | "ReplicaSet" | "Job" | "Pod";
     namespace: string;
     name: string;
+    replicas: number;
+    readyReplicas: number;
     containers: R5dctlK8sContainer[];
 };
 export type R5dctlK8sResources = {
@@ -367,12 +389,34 @@ export declare class R5dctlClient {
     private resolveBearerToken;
     private request;
     readonly auth: {
-        loginStart: (input?: {
-            baseUrl?: string;
-        }) => Promise<R5dctlLoginStartResponse>;
-        loginPoll: (requestId: string, input: {
-            pollCode: string;
-        }) => Promise<R5dctlLoginPollResponse>;
+        deviceStart: (input: {
+            deviceName: string;
+            workerLabel?: string;
+        }) => Promise<DeviceAuthorizationStartResponse>;
+        devicePoll: (requestId: string, input: {
+            deviceCode: string;
+        }) => Promise<DeviceAuthorizationPollResponse>;
+        deviceVerify: (input: {
+            userCode: string;
+        }) => Promise<DeviceAuthorizationRequestDetails>;
+        deviceApprove: (input: {
+            userCode: string;
+        }) => Promise<{
+            approved: true;
+        }>;
+        deviceDeny: (input: {
+            userCode: string;
+        }) => Promise<{
+            denied: true;
+        }>;
+        devices: {
+            list: () => Promise<{
+                devices: AuthorizedDevice[];
+            }>;
+            revoke: (id: string) => Promise<{
+                success: true;
+            }>;
+        };
         logout: () => Promise<{
             success: boolean;
             revokedCredential: boolean;
@@ -414,6 +458,7 @@ export declare class R5dctlClient {
         resourceHistory: (input: {
             workloadUid: string;
             containerName: string;
+            window?: "24h" | "7d";
         }) => Promise<R5dctlK8sResourceHistory>;
     };
     readonly projects: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5d-api",
-  "version": "0.0.50",
+  "version": "0.0.53",
   "type": "module",
   "main": "./dist/cjs/index.cjs",
   "module": "./dist/mjs/index.mjs",