@fleetkeep/cli 0.1.0 → 0.1.2

package/auth.mjs

@@ -39,6 +39,7 @@ export function oauthConfig() {
   }
   return {
     origin,
+    resource: `${origin}/api`,
     clientId: process.env.FLEETKEEP_OAUTH_CLIENT_ID || DEFAULT_CLIENT_ID,
     redirectUri: redirect.href,
     scopes: DEFAULT_SCOPES,
@@ -111,7 +112,7 @@ export function authorizationRequest(config = oauthConfig()) {
     code_challenge: challenge,
     code_challenge_method: 'S256',
     state,
-    resource: config.origin,
+    resource: config.resource,
     prompt: 'consent'
   }).toString();
   return { url, state, verifier };
@@ -125,12 +126,19 @@ export function authorizationRequest(config = oauthConfig()) {
 async function tokenRequest(parameters, config = oauthConfig()) {
   const response = await fetch(config.tokenEndpoint, {
     method: 'POST',
-    headers: { 'content-type': 'application/x-www-form-urlencoded', accept: 'application/json' },
+    headers: {
+      'content-type': 'application/x-www-form-urlencoded',
+      accept: 'application/json',
+      origin: config.origin
+    },
     body: new URLSearchParams(parameters)
   });
   const payload = await response.json().catch(() => ({}));
   if (!response.ok || typeof payload.access_token !== 'string') {
-    const reason = typeof payload.error === 'string' ? payload.error : `HTTP ${response.status}`;
+    const reason =
+      typeof payload.error === 'string'
+        ? `${payload.error}${typeof payload.error_description === 'string' ? `: ${payload.error_description}` : ''}`
+        : `HTTP ${response.status}`;
     throw new Error(`Fleetkeep OAuth rejected the request (${reason}).`);
   }
   return {
@@ -156,7 +164,7 @@ export async function exchangeAuthorizationCode(code, verifier, config = oauthCo
       redirect_uri: config.redirectUri,
       client_id: config.clientId,
       code_verifier: verifier,
-      resource: config.origin
+      resource: config.resource
     },
     config
   );
@@ -174,7 +182,7 @@ export async function refreshStoredTokens(tokens, config = oauthConfig()) {
       refresh_token: tokens.refreshToken,
       client_id: config.clientId,
       scope: config.scopes.join(' '),
-      resource: config.origin
+      resource: config.resource
     },
     config
   );
@@ -290,7 +298,10 @@ export async function logout() {
     const config = oauthConfig();
     await fetch(config.revocationEndpoint, {
       method: 'POST',
-      headers: { 'content-type': 'application/x-www-form-urlencoded' },
+      headers: {
+        'content-type': 'application/x-www-form-urlencoded',
+        origin: config.origin
+      },
       body: new URLSearchParams({
         token: stored.refreshToken,
         token_type_hint: 'refresh_token',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fleetkeep/cli",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Preview and apply Fleetkeep fleet spreadsheet imports through the Fleetkeep API",
   "type": "module",
   "bin": {