chore: move users.authenticate_token and users.fetch to *_internal

rivet-gg · Sep 27, 2024 · 3789954 · 3789954
1 parent 80763be
commit 3789954
Show file tree

Hide file tree

Showing 27 changed files with 32 additions and 32 deletions.
diff --git a/modules/auth_email/scripts/verify_add_email_pass.ts b/modules/auth_email/scripts/verify_add_email_pass.ts
@@ -30,7 +30,7 @@ export async function run(
 	}
 
 	// Ensure that the email is not associated with ANY accounts in ANY way.
-	const providedUser = await ctx.modules.users.authenticateToken({
+	const providedUser = await ctx.modules.users.authenticateTokenInternal({
 		userToken: req.userToken,
 	});
 	await ensureNotAssociatedAll(ctx, email, new Set([providedUser.userId]));

diff --git a/modules/auth_email/scripts/verify_add_no_pass.ts b/modules/auth_email/scripts/verify_add_no_pass.ts
@@ -21,7 +21,7 @@ export async function run(
 	const { email } = await verifyCode(ctx, req.verificationToken, req.code);
 
 	// Ensure that the email is not already associated with another account
-	const providedUser = await ctx.modules.users.authenticateToken({
+	const providedUser = await ctx.modules.users.authenticateTokenInternal({
 		userToken: req.userToken,
 	});
 	await ensureNotAssociatedAll(ctx, email, new Set([providedUser.userId]));

diff --git a/modules/auth_email/scripts/verify_link_email.ts b/modules/auth_email/scripts/verify_link_email.ts
@@ -21,7 +21,7 @@ export async function run(
 	const { email } = await verifyCode(ctx, req.verificationToken, req.code);
 
 	// Ensure that the email is not already associated with another account
-	const providedUser = await ctx.modules.users.authenticateToken({
+	const providedUser = await ctx.modules.users.authenticateTokenInternal({
 		userToken: req.userToken,
 	});
 	await ensureNotAssociatedAll(ctx, email, new Set([providedUser.userId]));

diff --git a/modules/auth_email/tests/already_used.ts b/modules/auth_email/tests/already_used.ts
@@ -129,7 +129,7 @@ test("email_link_then_add_pass", async (ctx: TestContext) => {
 	const password = faker.internet.password();
 
 	const { userToken } = await signUpEmailLink(ctx, email);
-	const { user } = await ctx.modules.users.authenticateToken({
+	const { user } = await ctx.modules.users.authenticateTokenInternal({
 		userToken,
 		fetchUser: true,
 	});
@@ -161,7 +161,7 @@ test("email_link_then_add_no_pass", async (ctx: TestContext) => {
 	const email = faker.internet.email();
 
 	const { userToken } = await signUpEmailLink(ctx, email);
-	const { user } = await ctx.modules.users.authenticateToken({
+	const { user } = await ctx.modules.users.authenticateTokenInternal({
 		userToken,
 		fetchUser: true,
 	});

diff --git a/modules/auth_email/tests/common.ts b/modules/auth_email/tests/common.ts
@@ -45,7 +45,7 @@ export async function checkLogin(
 	newToken: string,
 ) {
 	const { userId: signedInUserId, user: signedInUser } = await ctx.modules.users
-		.authenticateToken({
+		.authenticateTokenInternal({
 			userToken: newToken,
 			fetchUser: true,
 		});

diff --git a/modules/auth_email/tests/create.ts b/modules/auth_email/tests/create.ts
@@ -22,7 +22,7 @@ test("create_with_email_and_login_passwordless", async (ctx: TestContext) => {
 		userToken = signUpRes.userToken;
 	}
 
-	const { user } = await ctx.modules.users.authenticateToken({
+	const { user } = await ctx.modules.users.authenticateTokenInternal({
 		userToken,
 		fetchUser: true,
 	});
@@ -65,7 +65,7 @@ test("create_with_email_and_login_password", async (ctx: TestContext) => {
 		userToken = signUpRes.userToken;
 	}
 
-	const { user } = await ctx.modules.users.authenticateToken({
+	const { user } = await ctx.modules.users.authenticateTokenInternal({
 		userToken,
 		fetchUser: true,
 	});

diff --git a/modules/auth_email/utils/link_assertions.ts b/modules/auth_email/utils/link_assertions.ts
@@ -41,7 +41,7 @@ export async function ensureNotAssociated(
 		}
 	}
 	// Email matches an existing identity using this provider
-	const existingUser = await ctx.modules.users.authenticateToken(
+	const existingUser = await ctx.modules.users.authenticateTokenInternal(
 		existingIdentity,
 	);
 

diff --git a/modules/auth_username_password/tests/e2e.ts b/modules/auth_username_password/tests/e2e.ts
@@ -13,7 +13,7 @@ test("test_sign_up", async (ctx: TestContext) => {
 		password,
 	});
 
-	const { userId } = await ctx.modules.users.authenticateToken({
+	const { userId } = await ctx.modules.users.authenticateTokenInternal({
 		userToken: token.token,
 	});
 
@@ -51,7 +51,7 @@ test("test_sign_in", async (ctx: TestContext) => {
 		password,
 	});
 
-	const { userId } = await ctx.modules.users.authenticateToken({
+	const { userId } = await ctx.modules.users.authenticateTokenInternal({
 		userToken: token.token,
 	});
 

diff --git a/modules/currency/scripts/fetch_balance_by_token.ts b/modules/currency/scripts/fetch_balance_by_token.ts
@@ -15,7 +15,7 @@ export async function run(
 ): Promise<Response> {
 	await ctx.modules.rateLimit.throttlePublic({ requests: 25 });
 
-	const { userId } = await ctx.modules.users.authenticateToken({
+	const { userId } = await ctx.modules.users.authenticateTokenInternal({
 		userToken: req.userToken,
 	});
 	const { balance } = await ctx.modules.currency.fetchBalance({ userId });

diff --git a/modules/friends/scripts/accept_request.ts b/modules/friends/scripts/accept_request.ts
@@ -13,7 +13,7 @@ export async function run(
 ): Promise<Response> {
 	await ctx.modules.rateLimit.throttlePublic({ requests: 50 });
 
-	const { userId } = await ctx.modules.users.authenticateToken({
+	const { userId } = await ctx.modules.users.authenticateTokenInternal({
 		userToken: req.userToken,
 	});
 

diff --git a/modules/friends/scripts/decline_request.ts b/modules/friends/scripts/decline_request.ts
@@ -13,7 +13,7 @@ export async function run(
 ): Promise<Response> {
 	await ctx.modules.rateLimit.throttlePublic({ requests: 50 });
 
-	const { userId } = await ctx.modules.users.authenticateToken({
+	const { userId } = await ctx.modules.users.authenticateTokenInternal({
 		userToken: req.userToken,
 	});
 

diff --git a/modules/friends/scripts/list_friends.ts b/modules/friends/scripts/list_friends.ts
@@ -15,7 +15,7 @@ export async function run(
 ): Promise<Response> {
 	await ctx.modules.rateLimit.throttlePublic({ requests: 50 });
 
-	const { userId } = await ctx.modules.users.authenticateToken({
+	const { userId } = await ctx.modules.users.authenticateTokenInternal({
 		userToken: req.userToken,
 	});
 

diff --git a/modules/friends/scripts/list_incoming_friend_requests.ts b/modules/friends/scripts/list_incoming_friend_requests.ts
@@ -15,7 +15,7 @@ export async function run(
 ): Promise<Response> {
 	await ctx.modules.rateLimit.throttlePublic({ requests: 50 });
 
-	const { userId } = await ctx.modules.users.authenticateToken({
+	const { userId } = await ctx.modules.users.authenticateTokenInternal({
 		userToken: req.userToken,
 	});
 

diff --git a/modules/friends/scripts/list_outgoing_friend_requests.ts b/modules/friends/scripts/list_outgoing_friend_requests.ts
@@ -15,7 +15,7 @@ export async function run(
 ): Promise<Response> {
 	await ctx.modules.rateLimit.throttlePublic({});
 
-	const { userId } = await ctx.modules.users.authenticateToken({
+	const { userId } = await ctx.modules.users.authenticateTokenInternal({
 		userToken: req.userToken,
 	});
 

diff --git a/modules/friends/scripts/remove_friend.ts b/modules/friends/scripts/remove_friend.ts
@@ -13,7 +13,7 @@ export async function run(
 ): Promise<Response> {
 	await ctx.modules.rateLimit.throttlePublic({ requests: 50 });
 
-	const { userId } = await ctx.modules.users.authenticateToken({
+	const { userId } = await ctx.modules.users.authenticateTokenInternal({
 		userToken: req.userToken,
 	});
 

diff --git a/modules/friends/scripts/send_request.ts b/modules/friends/scripts/send_request.ts
@@ -16,7 +16,7 @@ export async function run(
 ): Promise<Response> {
 	await ctx.modules.rateLimit.throttlePublic({});
 
-	const { userId } = await ctx.modules.users.authenticateToken({
+	const { userId } = await ctx.modules.users.authenticateTokenInternal({
 		userToken: req.userToken,
 	});
 

diff --git a/modules/identities/scripts/fetch.ts b/modules/identities/scripts/fetch.ts
@@ -18,7 +18,7 @@ export async function run(
 	req: Request,
 ): Promise<Response> {
     // Ensure the user token is valid and get the user ID
-    const { userId } = await ctx.modules.users.authenticateToken({ userToken: req.userToken });
+    const { userId } = await ctx.modules.users.authenticateTokenInternal({ userToken: req.userToken });
 
     // Get identity data
     const identity = await ctx.db.query.userIdentities.findFirst({

diff --git a/modules/identities/scripts/link.ts b/modules/identities/scripts/link.ts
@@ -18,7 +18,7 @@ export async function run(
 ): Promise<Response> {
 
     // Ensure the user token is valid and get the user ID
-    const { userId } = await ctx.modules.users.authenticateToken({ userToken: req.userToken } );
+    const { userId } = await ctx.modules.users.authenticateTokenInternal({ userToken: req.userToken } );
 
     return await ctx.db.transaction(async (tx) => {
         // Error if this identity provider is ALREADY associated with the user

diff --git a/modules/identities/scripts/list.ts b/modules/identities/scripts/list.ts
@@ -16,7 +16,7 @@ export async function run(
 	await ctx.modules.rateLimit.throttlePublic({});
 
     // Ensure the user token is valid and get the user ID
-    const { userId } = await ctx.modules.users.authenticateToken({ userToken: req.userToken } );
+    const { userId } = await ctx.modules.users.authenticateTokenInternal({ userToken: req.userToken } );
 
     const identityProviders = await ctx.db.query.userIdentities.findMany({
         where: Query.eq(Database.userIdentities.userId, userId),

diff --git a/modules/identities/scripts/set.ts b/modules/identities/scripts/set.ts
@@ -15,7 +15,7 @@ export async function run(
 	req: Request,
 ): Promise<Response> {
     // Ensure the user token is valid and get the user ID
-    const { userId } = await ctx.modules.users.authenticateToken({ userToken: req.userToken } );
+    const { userId } = await ctx.modules.users.authenticateTokenInternal({ userToken: req.userToken } );
 
     await ctx.db.transaction(async (tx) => {
         // Ensure the identity provider is associated with the user

diff --git a/modules/identities/tests/sign_up.ts b/modules/identities/tests/sign_up.ts
@@ -14,7 +14,7 @@ export async function signUpWithTest(ctx: TestContext, username: string, uniqueD
         additionalData,
     });
 
-    const { userId, user } = await ctx.modules.users.authenticateToken({
+    const { userId, user } = await ctx.modules.users.authenticateTokenInternal({
         userToken,
         fetchUser: true,
     });
@@ -34,7 +34,7 @@ export async function signInWithTest(ctx: TestContext, uniqueData: any) {
         uniqueData,
     });
 
-    const { userId, user } = await ctx.modules.users.authenticateToken({
+    const { userId, user } = await ctx.modules.users.authenticateTokenInternal({
         userToken,
         fetchUser: true,
     });

diff --git a/modules/users/module.json b/modules/users/module.json
@@ -16,10 +16,10 @@
     "tokens": {}
   },
   "scripts": {
-    "fetch": {
+    "fetch_internal": {
       "name": "Fetch User"
     },
-    "pub_fetch": {
+    "fetch": {
       "name": "Fetch User",
       "public": true
     },
@@ -29,11 +29,11 @@
     "create": {
       "name": "Create User"
     },
-    "authenticate_token": {
+    "authenticate_token_internal": {
       "name": "Authenticate User Token",
       "description": "Validate a user token. Throws an error if the token is invalid."
     },
-    "pub_authenticate_token": {
+    "authenticate_token": {
       "name": "Public Authenticate User Token",
       "description": "Validate a user token. Throws an error if the token is invalid.",
       "public": true

diff --git a/modules/users/scripts/authenticate_token.ts b/modules/users/scripts/authenticate_token.ts
@@ -16,6 +16,7 @@ export async function run(
 	ctx: ScriptContext,
 	req: Request,
 ): Promise<Response> {
+	await ctx.modules.rateLimit.throttlePublic({});
 
 	const { token } = await ctx.modules.tokens.validate({
 		token: req.userToken,

diff --git a/...s/users/scripts/pub_authenticate_token.ts → ...rs/scripts/authenticate_token_internal.ts b/...s/users/scripts/pub_authenticate_token.ts → ...rs/scripts/authenticate_token_internal.ts
@@ -16,7 +16,6 @@ export async function run(
 	ctx: ScriptContext,
 	req: Request,
 ): Promise<Response> {
-	await ctx.modules.rateLimit.throttlePublic({});
 
 	const { token } = await ctx.modules.tokens.validate({
 		token: req.userToken,

diff --git a/modules/users/scripts/fetch.ts b/modules/users/scripts/fetch.ts
@@ -13,6 +13,7 @@ export async function run(
 	ctx: ScriptContext,
 	req: Request,
 ): Promise<Response> {
+	await ctx.modules.rateLimit.throttlePublic({});
 
   const users = await ctx.db.query.users.findMany({
     where: Query.inArray(Database.users.id, req.userIds),

diff --git a/modules/users/scripts/pub_fetch.ts → modules/users/scripts/fetch_internal.ts b/modules/users/scripts/pub_fetch.ts → modules/users/scripts/fetch_internal.ts
@@ -13,7 +13,6 @@ export async function run(
 	ctx: ScriptContext,
 	req: Request,
 ): Promise<Response> {
-	await ctx.modules.rateLimit.throttlePublic({});
 
   const users = await ctx.db.query.users.findMany({
     where: Query.inArray(Database.users.id, req.userIds),

diff --git a/modules/users/tests/e2e.ts b/modules/users/tests/e2e.ts
@@ -17,7 +17,7 @@ test("e2e", async (ctx: TestContext) => {
 		userId: user.id,
 	});
 
-	const { userId } = await ctx.modules.users.authenticateToken({
+	const { userId } = await ctx.modules.users.authenticateTokenInternal({
 		userToken: token.token,
 	});
 	assertEquals(user.id, userId);