@atcute/oauth-types 0.1.1 → 1.0.0

package/dist/schemas/atcute-public-client-metadata.js

@@ -1,52 +1,17 @@
-import * as v from '@badrap/valita';
-import { atprotoOAuthScopeSchema } from './atproto-oauth-scope.js';
+import * as v from 'valibot';
+import { scopeSchema } from './atcute-client-shared.js';
 import { oauthClientIdDiscoverableSchema } from './oauth-client-id-discoverable.js';
 import { loopbackRedirectUriSchema, oauthRedirectUriSchema } from './oauth-redirect-uri.js';
-import { nonLocalWebUriSchema, privateUseUriSchema, webUriSchema } from './uri.js';
-import { isLoopbackHost } from './utils.js';
-const SINGLE_SCOPE_RE = /^[\x21\x23-\x5B\x5D-\x7E]+$/;
-const singleScopeSchema = v.string().assert((input) => SINGLE_SCOPE_RE.test(input), `invalid OAuth scope`);
-const scopeSchema = v.union(atprotoOAuthScopeSchema.chain((input) => {
-    const scopes = input.split(/\s+/);
-    for (let i = 0, len = scopes.length; i < len; i++) {
-        const aka = scopes[i];
-        for (let j = 0; j < i; j++) {
-            if (aka === scopes[j]) {
-                return v.err(`duplicate "${aka}" scope`);
-            }
-        }
+import { nonLocalWebUriSchema, webUriSchema } from './uri.js';
+const redirectUrisSchema = v.pipe(v.array(oauthRedirectUriSchema), v.minLength(1, `must have at least one redirect URI`), v.checkItems((uri) => {
+    // private-use URIs don't have URL-style credentials
+    if (!uri.includes('://')) {
+        return true;
     }
-    return v.ok(input);
-}), v.array(singleScopeSchema).chain((input) => {
-    if (!input.includes('atproto')) {
-        input = ['atproto', ...input];
-    }
-    for (let i = 0, len = input.length; i < len; i++) {
-        const aka = input[i];
-        for (let j = 0; j < i; j++) {
-            if (aka === input[j]) {
-                return v.err(`duplicate "${aka}" scope`);
-            }
-        }
-    }
-    return v.ok(input);
-}));
-const redirectUrisSchema = v
-    .array(oauthRedirectUriSchema)
-    .assert((arr) => arr.length > 0, `must have at least one redirect URI`)
-    .assert((arr) => {
-    for (const uri of arr) {
-        // private-use URIs don't have URL-style credentials
-        if (!uri.includes('://')) {
-            continue;
-        }
-        const url = new URL(uri);
-        if (url.username || url.password) {
-            return false;
-        }
-    }
-    return true;
-}, `redirect URIs must not contain credentials`);
+    const url = new URL(uri);
+    return !url.username && !url.password;
+}, `redirect URI must not contain credentials`));
+const loopbackRedirectUrisSchema = v.pipe(redirectUrisSchema, v.checkItems((uri) => v.is(loopbackRedirectUriSchema, uri), `loopback clients require loopback redirect URIs (127.0.0.1 or [::1])`));
 /**
  * user-facing client metadata for configuring a loopback public OAuth client.
  *
@@ -54,10 +19,9 @@ const redirectUrisSchema = v
  * `http://localhost` as the client_id origin, which is built automatically
  * from the redirect_uris and scope.
  */
-export const loopbackClientMetadataSchema = v
-    .object({
+export const loopbackClientMetadataSchema = v.looseObject({
     /** must not be provided for loopback clients */
-    client_id: v.undefined().optional(),
+    client_id: v.optional(v.undefined()),
     /**
      * redirect URIs for authorization responses.
      *
@@ -65,30 +29,9 @@ export const loopbackClientMetadataSchema = v
      * per RFC 8252, port numbers are ignored during redirect URI matching,
      * allowing ephemeral ports.
      */
-    redirect_uris: redirectUrisSchema,
+    redirect_uris: loopbackRedirectUrisSchema,
     /** OAuth scope (must include "atproto") */
     scope: scopeSchema,
-})
-    .chain((input) => {
-    // validate all redirect URIs are loopback
-    for (let i = 0; i < input.redirect_uris.length; i++) {
-        const uri = input.redirect_uris[i];
-        const result = loopbackRedirectUriSchema.try(uri, { mode: 'strict' });
-        if (!result.ok) {
-            return v.err({
-                message: `loopback clients require loopback redirect URIs (127.0.0.1 or [::1]): ${result.message}`,
-                path: ['redirect_uris', i],
-            });
-        }
-        const url = new URL(uri);
-        if (!isLoopbackHost(url.hostname) || url.hostname === 'localhost') {
-            return v.err({
-                message: `loopback redirect URIs must use 127.0.0.1 or [::1], not ${url.hostname}`,
-                path: ['redirect_uris', i],
-            });
-        }
-    }
-    return v.ok(input);
 });
 /**
  * user-facing client metadata for configuring a discoverable public OAuth client.
@@ -96,8 +39,7 @@ export const loopbackClientMetadataSchema = v
  * discoverable public clients have an HTTPS client_id URL where metadata is hosted,
  * but don't use a keyset (token_endpoint_auth_method: 'none').
  */
-export const discoverablePublicClientMetadataSchema = v
-    .object({
+export const discoverablePublicClientMetadataSchema = v.looseObject({
     /** discoverable HTTPS client_id URL */
     client_id: oauthClientIdDiscoverableSchema,
     /** redirect URIs for authorization responses */
@@ -107,47 +49,17 @@ export const discoverablePublicClientMetadataSchema = v
     /**
      * application type - defaults to 'web'.
      */
-    application_type: v.union(v.literal('web'), v.literal('native')).optional(),
+    application_type: v.optional(v.picklist(['web', 'native'])),
     /** optional client homepage */
-    client_uri: webUriSchema.optional(),
+    client_uri: v.optional(webUriSchema),
     /** optional display name */
-    client_name: v.string().optional(),
+    client_name: v.optional(v.string()),
     /** optional policy url */
-    policy_uri: nonLocalWebUriSchema.optional(),
+    policy_uri: v.optional(nonLocalWebUriSchema),
     /** optional terms of service url */
-    tos_uri: nonLocalWebUriSchema.optional(),
+    tos_uri: v.optional(nonLocalWebUriSchema),
     /** optional logo url */
-    logo_uri: nonLocalWebUriSchema.optional(),
-})
-    .chain((input) => {
-    // validate redirect URIs are HTTPS, loopback, or private-use
-    for (let i = 0; i < input.redirect_uris.length; i++) {
-        const uri = input.redirect_uris[i];
-        // private-use URIs are allowed
-        if (!uri.includes('://')) {
-            const result = privateUseUriSchema.try(uri, { mode: 'strict' });
-            if (!result.ok) {
-                return v.err({
-                    message: `invalid redirect URI: ${result.message}`,
-                    path: ['redirect_uris', i],
-                });
-            }
-            continue;
-        }
-        const url = new URL(uri);
-        // loopback http URIs are allowed for native apps
-        if (url.protocol === 'http:' && isLoopbackHost(url.hostname)) {
-            continue;
-        }
-        // otherwise must be https
-        if (url.protocol !== 'https:') {
-            return v.err({
-                message: `redirect URI must use https:, http: loopback, or private-use scheme`,
-                path: ['redirect_uris', i],
-            });
-        }
-    }
-    return v.ok(input);
+    logo_uri: v.optional(nonLocalWebUriSchema),
 });
 /**
  * user-facing client metadata for configuring a public OAuth client.
@@ -155,5 +67,8 @@ export const discoverablePublicClientMetadataSchema = v
  * - if `client_id` is omitted: loopback client (for localhost dev / CLI tools)
  * - if `client_id` is provided: discoverable public client (HTTPS URL)
  */
-export const publicClientMetadataSchema = v.union(loopbackClientMetadataSchema, discoverablePublicClientMetadataSchema);
+export const publicClientMetadataSchema = v.union([
+    loopbackClientMetadataSchema,
+    discoverablePublicClientMetadataSchema,
+]);
 //# sourceMappingURL=atcute-public-client-metadata.js.map

package/dist/schemas/atcute-public-client-metadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"atcute-public-client-metadata.js","sourceRoot":"","sources":["../../lib/schemas/atcute-public-client-metadata.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"atcute-public-client-metadata.js","sourceRoot":"","sources":["../../lib/schemas/atcute-public-client-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAE7B,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,+BAA+B,EAAE,MAAM,mCAAmC,CAAC;AACpF,OAAO,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAC5F,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE9D,MAAM,kBAAkB,GAAG,CAAC,CAAC,IAAI,CAChC,CAAC,CAAC,KAAK,CAAC,sBAAsB,CAAC,EAC/B,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,qCAAqC,CAAC,EACrD,CAAC,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,EAAE;IACpB,oDAAoD;IACpD,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC;IACb,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IACzB,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC;AACvC,CAAC,EAAE,2CAA2C,CAAC,CAC/C,CAAC;AAEF,MAAM,0BAA0B,GAAG,CAAC,CAAC,IAAI,CACxC,kBAAkB,EAClB,CAAC,CAAC,UAAU,CACX,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,yBAAyB,EAAE,GAAG,CAAC,EAC7C,sEAAsE,CACtE,CACD,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,CAAC,WAAW,CAAC;IACzD,gDAAgD;IAChD,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;IAEpC;;;;;;OAMG;IACH,aAAa,EAAE,0BAA0B;IAEzC,2CAA2C;IAC3C,KAAK,EAAE,WAAW;CAClB,CAAC,CAAC;AAIH;;;;;GAKG;AACH,MAAM,CAAC,MAAM,sCAAsC,GAAG,CAAC,CAAC,WAAW,CAAC;IACnE,uCAAuC;IACvC,SAAS,EAAE,+BAA+B;IAE1C,gDAAgD;IAChD,aAAa,EAAE,kBAAkB;IAEjC,2CAA2C;IAC3C,KAAK,EAAE,WAAW;IAElB;;OAEG;IACH,gBAAgB,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;IAE3D,+BAA+B;IAC/B,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC;IACpC,4BAA4B;IAC5B,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IACnC,0BAA0B;IAC1B,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,oBAAoB,CAAC;IAC5C,oCAAoC;IACpC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,oBAAoB,CAAC;IACzC,wBAAwB;IACxB,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,oBAAoB,CAAC;CAC1C,CAAC,CAAC;AAIH;;;;;GAKG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,CAAC,KAAK,CAAC;IACjD,4BAA4B;IAC5B,sCAAsC;CACtC,CAAC,CAAC"}