feat: Add token introspection endpoint

lib/build/framework/request.d.ts

@@ -15,4 +15,5 @@ export declare abstract class BaseRequest {
     abstract getOriginalURL: () => string;
     getFormData: () => Promise<any>;
     getJSONBody: () => Promise<any>;
+    getBodyAsJSONOrFormData: () => Promise<any>;
 }

lib/build/framework/request.js

@@ -41,6 +41,26 @@ class BaseRequest {
             }
             return this.parsedJSONBody;
         };
+        this.getBodyAsJSONOrFormData = async () => {
+            const contentType = this.getHeaderValue("content-type") || this.getHeaderValue("Content-Type");
+            if (contentType) {
+                if (contentType.includes("application/json")) {
+                    return await this.getJSONBody();
+                } else if (contentType.includes("application/x-www-form-urlencoded")) {
+                    return await this.getFormData();
+                }
+            } else {
+                try {
+                    return await this.getJSONBody();
+                } catch (_a) {
+                    try {
+                        return await this.getFormData();
+                    } catch (_b) {
+                        throw new Error("Unable to parse body as JSON or Form Data.");
+                    }
+                }
+            }
+        };
         this.wrapperUsed = true;
         this.parsedJSONBody = undefined;
         this.parsedUrlEncodedFormData = undefined;

lib/build/recipe/oauth2provider/api/implementation.js

@@ -49,6 +49,7 @@ function getAPIImplementation() {
         },
         tokenPOST: async (input) => {
             return input.options.recipeImplementation.tokenExchange({
+                authorizationHeader: input.authorizationHeader,
                 body: input.body,
                 userContext: input.userContext,
             });
@@ -79,6 +80,22 @@ function getAPIImplementation() {
                 userContext,
             });
         },
+        revokeTokenPOST: async (input) => {
+            return input.options.recipeImplementation.revokeToken({
+                token: input.token,
+                clientId: input.clientId,
+                clientSecret: input.clientSecret,
+                authorizationHeader: input.authorizationHeader,
+                userContext: input.userContext,
+            });
+        },
+        introspectTokenPOST: async (input) => {
+            return input.options.recipeImplementation.introspectToken({
+                token: input.token,
+                scopes: input.scopes,
+                userContext: input.userContext,
+            });
+        },
     };
 }
 exports.default = getAPIImplementation;

lib/build/recipe/oauth2provider/api/introspectToken.d.ts

@@ -0,0 +1,8 @@
+// @ts-nocheck
+import { APIInterface, APIOptions } from "..";
+import { UserContext } from "../../../types";
+export default function introspectTokenPOST(
+    apiImplementation: APIInterface,
+    options: APIOptions,
+    userContext: UserContext
+): Promise<boolean>;

lib/build/recipe/oauth2provider/api/introspectToken.js

