not working

Author: ahl

Cargo.lock

@@ -21,6 +21,7 @@ members = [
     "sled-agent",
     "sled-agent-client",
     "sp-sim",
+    "oxide-client",
     "oximeter/oximeter",
     "oximeter/collector",
     "oximeter/db",
@@ -50,6 +51,7 @@ default-members = [
     "sled-agent",
     "sled-agent-client",
     "sp-sim",
+    "oxide-client",
     "oximeter/oximeter",
     "oximeter/collector",
     "oximeter/db",
@@ -99,8 +101,8 @@ panic = "abort"
 #
 #[patch."https://github.com/oxidecomputer/progenitor"]
 #progenitor = { path = "../progenitor/progenitor" }
-#[patch."https://github.com/oxidecomputer/typify"]
-#typify = { path = "../typify/typify" }
+[patch.crates-io]
+typify = { git = "https://github.com/oxidecomputer/typify" }
 
 #
 # We maintain a fork of pq-sys to address upstream issues.  See the

Cargo.toml

@@ -61,7 +61,7 @@ pub struct DeviceAuthRequest {
     method = POST,
     path = "/device/auth",
     content_type = "application/x-www-form-urlencoded",
-    tags = ["hidden"], // "token"
+    unpublished = true,
 }]
 pub async fn device_auth_request(
     rqctx: Arc<RequestContext<Arc<ServerContext>>>,

nexus/src/external_api/device_auth.rs

@@ -17,7 +17,6 @@ API operations found with tag "hidden"
 OPERATION ID                             URL PATH
 device_access_token                      /device/token
 device_auth_confirm                      /device/confirm
-device_auth_request                      /device/auth
 logout                                   /logout
 session_me                               /session/me
 spoof_login                              /login

nexus/tests/output/nexus_tags.txt

@@ -478,36 +478,6 @@
         }
       }
     },
-    "/device/auth": {
-      "post": {
-        "tags": [
-          "hidden"
-        ],
-        "summary": "Start an OAuth 2.0 Device Authorization Grant",
-        "description": "This endpoint is designed to be accessed from an *unauthenticated* API client. It generates and records a `device_code` and `user_code` which must be verified and confirmed prior to a token being granted.",
-        "operationId": "device_auth_request",
-        "requestBody": {
-          "content": {
-            "application/x-www-form-urlencoded": {
-              "schema": {
-                "$ref": "#/components/schemas/DeviceAuthRequest"
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "default": {
-            "description": "",
-            "content": {
-              "*/*": {
-                "schema": {}
-              }
-            }
-          }
-        }
-      }
-    },
     "/device/confirm": {
       "post": {
         "tags": [
@@ -6779,18 +6749,6 @@
           "grant_type"
         ]
       },
-      "DeviceAuthRequest": {
-        "type": "object",
-        "properties": {
-          "client_id": {
-            "type": "string",
-            "format": "uuid"
-          }
-        },
-        "required": [
-          "client_id"
-        ]
-      },
       "DeviceAuthVerify": {
         "type": "object",
         "properties": {

openapi/nexus.json

@@ -0,0 +1,26 @@
+[package]
+name = "oxide-client"
+version = "0.1.0"
+edition = "2021"
+license = "MPL-2.0"
+
+[dependencies]
+progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
+#serde_json = "1.0"
+
+[dependencies.chrono]
+version = "0.4"
+features = [ "serde" ]
+
+[dependencies.reqwest]
+version = "0.11"
+default-features = false
+features = ["rustls-tls", "stream"]
+
+[dependencies.serde]
+version = "1.0"
+features = [ "derive" ]
+
+[dependencies.uuid]
+version = "1.1.0"
+features = [ "serde", "v4" ]

oxide-client/Cargo.toml

@@ -0,0 +1,11 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+//! Interface for making API requests to the Oxide control plane.
+
+// progenitor::generate_api!(
+//     spec = "../openapi/nexus.json",
+//     interface = Builder,
+//     tags = Separate,
+// );