Remove unused access level fields

PretendoNetwork · Jan 23, 2025 · 52b6c9b · 52b6c9b
1 parent d170450
commit 52b6c9b
Show file tree

Hide file tree

Showing 8 changed files with 419 additions and 173 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.657.0",
     "@aws-sdk/client-ses": "^3.515.0",
-    "@pretendonetwork/grpc": "^1.0.5",
+    "@pretendonetwork/grpc": "^2.0.1",
     "bcrypt": "^5.0.0",
     "buffer-crc32": "^0.2.13",
     "colors": "^1.4.0",
@@ -84,4 +84,4 @@
     "ndarray": "^1.0.19",
     "typescript": "^4.9.5"
   }
-}
+}
diff --git a/src/services/grpc/account/update-pnid-permissions.ts b/src/services/grpc/account/update-pnid-permissions.ts
@@ -2,7 +2,7 @@ import { Status, ServerError } from 'nice-grpc';
 import { UpdatePNIDPermissionsRequest } from '@pretendonetwork/grpc/account/update_pnid_permissions';
 import { getPNIDByPID } from '@/database';
 import { PNID_PERMISSION_FLAGS } from '@/types/common/permission-flags';
-import type { Empty } from '@pretendonetwork/grpc/api/google/protobuf/empty';
+import type { Empty } from '@pretendonetwork/grpc/google/protobuf/empty';
 
 export async function updatePNIDPermissions(request: UpdatePNIDPermissionsRequest): Promise<Empty> {
 	const pnid = await getPNIDByPID(request.pid);

diff --git a/src/services/grpc/api/forgot-password.ts b/src/services/grpc/api/forgot-password.ts
@@ -3,7 +3,7 @@ import validator from 'validator';
 import { ForgotPasswordRequest } from '@pretendonetwork/grpc/api/forgot_password_rpc';
 import { getPNIDByEmailAddress, getPNIDByUsername } from '@/database';
 import { sendForgotPasswordEmail } from '@/util';
-import type { Empty } from '@pretendonetwork/grpc/api/google/protobuf/empty';
+import type { Empty } from '@pretendonetwork/grpc/google/protobuf/empty';
 import type { HydratedPNIDDocument } from '@/types/mongoose/pnid';
 
 export async function forgotPassword(request: ForgotPasswordRequest): Promise<Empty> {

diff --git a/src/services/grpc/api/get-user-data.ts b/src/services/grpc/api/get-user-data.ts
@@ -1,7 +1,7 @@
 import { CallContext } from 'nice-grpc';
 import { GetUserDataResponse, DeepPartial } from '@pretendonetwork/grpc/api/get_user_data_rpc';
 import { config } from '@/config-manager';
-import type { Empty } from '@pretendonetwork/grpc/api/google/protobuf/empty';
+import type { Empty } from '@pretendonetwork/grpc/google/protobuf/empty';
 import type { AuthenticationCallContextExt } from '@/services/grpc/api/authentication-middleware';
 
 export async function getUserData(_request: Empty, context: CallContext & AuthenticationCallContextExt): Promise<DeepPartial<GetUserDataResponse>> {

diff --git a/src/services/grpc/api/reset-password.ts b/src/services/grpc/api/reset-password.ts
@@ -3,7 +3,7 @@ import { Status, ServerError } from 'nice-grpc';
 import { ResetPasswordRequest } from '@pretendonetwork/grpc/api/reset_password_rpc';
 import { decryptToken, unpackToken, nintendoPasswordHash } from '@/util';
 import { getPNIDByPID } from '@/database';
-import type { Empty } from '@pretendonetwork/grpc/api/google/protobuf/empty';
+import type { Empty } from '@pretendonetwork/grpc/google/protobuf/empty';
 import type { Token } from '@/types/common/token';
 
 // * This sucks

diff --git a/src/services/grpc/api/set-discord-connection-data.ts b/src/services/grpc/api/set-discord-connection-data.ts
@@ -1,6 +1,6 @@
 import { Status, ServerError, CallContext } from 'nice-grpc';
 import { SetDiscordConnectionDataRequest } from '@pretendonetwork/grpc/api/set_discord_connection_data_rpc';
-import type { Empty } from '@pretendonetwork/grpc/api/google/protobuf/empty';
+import type { Empty } from '@pretendonetwork/grpc/google/protobuf/empty';
 import type { AuthenticationCallContextExt } from '@/services/grpc/api/authentication-middleware';
 
 export async function setDiscordConnectionData(request: SetDiscordConnectionDataRequest, context: CallContext & AuthenticationCallContextExt): Promise<Empty>{

diff --git a/src/services/grpc/api/set-stripe-connection-data.ts b/src/services/grpc/api/set-stripe-connection-data.ts
@@ -1,12 +1,10 @@
 import { Status, ServerError, CallContext } from 'nice-grpc';
 import { SetStripeConnectionDataRequest } from '@pretendonetwork/grpc/api/set_stripe_connection_data_rpc';
 import { PNID } from '@/models/pnid';
-import type { Empty } from '@pretendonetwork/grpc/api/google/protobuf/empty';
+import type { Empty } from '@pretendonetwork/grpc/google/protobuf/empty';
 import type { AuthenticationCallContextExt } from '@/services/grpc/api/authentication-middleware';
 
 type StripeMongoUpdateScheme = {
-	access_level?: number;
-	server_access_level?: string;
 	'connections.stripe.customer_id'?: string;
 	'connections.stripe.subscription_id'?: string;
 	'connections.stripe.price_id'?: string;
@@ -29,14 +27,6 @@ export async function setStripeConnectionData(request: SetStripeConnectionDataRe
 
 	// * These checks allow for null/0 values in order to reset data if needed
 
-	if (request.accessLevel !== undefined) {
-		updateData.access_level = request.accessLevel;
-	}
-
-	if (request.serverAccessLevel !== undefined) {
-		updateData.server_access_level = request.serverAccessLevel;
-	}
-
 	if (request.subscriptionId !== undefined) {
 		updateData['connections.stripe.subscription_id'] = request.subscriptionId;
 	}