@atproto/oauth-types 0.6.2 → 0.6.3

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atproto/oauth-types
 
+## 0.6.3
+
+### Patch Changes
+
+- [#4620](https://github.com/bluesky-social/atproto/pull/4620) [`fdbbff8`](https://github.com/bluesky-social/atproto/commit/fdbbff854363ed3518a4039ca43cd279e69600e0) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Ensure that `OAuthAuthorizationRequestQuery` always contains a `client_id`
+
+- [#4620](https://github.com/bluesky-social/atproto/pull/4620) [`fdbbff8`](https://github.com/bluesky-social/atproto/commit/fdbbff854363ed3518a4039ca43cd279e69600e0) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update `oauthRequestUriSchema` to require min length
+
 ## 0.6.2
 
 ### Patch Changes

package/dist/oauth-authorization-request-query.d.ts

@@ -1,5 +1,11 @@
 import { z } from 'zod';
-export declare const oauthAuthorizationRequestQuerySchema: z.ZodUnion<[z.ZodObject<{
+export declare const oauthAuthorizationRequestQuerySchema: z.ZodIntersection<z.ZodObject<{
+    client_id: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    client_id: string;
+}, {
+    client_id: string;
+}>, z.ZodUnion<[z.ZodObject<{
     client_id: z.ZodString;
     state: z.ZodOptional<z.ZodString>;
     redirect_uri: z.ZodOptional<z.ZodEffects<z.ZodString, `http://[::1]${string}` | "http://127.0.0.1" | `http://127.0.0.1#${string}` | `http://127.0.0.1?${string}` | `http://127.0.0.1/${string}` | `http://127.0.0.1:${string}` | `https://${string}` | `${string}.${string}:/${string}`, string>>;
@@ -123,6 +129,6 @@ export declare const oauthAuthorizationRequestQuerySchema: z.ZodUnion<[z.ZodObje
     request_uri: string;
 }, {
     request_uri: string;
-}>]>;
+}>]>>;
 export type OAuthAuthorizationRequestQuery = z.infer<typeof oauthAuthorizationRequestQuerySchema>;
 //# sourceMappingURL=oauth-authorization-request-query.d.ts.map

package/dist/oauth-authorization-request-query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-authorization-request-query.d.ts","sourceRoot":"","sources":["../src/oauth-authorization-request-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAKvB,eAAO,MAAM,oCAAoC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAI/C,CAAA;AAEF,MAAM,MAAM,8BAA8B,GAAG,CAAC,CAAC,KAAK,CAClD,OAAO,oCAAoC,CAC5C,CAAA"}
+{"version":3,"file":"oauth-authorization-request-query.d.ts","sourceRoot":"","sources":["../src/oauth-authorization-request-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAMvB,eAAO,MAAM,oCAAoC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAUhD,CAAA;AAED,MAAM,MAAM,8BAA8B,GAAG,CAAC,CAAC,KAAK,CAClD,OAAO,oCAAoC,CAC5C,CAAA"}

package/dist/oauth-authorization-request-query.js

@@ -5,9 +5,13 @@ const zod_1 = require("zod");
 const oauth_authorization_request_jar_js_1 = require("./oauth-authorization-request-jar.js");
 const oauth_authorization_request_parameters_js_1 = require("./oauth-authorization-request-parameters.js");
 const oauth_authorization_request_uri_js_1 = require("./oauth-authorization-request-uri.js");
-exports.oauthAuthorizationRequestQuerySchema = zod_1.z.union([
+const oauth_client_id_js_1 = require("./oauth-client-id.js");
+exports.oauthAuthorizationRequestQuerySchema = zod_1.z.intersection(zod_1.z.object({
+    // REQUIRED. OAuth 2.0 [RFC6749] client_id.
+    client_id: oauth_client_id_js_1.oauthClientIdSchema,
+}), zod_1.z.union([
     oauth_authorization_request_parameters_js_1.oauthAuthorizationRequestParametersSchema,
     oauth_authorization_request_jar_js_1.oauthAuthorizationRequestJarSchema,
     oauth_authorization_request_uri_js_1.oauthAuthorizationRequestUriSchema,
-]);
+]));
 //# sourceMappingURL=oauth-authorization-request-query.js.map

package/dist/oauth-authorization-request-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-authorization-request-query.js","sourceRoot":"","sources":["../src/oauth-authorization-request-query.ts"],"names":[],"mappings":";;;AAAA,6BAAuB;AACvB,6FAAyF;AACzF,2GAAuG;AACvG,6FAAyF;AAE5E,QAAA,oCAAoC,GAAG,OAAC,CAAC,KAAK,CAAC;IAC1D,qFAAyC;IACzC,uEAAkC;IAClC,uEAAkC;CACnC,CAAC,CAAA","sourcesContent":["import { z } from 'zod'\nimport { oauthAuthorizationRequestJarSchema } from './oauth-authorization-request-jar.js'\nimport { oauthAuthorizationRequestParametersSchema } from './oauth-authorization-request-parameters.js'\nimport { oauthAuthorizationRequestUriSchema } from './oauth-authorization-request-uri.js'\n\nexport const oauthAuthorizationRequestQuerySchema = z.union([\n  oauthAuthorizationRequestParametersSchema,\n  oauthAuthorizationRequestJarSchema,\n  oauthAuthorizationRequestUriSchema,\n])\n\nexport type OAuthAuthorizationRequestQuery = z.infer<\n  typeof oauthAuthorizationRequestQuerySchema\n>\n"]}
+{"version":3,"file":"oauth-authorization-request-query.js","sourceRoot":"","sources":["../src/oauth-authorization-request-query.ts"],"names":[],"mappings":";;;AAAA,6BAAuB;AACvB,6FAAyF;AACzF,2GAAuG;AACvG,6FAAyF;AACzF,6DAA0D;AAE7C,QAAA,oCAAoC,GAAG,OAAC,CAAC,YAAY,CAChE,OAAC,CAAC,MAAM,CAAC;IACP,2CAA2C;IAC3C,SAAS,EAAE,wCAAmB;CAC/B,CAAC,EACF,OAAC,CAAC,KAAK,CAAC;IACN,qFAAyC;IACzC,uEAAkC;IAClC,uEAAkC;CACnC,CAAC,CACH,CAAA","sourcesContent":["import { z } from 'zod'\nimport { oauthAuthorizationRequestJarSchema } from './oauth-authorization-request-jar.js'\nimport { oauthAuthorizationRequestParametersSchema } from './oauth-authorization-request-parameters.js'\nimport { oauthAuthorizationRequestUriSchema } from './oauth-authorization-request-uri.js'\nimport { oauthClientIdSchema } from './oauth-client-id.js'\n\nexport const oauthAuthorizationRequestQuerySchema = z.intersection(\n  z.object({\n    // REQUIRED. OAuth 2.0 [RFC6749] client_id.\n    client_id: oauthClientIdSchema,\n  }),\n  z.union([\n    oauthAuthorizationRequestParametersSchema,\n    oauthAuthorizationRequestJarSchema,\n    oauthAuthorizationRequestUriSchema,\n  ]),\n)\n\nexport type OAuthAuthorizationRequestQuery = z.infer<\n  typeof oauthAuthorizationRequestQuerySchema\n>\n"]}

package/dist/oauth-request-uri.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-request-uri.d.ts","sourceRoot":"","sources":["../src/oauth-request-uri.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,eAAO,MAAM,qBAAqB,aAAa,CAAA;AAE/C,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAA"}
+{"version":3,"file":"oauth-request-uri.d.ts","sourceRoot":"","sources":["../src/oauth-request-uri.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,eAAO,MAAM,qBAAqB,aAAoB,CAAA;AAEtD,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAA"}

package/dist/oauth-request-uri.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.oauthRequestUriSchema = void 0;
 const zod_1 = require("zod");
-exports.oauthRequestUriSchema = zod_1.z.string();
+exports.oauthRequestUriSchema = zod_1.z.string().min(1);
 //# sourceMappingURL=oauth-request-uri.js.map

package/dist/oauth-request-uri.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-request-uri.js","sourceRoot":"","sources":["../src/oauth-request-uri.ts"],"names":[],"mappings":";;;AAAA,6BAAuB;AAEV,QAAA,qBAAqB,GAAG,OAAC,CAAC,MAAM,EAAE,CAAA","sourcesContent":["import { z } from 'zod'\n\nexport const oauthRequestUriSchema = z.string()\n\nexport type OAuthRequestUri = z.infer<typeof oauthRequestUriSchema>\n"]}
+{"version":3,"file":"oauth-request-uri.js","sourceRoot":"","sources":["../src/oauth-request-uri.ts"],"names":[],"mappings":";;;AAAA,6BAAuB;AAEV,QAAA,qBAAqB,GAAG,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA","sourcesContent":["import { z } from 'zod'\n\nexport const oauthRequestUriSchema = z.string().min(1)\n\nexport type OAuthRequestUri = z.infer<typeof oauthRequestUriSchema>\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-types",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "license": "MIT",
   "description": "OAuth typing & validation library",
   "keywords": [
@@ -26,8 +26,8 @@
   },
   "dependencies": {
     "zod": "^3.23.8",
-    "@atproto/did": "0.3.0",
-    "@atproto/jwk": "0.6.0"
+    "@atproto/did": "^0.3.0",
+    "@atproto/jwk": "^0.6.0"
   },
   "devDependencies": {
     "typescript": "^5.6.3"

package/src/oauth-authorization-request-query.ts

@@ -2,12 +2,19 @@ import { z } from 'zod'
 import { oauthAuthorizationRequestJarSchema } from './oauth-authorization-request-jar.js'
 import { oauthAuthorizationRequestParametersSchema } from './oauth-authorization-request-parameters.js'
 import { oauthAuthorizationRequestUriSchema } from './oauth-authorization-request-uri.js'
+import { oauthClientIdSchema } from './oauth-client-id.js'
 
-export const oauthAuthorizationRequestQuerySchema = z.union([
-  oauthAuthorizationRequestParametersSchema,
-  oauthAuthorizationRequestJarSchema,
-  oauthAuthorizationRequestUriSchema,
-])
+export const oauthAuthorizationRequestQuerySchema = z.intersection(
+  z.object({
+    // REQUIRED. OAuth 2.0 [RFC6749] client_id.
+    client_id: oauthClientIdSchema,
+  }),
+  z.union([
+    oauthAuthorizationRequestParametersSchema,
+    oauthAuthorizationRequestJarSchema,
+    oauthAuthorizationRequestUriSchema,
+  ]),
+)
 
 export type OAuthAuthorizationRequestQuery = z.infer<
   typeof oauthAuthorizationRequestQuerySchema

package/src/oauth-request-uri.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod'
 
-export const oauthRequestUriSchema = z.string()
+export const oauthRequestUriSchema = z.string().min(1)
 
 export type OAuthRequestUri = z.infer<typeof oauthRequestUriSchema>