oidc-spa 8.7.9 → 8.7.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (27) hide show
  1. package/core/createOidc.js +1 -1
  2. package/esm/core/createOidc.mjs +1 -1
  3. package/esm/server/{parseRequest.d.ts → extractRequestAuthContext.d.ts} +7 -8
  4. package/esm/server/{parseRequest.mjs → extractRequestAuthContext.mjs} +10 -17
  5. package/esm/server/extractRequestAuthContext.mjs.map +1 -0
  6. package/esm/server/index.d.ts +1 -1
  7. package/esm/server/index.mjs +1 -1
  8. package/esm/server/index.mjs.map +1 -1
  9. package/esm/server/types.mjs.map +1 -1
  10. package/esm/tanstack-start/react/createOidcSpaApi.mjs +23 -16
  11. package/esm/tanstack-start/react/createOidcSpaApi.mjs.map +1 -1
  12. package/esm/tanstack-start/react/types.mjs.map +1 -1
  13. package/package.json +1 -1
  14. package/server/{parseRequest.d.ts → extractRequestAuthContext.d.ts} +7 -8
  15. package/server/{parseRequest.js → extractRequestAuthContext.js} +11 -18
  16. package/server/extractRequestAuthContext.js.map +1 -0
  17. package/server/index.d.ts +1 -1
  18. package/server/index.js +3 -3
  19. package/server/index.js.map +1 -1
  20. package/server/types.js.map +1 -1
  21. package/src/server/{parseRequest.ts → extractRequestAuthContext.ts} +20 -28
  22. package/src/server/index.ts +5 -1
  23. package/src/tanstack-start/react/createOidcSpaApi.ts +27 -17
  24. package/esm/server/parseRequest.mjs.map +0 -1
  25. package/server/parseRequest.js.map +0 -1
  26. /package/src/server/{types.tsx → types.ts} +0 -0
  27. /package/src/tanstack-start/react/{types.tsx → types.ts} +0 -0
package/core/createOidc.js CHANGED
@@ -75,7 +75,7 @@ const tokenPlaceholderSubstitution_1 = require("./tokenPlaceholderSubstitution")
75
75
  const dpop_1 = require("./dpop");
76
76
  const loadWebcryptoLinerShim_1 = require("../tools/loadWebcryptoLinerShim");
77
77
  // NOTE: Replaced at build time
78
- const VERSION = "8.7.9";
78
+ const VERSION = "8.7.10";
79
79
  const globalContext = {
80
80
  prOidcByConfigId: new Map(),
81
81
  hasLogoutBeenCalled: (0, id_1.id)(false)
package/esm/core/createOidc.mjs CHANGED
@@ -38,7 +38,7 @@ import { getIsTokenSubstitutionEnabled } from "./tokenPlaceholderSubstitution.mj
38
38
  import { createInMemoryDPoPStore } from "./dpop.mjs";
39
39
  import { loadWebcryptoLinerShim } from "../tools/loadWebcryptoLinerShim.mjs";
40
40
  // NOTE: Replaced at build time
41
- const VERSION = "8.7.9";
41
+ const VERSION = "8.7.10";
42
42
  const globalContext = {
43
43
  prOidcByConfigId: new Map(),
44
44
  hasLogoutBeenCalled: id(false)
package/esm/server/{parseRequest.d.ts → extractRequestAuthContext.d.ts} RENAMED
@@ -33,19 +33,18 @@ export declare namespace AnyRequest {
33
33
  raw: IncomingMessageLike;
34
34
  };
35
35
  }
36
- export type ParseAnyRequestResult = ParseAnyRequestResult.Success | ParseAnyRequestResult.Errored;
37
- export declare namespace ParseAnyRequestResult {
36
+ export type RequestAuthContext = RequestAuthContext.Success | RequestAuthContext.Errored;
37
+ export declare namespace RequestAuthContext {
38
38
  type Success = {
39
- isSuccess: true;
40
- paramsOfValidateAndDecodeAccessToken: ValidateAndDecodeAccessToken.Params;
39
+ isWellFormed: true;
40
+ accessTokenAndMetadata: ValidateAndDecodeAccessToken.Params;
41
41
  };
42
42
  type Errored = {
43
- isSuccess: false;
44
- isAnonymousRequest: boolean;
43
+ isWellFormed: false;
45
44
  debugErrorMessage: string;
46
45
  };
47
46
  }
48
- export declare function parseRequest(params: {
47
+ export declare function extractRequestAuthContext(params: {
49
48
  request: AnyRequest;
50
49
  trustProxy: boolean;
51
- }): ParseAnyRequestResult;
50
+ }): RequestAuthContext | undefined;
package/esm/server/{parseRequest.mjs → extractRequestAuthContext.mjs} RENAMED
@@ -99,36 +99,30 @@ function anyRequestToUnified(req) {
99
99
  "https://github.com/keycloakify/oidc-spa"
100
100
  ].join(" "));
101
101
  }