@@ -0,0 +1,37 @@
+"use strict";
+/* Copyright (c) 2024, VRAI Labs and/or its affiliates. All rights reserved.
+ *
+ * This software is licensed under the Apache License, Version 2.0 (the
+ * "License") as published by the Apache Software Foundation.
+ *
+ * You may not use this file except in compliance with the License. You may
+ * obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("../../../utils");
+async function introspectTokenPOST(apiImplementation, options, userContext) {
+    if (apiImplementation.introspectTokenPOST === undefined) {
+        return false;
+    }
+    const body = await options.req.getBodyAsJSONOrFormData();
+    if (body.token === undefined) {
+        utils_1.sendNon200ResponseWithMessage(options.res, "token is required in the request body", 400);
+        return true;
+    }
+    const scopes = body.scope ? body.scope.split(" ") : [];
+    let response = await apiImplementation.introspectTokenPOST({
+        options,
+        token: body.token,
+        scopes,
+        userContext,
+    });
+    utils_1.send200Response(options.res, response);
+    return true;
+}
+exports.default = introspectTokenPOST;

lib/build/recipe/oauth2provider/api/revokeToken.d.ts

@@ -0,0 +1,8 @@
+// @ts-nocheck
+import { APIInterface, APIOptions } from "..";
+import { UserContext } from "../../../types";
+export default function revokeTokenPOST(
+    apiImplementation: APIInterface,
+    options: APIOptions,
+    userContext: UserContext
+): Promise<boolean>;

lib/build/recipe/oauth2provider/api/revokeToken.js

@@ -0,0 +1,40 @@
+"use strict";
+/* Copyright (c) 2024, VRAI Labs and/or its affiliates. All rights reserved.
+ *
+ * This software is licensed under the Apache License, Version 2.0 (the
+ * "License") as published by the Apache Software Foundation.
+ *
+ * You may not use this file except in compliance with the License. You may
+ * obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("../../../utils");
+async function revokeTokenPOST(apiImplementation, options, userContext) {
+    if (apiImplementation.revokeTokenPOST === undefined) {
+        return false;
+    }
+    const body = await options.req.getBodyAsJSONOrFormData();
+    if (body.token === undefined) {
+        utils_1.sendNon200ResponseWithMessage(options.res, "token is required in the request body", 400);
+        return true;
+    }
+    const authorizationHeader =
+        options.req.getHeaderValue("authorization") || options.req.getHeaderValue("Authorization");
+    let response = await apiImplementation.revokeTokenPOST({
+        options,
+        authorizationHeader,
+        token: body.token,
+        clientId: body.client_id,
+        clientSecret: body.client_secret,
+        userContext,
+    });
+    utils_1.send200Response(options.res, response);
+    return true;
+}
+exports.default = revokeTokenPOST;

lib/build/recipe/oauth2provider/api/token.js

@@ -19,9 +19,12 @@ async function tokenPOST(apiImplementation, options, userContext) {
     if (apiImplementation.tokenPOST === undefined) {
         return false;
     }
+    const authorizationHeader =
+        options.req.getHeaderValue("authorization") || options.req.getHeaderValue("Authorization");
     let response = await apiImplementation.tokenPOST({
+        authorizationHeader,
         options,
-        body: await options.req.getFormData(),
+        body: await options.req.getBodyAsJSONOrFormData(),
         userContext,
     });
     if ("statusCode" in response && response.statusCode !== 200) {

lib/build/recipe/oauth2provider/constants.d.ts

@@ -5,3 +5,5 @@ export declare const AUTH_PATH = "/oauth/auth";
 export declare const TOKEN_PATH = "/oauth/token";
 export declare const LOGIN_INFO_PATH = "/oauth/login/info";
 export declare const USER_INFO_PATH = "/oauth/userinfo";
+export declare const REVOKE_TOKEN_PATH = "/oauth/revoke";
+export declare const INTROSPECT_TOKEN_PATH = "/oauth/introspect";

lib/build/recipe/oauth2provider/constants.js

@@ -14,10 +14,12 @@
  * under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.USER_INFO_PATH = exports.LOGIN_INFO_PATH = exports.TOKEN_PATH = exports.AUTH_PATH = exports.LOGIN_PATH = exports.OAUTH2_BASE_PATH = void 0;
+exports.INTROSPECT_TOKEN_PATH = exports.REVOKE_TOKEN_PATH = exports.USER_INFO_PATH = exports.LOGIN_INFO_PATH = exports.TOKEN_PATH = exports.AUTH_PATH = exports.LOGIN_PATH = exports.OAUTH2_BASE_PATH = void 0;
 exports.OAUTH2_BASE_PATH = "/oauth/";
 exports.LOGIN_PATH = "/oauth/login";
 exports.AUTH_PATH = "/oauth/auth";
 exports.TOKEN_PATH = "/oauth/token";
 exports.LOGIN_INFO_PATH = "/oauth/login/info";
 exports.USER_INFO_PATH = "/oauth/userinfo";
+exports.REVOKE_TOKEN_PATH = "/oauth/revoke";
+exports.INTROSPECT_TOKEN_PATH = "/oauth/introspect";

lib/build/recipe/oauth2provider/index.d.ts

@@ -99,6 +99,20 @@ export default class Wrapper {
         audience?: string,
         userContext?: Record<string, any>
     ): Promise<import("./types").ErrorOAuth2 | import("./types").TokenInfo>;
+    static revokeToken(
+        token: string,
+        clientId: string,
+        clientSecret: string,
+        useBasicAuth?: boolean,
+        userContext?: Record<string, any>
+    ): Promise<{
+        status: "OK";
+    }>;
+    static validateOAuth2RefreshToken(
+        token: string,
+        scopes?: string[],
+        userContext?: Record<string, any>
+    ): Promise<import("./types").InstrospectTokenResponse>;
 }
 export declare let init: typeof Recipe.init;
 export declare let getOAuth2Clients: typeof Wrapper.getOAuth2Clients;
@@ -108,4 +122,5 @@ export declare let deleteOAuth2Client: typeof Wrapper.deleteOAuth2Client;
 export declare let validateOAuth2AccessToken: typeof Wrapper.validateOAuth2AccessToken;
 export declare let validateOAuth2IdToken: typeof Wrapper.validateOAuth2IdToken;
 export declare let createTokenForClientCredentials: typeof Wrapper.createTokenForClientCredentials;
+export declare let revokeToken: typeof Wrapper.revokeToken;
 export type { APIInterface, APIOptions, RecipeInterface };

lib/build/recipe/oauth2provider/index.js

@@ -19,7 +19,7 @@ var __importDefault =
         return mod && mod.__esModule ? mod : { default: mod };
     };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTokenForClientCredentials = exports.validateOAuth2IdToken = exports.validateOAuth2AccessToken = exports.deleteOAuth2Client = exports.updateOAuth2Client = exports.createOAuth2Client = exports.getOAuth2Clients = exports.init = void 0;
+exports.revokeToken = exports.createTokenForClientCredentials = exports.validateOAuth2IdToken = exports.validateOAuth2AccessToken = exports.deleteOAuth2Client = exports.updateOAuth2Client = exports.createOAuth2Client = exports.getOAuth2Clients = exports.init = void 0;
 const utils_1 = require("../../utils");
 const recipe_1 = __importDefault(require("./recipe"));
 class Wrapper {
@@ -71,6 +71,26 @@ class Wrapper {
             userContext: utils_1.getUserContext(userContext),
         });
     }
+    static revokeToken(token, clientId, clientSecret, useBasicAuth = false, userContext) {
+        let authorizationHeader = undefined;
+        if (useBasicAuth) {
+            authorizationHeader = "Basic " + Buffer.from(clientId + ":" + clientSecret).toString("base64");
+        }
+        return recipe_1.default.getInstanceOrThrowError().recipeInterfaceImpl.revokeToken({
+            token,
+            clientId,
+            clientSecret,
+            authorizationHeader,
+            userContext: utils_1.getUserContext(userContext),
+        });
+    }
+    static validateOAuth2RefreshToken(token, scopes, userContext) {
+        return recipe_1.default.getInstanceOrThrowError().recipeInterfaceImpl.introspectToken({
+            token,
+            scopes,
+            userContext: utils_1.getUserContext(userContext),
+        });
+    }
 }
 exports.default = Wrapper;
 Wrapper.init = recipe_1.default.init;
@@ -82,3 +102,4 @@ exports.deleteOAuth2Client = Wrapper.deleteOAuth2Client;
 exports.validateOAuth2AccessToken = Wrapper.validateOAuth2AccessToken;
 exports.validateOAuth2IdToken = Wrapper.validateOAuth2IdToken;
 exports.createTokenForClientCredentials = Wrapper.createTokenForClientCredentials;
+exports.revokeToken = Wrapper.revokeToken;

lib/build/recipe/oauth2provider/recipe.js

@@ -34,6 +34,8 @@ const utils_1 = require("./utils");
 const supertokens_js_override_1 = __importDefault(require("supertokens-js-override"));
 const userInfo_1 = __importDefault(require("./api/userInfo"));
 const combinedRemoteJWKSet_1 = require("../../combinedRemoteJWKSet");
+const revokeToken_1 = __importDefault(require("./api/revokeToken"));
+const introspectToken_1 = __importDefault(require("./api/introspectToken"));
 class Recipe extends recipeModule_1.default {
     constructor(recipeId, appInfo, isInServerlessEnv, config) {
         super(recipeId, appInfo);
@@ -66,6 +68,12 @@ class Recipe extends recipeModule_1.default {
             if (id === constants_1.USER_INFO_PATH) {
                 return userInfo_1.default(this.apiImpl, tenantId, options, userContext);
             }
+            if (id === constants_1.REVOKE_TOKEN_PATH) {
+                return revokeToken_1.default(this.apiImpl, options, userContext);
+            }
+            if (id === constants_1.INTROSPECT_TOKEN_PATH) {
+                return introspectToken_1.default(this.apiImpl, options, userContext);
+            }
             throw new Error("Should never come here: handleAPIRequest called with unknown id");
         };
         this.config = utils_1.validateAndNormaliseUserInput(this, appInfo, config);
@@ -147,6 +155,18 @@ class Recipe extends recipeModule_1.default {
                 id: constants_1.USER_INFO_PATH,
                 disabled: this.apiImpl.userInfoGET === undefined,
             },
+            {
+                method: "post",
+                pathWithoutApiBasePath: new normalisedURLPath_1.default(constants_1.REVOKE_TOKEN_PATH),
+                id: constants_1.REVOKE_TOKEN_PATH,
+                disabled: this.apiImpl.revokeTokenPOST === undefined,
+            },
+            {
+                method: "post",
+                pathWithoutApiBasePath: new normalisedURLPath_1.default(constants_1.INTROSPECT_TOKEN_PATH),
+                id: constants_1.INTROSPECT_TOKEN_PATH,
+                disabled: this.apiImpl.introspectTokenPOST === undefined,
+            },
         ];
     }
     handleError(error, _, __, _userContext) {

lib/build/recipe/oauth2provider/recipeImplementation.js

@@ -265,6 +265,9 @@ function getRecipeInterface(querier, _config, appInfo, getDefaultIdTokenPayload,
             for (const key in input.body) {
                 body[key] = input.body[key];
             }
+            if (input.authorizationHeader) {
+                body["authorizationHeader"] = input.authorizationHeader;
+            }
             const res = await querier.sendPostRequest(
                 new normalisedURLPath_1.default(`/recipe/oauth2/pub/token`),
                 body,
@@ -492,6 +495,50 @@ function getRecipeInterface(querier, _config, appInfo, getDefaultIdTokenPayload,
             }
             return { status: "OK", payload: payload };
         },
+        revokeToken: async function ({ clientId, clientSecret, token, authorizationHeader, userContext }) {
+            const res = await querier.sendPostRequest(
+                new normalisedURLPath_1.default(`/recipe/oauth2/pub/revoke`),
+                Object.assign(
+                    Object.assign(
+                        { $isFormData: true, authorizationHeader },
+                        authorizationHeader === undefined && { client_id: clientId, client_secret: clientSecret }
+                    ),
+                    { token }
+                ),
+                userContext
+            );
+            return res.data;
+        },
+        introspectToken: async function ({ token, scopes, userContext }) {
+            // Determine if the token is an access token by checking if it doesn't start with "ory_rt"
+            const isAccessToken = !token.startsWith("ory_rt");
+            // Attempt to validate the access token locally
+            // If it fails, the token is not active, and we return early
+            if (isAccessToken) {
+                try {
+                    await this.validateOAuth2AccessToken({
+                        token,
+                        requirements: { scopes },
+                        checkDatabase: false,
+                        userContext,
+                    });
+                } catch (error) {
+                    return { active: false };
+                }
+            }
+            // For tokens that passed local validation or if it's a refresh token,
+            // validate the token with the database by calling the core introspection endpoint
+            const res = await querier.sendPostRequest(
+                new normalisedURLPath_1.default(`/recipe/oauth2/admin/oauth2/introspect`),
+                {
+                    $isFormData: true,
+                    token,
+                    scope: scopes ? scopes.join(" ") : undefined,
+                },
+                userContext
+            );
+            return res.data;
+        },
     };
 }
 exports.default = getRecipeInterface;