102
- export function parseRequest(params) {
102
+ export function extractRequestAuthContext(params) {
103
103
  const { request, trustProxy } = params;
104
104
  const request_unified = anyRequestToUnified(request);
105
105
  if (request_unified.headers.Authorization === undefined) {
106
- return id({
107
- isSuccess: false,
108
- isAnonymousRequest: true,
109
- debugErrorMessage: "The request is anonymous, no Authorization header"
110
- });
106
+ return undefined;
111
107
  }
112
108
  const match = request_unified.headers.Authorization.trim().match(/^((?:Bearer)|(?:DPoP))\s+(.+)$/);
113
109
  if (match === null) {
114
110
  return id({
115
- isSuccess: false,
116
- isAnonymousRequest: false,
111
+ isWellFormed: false,
117
112
  debugErrorMessage: "Malformed Authorization header"
118
113
  });
119
114
  }
120
115
  const [, scheme, accessToken] = match;
121
116
  if (!isAmong(["Bearer", "DPoP"], scheme)) {
122
117
  return id({
123
- isSuccess: false,
124
- isAnonymousRequest: false,
118
+ isWellFormed: false,
125
119
  debugErrorMessage: `Unsupported scheme ${scheme}, expected Bearer or DPoP`
126
120
  });
127
121
  }
128
122
  if (scheme === "Bearer") {
129
123
  return id({
130
- isSuccess: true,
131
- paramsOfValidateAndDecodeAccessToken: id({
124
+ isWellFormed: true,
125
+ accessTokenAndMetadata: id({
132
126
  scheme: "Bearer",
133
127
  accessToken,
134
128
  rejectIfAccessTokenDPoPBound: true
@@ -138,8 +132,7 @@ export function parseRequest(params) {
138
132
  assert;
139
133
  if (request_unified.headers.DPoP === undefined) {
140
134
  return id({
141
- isSuccess: false,
142
- isAnonymousRequest: false,
135
+ isWellFormed: false,
143
136
  debugErrorMessage: "Scheme DPoP was specified but the DPoP header is missing"
144
137
  });
145
138
  }
@@ -212,8 +205,8 @@ export function parseRequest(params) {
212
205
  return `${url.origin}${url.pathname}`;
213
206
  })();
214
207
  return id({
215
- isSuccess: true,
216
- paramsOfValidateAndDecodeAccessToken: id({
208
+ isWellFormed: true,
209
+ accessTokenAndMetadata: id({
217
210
  scheme: "DPoP",
218
211
  accessToken,
219
212
  dpopProof: request_unified.headers.DPoP,
@@ -222,4 +215,4 @@ export function parseRequest(params) {
222
215
  })
223
216
  });
224
217
  }
225
- //# sourceMappingURL=parseRequest.mjs.map
218
+ //# sourceMappingURL=extractRequestAuthContext.mjs.map
package/esm/server/extractRequestAuthContext.mjs.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"extractRequestAuthContext.mjs","sourceRoot":"","sources":["../../src/server/extractRequestAuthContext.ts"],"names":[],"mappings":"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"}
package/esm/server/index.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  export type * from "./types";
2
- export { parseRequest, type AnyRequest, type ParseAnyRequestResult } from "./parseRequest";
2
+ export { extractRequestAuthContext, type AnyRequest, type RequestAuthContext as ParseAnyRequestResult } from "./extractRequestAuthContext";
3
3
  export declare const oidcSpa: import("./utilsBuilder").OidcSpaUtilsBuilder<import("./types").DecodedAccessToken_RFC9068, never>;
package/esm/server/index.mjs CHANGED
@@ -1,4 +1,4 @@
1
1
  import { oidcSpaUtilsBuilder } from "./utilsBuilder.mjs";
2
- export { parseRequest } from "./parseRequest.mjs";
2
+ export { extractRequestAuthContext } from "./extractRequestAuthContext.mjs";
3
3
  export const oidcSpa = oidcSpaUtilsBuilder;
4
4
  //# sourceMappingURL=index.mjs.map
package/esm/server/index.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,YAAY,EAA+C,MAAM,gBAAgB,CAAC;AAE3F,MAAM,CAAC,MAAM,OAAO,GAAG,mBAAmB,CAAC"}
1
+ {"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EACH,yBAAyB,EAG5B,MAAM,6BAA6B,CAAC;AAErC,MAAM,CAAC,MAAM,OAAO,GAAG,mBAAmB,CAAC"}
package/esm/server/types.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.mjs","sourceRoot":"","sources":["../../src/server/types.tsx"],"names":[],"mappings":""}
1
+ {"version":3,"file":"types.mjs","sourceRoot":"","sources":["../../src/server/types.ts"],"names":[],"mappings":""}
package/esm/tanstack-start/react/createOidcSpaApi.mjs CHANGED
@@ -572,32 +572,39 @@ export function createOidcSpaApi(params) {
572
572
  return new Error(`oidc-spa: ${wwwAuthenticateResponseHeaderValue}`);
573
573
  };
574
574
  assert(prValidateAndGetAccessTokenClaims !== undefined);
575
- const { parseRequest } = await import("../../server/parseRequest.mjs");
576
- const request_parsed = parseRequest({
575
+ const { extractRequestAuthContext } = await import("../../server/extractRequestAuthContext.mjs");
576
+ const requestAuthContext = extractRequestAuthContext({
577
577
  request: getRequest(),
578
578
  trustProxy: true
579
579
  });
580
- if (!request_parsed.isSuccess) {
581
- if (request_parsed.isAnonymousRequest) {
582
- if (params?.assert === "user logged in") {
583
- throw createError({
584
- code: 401,
585
- wwwAuthenticateResponseHeaderValue: "Bearer error=\"invalid_request\", error_description=\"Missing access token\"",
586
- debugErrorMessage: [
587
- "Asserted user logged in for that serverFn request",
588
- "but no access token was attached to the request"
589
- ].join(" ")
590
- });
591
- }
580
+ if (requestAuthContext === undefined) {
581
+ if (params?.assert === "user logged in") {
582
+ throw createError({
583
+ code: 401,
584
+ wwwAuthenticateResponseHeaderValue: "Bearer error=\"invalid_request\", error_description=\"Missing access token\"",
585
+ debugErrorMessage: [
586
+ "Asserted user logged in for that serverFn request",
587
+ "but no access token was attached to the request"
588
+ ].join(" ")
589
+ });
592
590
  }
591
+ return next({
592
+ context: {
593
+ oidc: id(id({
594
+ isUserLoggedIn: false
595
+ }))
596
+ }
597
+ });
598
+ }
599
+ if (!requestAuthContext.isWellFormed) {
593
600
  throw createError({
594
601
  code: 400,
595
602
  wwwAuthenticateResponseHeaderValue: "Bearer error=\"invalid_request\", error_description=\"Malformed or unsupported request\"",
596
- debugErrorMessage: request_parsed.debugErrorMessage
603
+ debugErrorMessage: requestAuthContext.debugErrorMessage
597
604
  });
598
605
  }
599
606
  const { validateAndGetAccessTokenClaims } = await prValidateAndGetAccessTokenClaims;
600
- const resultOfValidate = await validateAndGetAccessTokenClaims(request_parsed.paramsOfValidateAndDecodeAccessToken);
607
+ const resultOfValidate = await validateAndGetAccessTokenClaims(requestAuthContext.accessTokenAndMetadata);
601
608
  if (!resultOfValidate.isSuccess) {
602
609
  const { debugErrorMessage, wwwAuthenticateResponseHeaderValue } = resultOfValidate;
603
610
  throw createError({
package/esm/tanstack-start/react/createOidcSpaApi.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"createOidcSpaApi.mjs","sourceRoot":"","sources":["../../../src/tanstack-start/react/createOidcSpaApi.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"createOidcSpaApi.mjs","sourceRoot":"","sources":["../../../src/tanstack-start/react/createOidcSpaApi.ts"],"names":[],"mappings":"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"}
package/esm/tanstack-start/react/types.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.mjs","sourceRoot":"","sources":["../../../src/tanstack-start/react/types.tsx"],"names":[],"mappings":""}
1
+ {"version":3,"file":"types.mjs","sourceRoot":"","sources":["../../../src/tanstack-start/react/types.ts"],"names":[],"mappings":""}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "oidc-spa",
3
- "version": "8.7.9",
3
+ "version": "8.7.10",
4
4
  "description": "OpenID Connect / OAuth2 solution for Centric Web Applications",
5
5
  "repository": {
6
6
  "type": "git",
package/server/{parseRequest.d.ts → extractRequestAuthContext.d.ts} RENAMED
@@ -33,19 +33,18 @@ export declare namespace AnyRequest {
33
33
  raw: IncomingMessageLike;
34
34
  };
35
35
  }
36
- export type ParseAnyRequestResult = ParseAnyRequestResult.Success | ParseAnyRequestResult.Errored;
37
- export declare namespace ParseAnyRequestResult {
36
+ export type RequestAuthContext = RequestAuthContext.Success | RequestAuthContext.Errored;
37
+ export declare namespace RequestAuthContext {
38
38
  type Success = {
39
- isSuccess: true;
40
- paramsOfValidateAndDecodeAccessToken: ValidateAndDecodeAccessToken.Params;
39
+ isWellFormed: true;
40
+ accessTokenAndMetadata: ValidateAndDecodeAccessToken.Params;
41
41
  };
42
42
  type Errored = {
43
- isSuccess: false;
44
- isAnonymousRequest: boolean;
43
+ isWellFormed: false;
45
44
  debugErrorMessage: string;
46
45
  };
47
46
  }
48
- export declare function parseRequest(params: {
47
+ export declare function extractRequestAuthContext(params: {
49
48
  request: AnyRequest;
50
49
  trustProxy: boolean;
51
- }): ParseAnyRequestResult;
50
+ }): RequestAuthContext | undefined;
package/server/{parseRequest.js → extractRequestAuthContext.js} RENAMED
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.AnyRequest = void 0;
4
- exports.parseRequest = parseRequest;
4
+ exports.extractRequestAuthContext = extractRequestAuthContext;
5
5
  const tsafe_1 = require("../vendor/server/tsafe");
6
6
  var AnyRequest;
7
7
  (function (AnyRequest) {
@@ -103,36 +103,30 @@ function anyRequestToUnified(req) {
103
103
  "https://github.com/keycloakify/oidc-spa"
104
104
  ].join(" "));
105
105
  }
106
- function parseRequest(params) {
106
+ function extractRequestAuthContext(params) {
107
107
  const { request, trustProxy } = params;
108
108
  const request_unified = anyRequestToUnified(request);
109
109
  if (request_unified.headers.Authorization === undefined) {
110
- return (0, tsafe_1.id)({
111
- isSuccess: false,
112
- isAnonymousRequest: true,
113
- debugErrorMessage: "The request is anonymous, no Authorization header"
114
- });
110
+ return undefined;
115
111
  }
116
112
  const match = request_unified.headers.Authorization.trim().match(/^((?:Bearer)|(?:DPoP))\s+(.+)$/);
117
113
  if (match === null) {
118
114
  return (0, tsafe_1.id)({
119
- isSuccess: false,
120
- isAnonymousRequest: false,
115
+ isWellFormed: false,
121
116
  debugErrorMessage: "Malformed Authorization header"
122
117
  });
123
118
  }
124
119
  const [, scheme, accessToken] = match;
125
120
  if (!(0, tsafe_1.isAmong)(["Bearer", "DPoP"], scheme)) {
126
121
  return (0, tsafe_1.id)({
127
- isSuccess: false,
128
- isAnonymousRequest: false,
122
+ isWellFormed: false,
129
123
  debugErrorMessage: `Unsupported scheme ${scheme}, expected Bearer or DPoP`
130
124
  });
131
125
  }
132
126
  if (scheme === "Bearer") {
133
127
  return (0, tsafe_1.id)({
134
- isSuccess: true,
135
- paramsOfValidateAndDecodeAccessToken: (0, tsafe_1.id)({
128
+ isWellFormed: true,
129
+ accessTokenAndMetadata: (0, tsafe_1.id)({
136
130
  scheme: "Bearer",
137
131
  accessToken,
138
132
  rejectIfAccessTokenDPoPBound: true
@@ -142,8 +136,7 @@ function parseRequest(params) {
142
136
  tsafe_1.assert;
143
137
  if (request_unified.headers.DPoP === undefined) {
144
138
  return (0, tsafe_1.id)({
145
- isSuccess: false,
146
- isAnonymousRequest: false,
139
+ isWellFormed: false,
147
140
  debugErrorMessage: "Scheme DPoP was specified but the DPoP header is missing"
148
141
  });
149
142
  }
@@ -216,8 +209,8 @@ function parseRequest(params) {
216
209
  return `${url.origin}${url.pathname}`;
217
210
  })();
218
211
  return (0, tsafe_1.id)({
219
- isSuccess: true,
220
- paramsOfValidateAndDecodeAccessToken: (0, tsafe_1.id)({
212
+ isWellFormed: true,
213
+ accessTokenAndMetadata: (0, tsafe_1.id)({
221
214
  scheme: "DPoP",
222
215
  accessToken,
223
216
  dpopProof: request_unified.headers.DPoP,
@@ -226,4 +219,4 @@ function parseRequest(params) {
226
219
  })
227
220
  });
228
221
  }
229
- //# sourceMappingURL=parseRequest.js.map
222
+ //# sourceMappingURL=extractRequestAuthContext.js.map
package/server/extractRequestAuthContext.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"extractRequestAuthContext.js","sourceRoot":"","sources":["../src/server/extractRequestAuthContext.ts"],"names":[],"mappings":";;;AAkMA,8DA2JC;AA7VD,kDAA6F;AAa7F,IAAiB,UAAU,CA+C1B;AA/CD,WAAiB,UAAU;IAwBvB,cAAkE,CAAC;IAUnE,cAAkD,CAAC;IAMnD,cAA0D,CAAC;IAM3D,cAAgE,CAAC;AACrE,CAAC,EA/CgB,UAAU,0BAAV,UAAU,QA+C1B;AAED,SAAS,SAAS,CAAC,GAAe;IAC9B,IAAI,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC1C,cAA8C,CAAC;QAC/C,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,SAAS,CAAC,GAAe;IAC9B,qEAAqE;IACrE,0EAA0E;IAC1E,iBAAiB;IACjB,OAAO,GAAG,YAAY,OAAO,CAAC;AAClC,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAe;IACtC,IAAI,QAAQ,IAAI,GAAG,EAAE,CAAC;QAClB,cAA0D,CAAC;QAC3D,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,aAAa,CAAC,GAAe;IAClC,IAAI,KAAK,IAAI,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QACrC,qDAAqD;QACrD,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AACD,SAAS,gBAAgB,CAAC,GAAe;IACrC,IAAI,KAAK,IAAI,GAAG,IAAI,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7C,4DAA4D;QAC5D,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,mBAAmB,CAAC,GAAe;IACxC,IAAI,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;QACjB,OAAO,GAAG,CAAC;IACf,CAAC;IAED,IAAI,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;QACjB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAE7B,OAAO;YACH,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,aAAa,EAAE;gBACX,YAAY,EAAE,GAAG,CAAC,IAAI;gBACtB,OAAO,EAAE,GAAG,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,MAAM,EAAE;gBACvC,SAAS,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;aAC5C;YACD,OAAO,EAAE,IAAA,yBAAiB,EAElB;gBACI,eAAe;gBACf,MAAM;gBACN,WAAW;gBACX,mBAAmB;gBACnB,kBAAkB;aAEzB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,CAAC,CAC5D;SACJ,CAAC;IACN,CAAC;IAED,IAAI,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;QACzB,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,EAAE;YACpC,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;YAC9C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAChD,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACtC,CAAC;QACL,CAAC,CAAC;QAEF,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,IAAI,GAAG,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;YACpD,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACnD,CAAC;QAED,OAAO;YACH,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,aAAa,EAAE;gBACX,SAAS,EACL,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;gBACnF,YAAY,EAAE,cAAc,CAAC,YAAY,CAAC,IAAI,cAAc,CAAC,MAAM,CAAC,IAAI,WAAW;gBACnF,OAAO,EAAE,GAAG,CAAC,GAAG;aACnB;YACD,OAAO,EAAE,IAAA,yBAAiB,EAElB;gBACI,eAAe;gBACf,MAAM;gBACN,WAAW;gBACX,mBAAmB;gBACnB,kBAAkB;aAEzB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAC9C;SACJ,CAAC;IACN,CAAC;IAED,IAAI,aAAa,CAAC,GAAG,CAAC,IAAI,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC;QAC9C,OAAO,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC;IAED,IAAA,cAAM,EACF,KAAK,EACL;QACI,+DAA+D;QAC/D,0DAA0D;QAC1D,yCAAyC;KAC5C,CAAC,IAAI,CAAC,GAAG,CAAC,CACd,CAAC;AACN,CAAC;AAgBD,SAAgB,yBAAyB,CAAC,MAGzC;IACG,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IAEvC,MAAM,eAAe,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAErD,IAAI,eAAe,CAAC,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;QACtD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAEnG,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACjB,OAAO,IAAA,UAAE,EAA6B;YAClC,YAAY,EAAE,KAAK;YACnB,iBAAiB,EAAE,gCAAgC;SACtD,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC;IAEtC,IAAI,CAAC,IAAA,eAAO,EAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC;QACvC,OAAO,IAAA,UAAE,EAA6B;YAClC,YAAY,EAAE,KAAK;YACnB,iBAAiB,EAAE,sBAAsB,MAAM,2BAA2B;SAC7E,CAAC,CAAC;IACP,CAAC;IAED,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;QACtB,OAAO,IAAA,UAAE,EAA6B;YAClC,YAAY,EAAE,IAAI;YAClB,sBAAsB,EAAE,IAAA,UAAE,EAA6C;gBACnE,MAAM,EAAE,QAAQ;gBAChB,WAAW;gBACX,4BAA4B,EAAE,IAAI;aACrC,CAAC;SACL,CAAC,CAAC;IACP,CAAC;IAED,cAAqC,CAAC;IAEtC,IAAI,eAAe,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC7C,OAAO,IAAA,UAAE,EAA6B;YAClC,YAAY,EAAE,KAAK;YACnB,iBAAiB,EAAE,0DAA0D;SAChF,CAAC,CAAC;IACP,CAAC;IAED,MAAM,WAAW,GAAG,CAAC,GAAG,EAAE;QACtB,MAAM,EAAE,aAAa,EAAE,EAAE,EAAE,GAAG,eAAe,CAAC;QAE9C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAE5E,2BAA2B,EAAE,CAAC;YAC1B,IAAI,CAAC,UAAU,EAAE,CAAC;gBACd,MAAM,2BAA2B,CAAC;YACtC,CAAC;YAED,MAAM,eAAe,GAA4D,CAAC,GAAG,EAAE;gBACnF,oGAAoG;gBACpG,MAAM,eAAe,GAAG,eAAe,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;gBAE7D,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;oBAChC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;gBACjD,CAAC;gBAED,MAAM,CAAC,UAAU,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAChD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAE5C,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,EAAE;oBACnC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAC9B,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAClE,CAAC;oBAEF,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;wBACtB,OAAO,SAAS,CAAC;oBACrB,CAAC;oBAED,MAAM,CAAC,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBAEtC,OAAO,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;gBAClD,CAAC,CAAC;gBAEF,OAAO;oBACH,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC;oBAC7B,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC;iBAC9B,CAAC;YACN,CAAC,CAAC,EAAE,CAAC;YAEL,CAAC;gBACG,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE;oBACzB,IAAI,eAAe,CAAC,KAAK,EAAE,CAAC;wBACxB,OAAO,eAAe,CAAC,KAAK,CAAC;oBACjC,CAAC;oBAED,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;oBAE3D,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;wBACtB,OAAO,SAAS,CAAC;oBACrB,CAAC;oBAED,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;gBACvC,CAAC,CAAC,EAAE,CAAC;gBAEL,MAAM,yBAAyB,GAAG,CAAC,GAAG,EAAE;oBACpC,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;wBAC/B,OAAO,SAAS,CAAC;oBACrB,CAAC;oBAED,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;oBAE7D,OAAO,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;gBACrE,CAAC,CAAC,EAAE,CAAC;gBAEL,IAAI,yBAAyB,KAAK,SAAS,EAAE,CAAC;oBAC1C,GAAG,CAAC,QAAQ,GAAG,GAAG,yBAAyB,GAAG,CAAC;gBACnD,CAAC;YACL,CAAC;YAED,CAAC;gBACG,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE;oBACxB,IAAI,eAAe,CAAC,IAAI,EAAE,CAAC;wBACvB,OAAO,eAAe,CAAC,IAAI,CAAC;oBAChC,CAAC;oBAED,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;oBAE1D,IAAI,CAAC,KAAK,EAAE,CAAC;wBACT,OAAO,SAAS,CAAC;oBACrB,CAAC;oBAED,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;gBACvC,CAAC,CAAC,EAAE,CAAC;gBAEL,IAAI,aAAa,EAAE,CAAC;oBAChB,GAAG,CAAC,IAAI,GAAG,aAAa,CAAC;gBAC7B,CAAC;YACL,CAAC;QACL,CAAC;QAED,OAAO,GAAG,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;IAC1C,CAAC,CAAC,EAAE,CAAC;IAEL,OAAO,IAAA,UAAE,EAA6B;QAClC,YAAY,EAAE,IAAI;QAClB,sBAAsB,EAAE,IAAA,UAAE,EAA2C;YACjE,MAAM,EAAE,MAAM;YACd,WAAW;YACX,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,IAAI;YACvC,WAAW;YACX,WAAW,EAAE,eAAe,CAAC,MAAM;SACtC,CAAC;KACL,CAAC,CAAC;AACP,CAAC"}
package/server/index.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  export type * from "./types";
2
- export { parseRequest, type AnyRequest, type ParseAnyRequestResult } from "./parseRequest";
2
+ export { extractRequestAuthContext, type AnyRequest, type RequestAuthContext as ParseAnyRequestResult } from "./extractRequestAuthContext";
3
3
  export declare const oidcSpa: import("./utilsBuilder").OidcSpaUtilsBuilder<import("./types").DecodedAccessToken_RFC9068, never>;
package/server/index.js CHANGED
@@ -1,8 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.oidcSpa = exports.parseRequest = void 0;
3
+ exports.oidcSpa = exports.extractRequestAuthContext = void 0;
4
4
  const utilsBuilder_1 = require("./utilsBuilder");
5
- var parseRequest_1 = require("./parseRequest");
6
- Object.defineProperty(exports, "parseRequest", { enumerable: true, get: function () { return parseRequest_1.parseRequest; } });
5
+ var extractRequestAuthContext_1 = require("./extractRequestAuthContext");
6
+ Object.defineProperty(exports, "extractRequestAuthContext", { enumerable: true, get: function () { return extractRequestAuthContext_1.extractRequestAuthContext; } });
7
7
  exports.oidcSpa = utilsBuilder_1.oidcSpaUtilsBuilder;
8
8
  //# sourceMappingURL=index.js.map
package/server/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/server/index.ts"],"names":[],"mappings":";;;AACA,iDAAqD;AACrD,+CAA2F;AAAlF,4GAAA,YAAY,OAAA;AAER,QAAA,OAAO,GAAG,kCAAmB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/server/index.ts"],"names":[],"mappings":";;;AACA,iDAAqD;AACrD,yEAIqC;AAHjC,sIAAA,yBAAyB,OAAA;AAKhB,QAAA,OAAO,GAAG,kCAAmB,CAAC"}
package/server/types.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../src/server/types.tsx"],"names":[],"mappings":""}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../src/server/types.ts"],"names":[],"mappings":""}
package/src/server/{parseRequest.ts → extractRequestAuthContext.ts} RENAMED
@@ -178,43 +178,37 @@ function anyRequestToUnified(req: AnyRequest): AnyRequest.Unified {
178
178
  );
179
179
  }
180
180
 
181
- export type ParseAnyRequestResult = ParseAnyRequestResult.Success | ParseAnyRequestResult.Errored;
181
+ export type RequestAuthContext = RequestAuthContext.Success | RequestAuthContext.Errored;
182
182
 
183
- export namespace ParseAnyRequestResult {
183
+ export namespace RequestAuthContext {
184
184
  export type Success = {
185
- isSuccess: true;
186
- paramsOfValidateAndDecodeAccessToken: ValidateAndDecodeAccessToken.Params;
185
+ isWellFormed: true;
186
+ accessTokenAndMetadata: ValidateAndDecodeAccessToken.Params;
187
187
  };
188
188
 
189
189
  export type Errored = {
190
- isSuccess: false;
191
- isAnonymousRequest: boolean;
190
+ isWellFormed: false;
192
191
  debugErrorMessage: string;
193
192
  };
194
193
  }
195
194
 
196
- export function parseRequest(params: {
195
+ export function extractRequestAuthContext(params: {
197
196
  request: AnyRequest;
198
197
  trustProxy: boolean;
199
- }): ParseAnyRequestResult {
198
+ }): RequestAuthContext | undefined {
200
199
  const { request, trustProxy } = params;
201
200
 
202
201
  const request_unified = anyRequestToUnified(request);
203
202
 
204
203
  if (request_unified.headers.Authorization === undefined) {
205
- return id<ParseAnyRequestResult.Errored>({
206
- isSuccess: false,
207
- isAnonymousRequest: true,
208
- debugErrorMessage: "The request is anonymous, no Authorization header"
209
- });
204
+ return undefined;
210
205
  }
211
206
 
212
207
  const match = request_unified.headers.Authorization.trim().match(/^((?:Bearer)|(?:DPoP))\s+(.+)$/);
213
208
 
214
209
  if (match === null) {
215
- return id<ParseAnyRequestResult.Errored>({
216
- isSuccess: false,
217
- isAnonymousRequest: false,
210
+ return id<RequestAuthContext.Errored>({
211
+ isWellFormed: false,
218
212
  debugErrorMessage: "Malformed Authorization header"
219
213
  });
220
214
  }
@@ -222,17 +216,16 @@ export function parseRequest(params: {
222
216
  const [, scheme, accessToken] = match;
223
217
 
224
218
  if (!isAmong(["Bearer", "DPoP"], scheme)) {
225
- return id<ParseAnyRequestResult.Errored>({
226
- isSuccess: false,
227
- isAnonymousRequest: false,
219
+ return id<RequestAuthContext.Errored>({
220
+ isWellFormed: false,
228
221
  debugErrorMessage: `Unsupported scheme ${scheme}, expected Bearer or DPoP`
229
222
  });
230
223
  }
231
224
 
232
225
  if (scheme === "Bearer") {
233
- return id<ParseAnyRequestResult.Success>({
234
- isSuccess: true,
235
- paramsOfValidateAndDecodeAccessToken: id<ValidateAndDecodeAccessToken.Params.Bearer>({
226
+ return id<RequestAuthContext.Success>({
227
+ isWellFormed: true,
228
+ accessTokenAndMetadata: id<ValidateAndDecodeAccessToken.Params.Bearer>({
236
229
  scheme: "Bearer",
237
230
  accessToken,
238
231
  rejectIfAccessTokenDPoPBound: true
@@ -243,9 +236,8 @@ export function parseRequest(params: {
243
236
  assert<Equals<typeof scheme, "DPoP">>;
244
237
 
245
238
  if (request_unified.headers.DPoP === undefined) {
246
- return id<ParseAnyRequestResult.Errored>({
247
- isSuccess: false,
248
- isAnonymousRequest: false,
239
+ return id<RequestAuthContext.Errored>({
240
+ isWellFormed: false,
249
241
  debugErrorMessage: "Scheme DPoP was specified but the DPoP header is missing"
250
242
  });
251
243
  }
@@ -345,9 +337,9 @@ export function parseRequest(params: {
345
337
  return `${url.origin}${url.pathname}`;
346
338
  })();
347
339
 
348
- return id<ParseAnyRequestResult.Success>({
349
- isSuccess: true,
350
- paramsOfValidateAndDecodeAccessToken: id<ValidateAndDecodeAccessToken.Params.DPoP>({
340
+ return id<RequestAuthContext.Success>({
341
+ isWellFormed: true,
342
+ accessTokenAndMetadata: id<ValidateAndDecodeAccessToken.Params.DPoP>({
351
343
  scheme: "DPoP",
352
344
  accessToken,
353
345
  dpopProof: request_unified.headers.DPoP,
package/src/server/index.ts CHANGED
@@ -1,5 +1,9 @@
1
1
  export type * from "./types";
2
2
  import { oidcSpaUtilsBuilder } from "./utilsBuilder";
3
- export { parseRequest, type AnyRequest, type ParseAnyRequestResult } from "./parseRequest";
3
+ export {
4
+ extractRequestAuthContext,
5
+ type AnyRequest,
6
+ type RequestAuthContext as ParseAnyRequestResult
7
+ } from "./extractRequestAuthContext";
4
8
 
5
9
  export const oidcSpa = oidcSpaUtilsBuilder;
package/src/tanstack-start/react/createOidcSpaApi.ts CHANGED
@@ -820,40 +820,50 @@ export function createOidcSpaApi<
820
820
 
821
821
  assert(prValidateAndGetAccessTokenClaims !== undefined);
822
822
 
823
- const { parseRequest } = await import("../../server/parseRequest");
823
+ const { extractRequestAuthContext } = await import("../../server/extractRequestAuthContext");
824
824
 
825
- const request_parsed = parseRequest({
825
+ const requestAuthContext = extractRequestAuthContext({
826
826
  request: getRequest() as Request,
827
827
  trustProxy: true
828
828
  });
829
829
 
830
- if (!request_parsed.isSuccess) {
831
- if (request_parsed.isAnonymousRequest) {
832
- if (params?.assert === "user logged in") {
833
- throw createError({
834
- code: 401,
835
- wwwAuthenticateResponseHeaderValue:
836
- 'Bearer error="invalid_request", error_description="Missing access token"',
837
- debugErrorMessage: [
838
- "Asserted user logged in for that serverFn request",
839
- "but no access token was attached to the request"
840
- ].join(" ")
841
- });
842
- }
830
+ if (requestAuthContext === undefined) {
831
+ if (params?.assert === "user logged in") {
832
+ throw createError({
833
+ code: 401,
834
+ wwwAuthenticateResponseHeaderValue:
835
+ 'Bearer error="invalid_request", error_description="Missing access token"',
836
+ debugErrorMessage: [
837
+ "Asserted user logged in for that serverFn request",
838
+ "but no access token was attached to the request"
839
+ ].join(" ")
840
+ });
843
841
  }
844
842
 
843
+ return next({
844
+ context: {
845
+ oidc: id<OidcServerContext<AccessTokenClaims>>(
846
+ id<OidcServerContext.NotLoggedIn>({
847
+ isUserLoggedIn: false
848
+ })
849
+ )
850
+ }
851
+ });
852
+ }
853
+
854
+ if (!requestAuthContext.isWellFormed) {
845
855
  throw createError({
846
856
  code: 400,
847
857
  wwwAuthenticateResponseHeaderValue:
848
858
  'Bearer error="invalid_request", error_description="Malformed or unsupported request"',
849
- debugErrorMessage: request_parsed.debugErrorMessage
859
+ debugErrorMessage: requestAuthContext.debugErrorMessage
850
860
  });
851
861
  }
852
862
 
853
863
  const { validateAndGetAccessTokenClaims } = await prValidateAndGetAccessTokenClaims;
854
864
 
855
865
  const resultOfValidate = await validateAndGetAccessTokenClaims(
856
- request_parsed.paramsOfValidateAndDecodeAccessToken
866
+ requestAuthContext.accessTokenAndMetadata
857
867
  );
858
868
 
859
869
  if (!resultOfValidate.isSuccess) {
package/esm/server/parseRequest.mjs.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"parseRequest.mjs","sourceRoot":"","sources":["../../src/server/parseRequest.ts"],"names":[],"mappings":"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"}
package/server/parseRequest.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"parseRequest.js","sourceRoot":"","sources":["../src/server/parseRequest.ts"],"names":[],"mappings":"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"}
/package/src/server/{types.tsx → types.ts} RENAMED
File without changes