fix some typos

Author: n1ru4l

packages/internal/postgres/src/postgres-database-pool.ts

@@ -148,7 +148,7 @@ export class PostgresDatabasePool implements CommonQueryMethods {
             maybeOneFirst: methods.maybeOneFirst,
             anyFirst: methods.anyFirst,
             one: methods.one,
-            transaction<T>(_name: string, handler: (methods: CommonQueryMethods) => Promise<T>) {
+            transaction<T>(name: string, handler: (methods: CommonQueryMethods) => Promise<T>) {
               // We just mark this as a virtual transaction, it still runs as part of the current one.
               const span = tracer.startSpan(`Virtual PG Transaction: ${name}`, {
                 kind: SpanKind.INTERNAL,

packages/services/api/src/modules/oidc-integrations/providers/oidc-integrations.provider.ts

@@ -147,7 +147,7 @@ export class OIDCIntegrationsProvider {
     const userinfoEndpointResult = OAuthAPIUrlModel.safeParse(args.userinfoEndpoint);
     const authorizationEndpointResult = OAuthAPIUrlModel.safeParse(args.authorizationEndpoint);
     const additionalScopesResult = OIDCAdditionalScopesModel.safeParse(args.additionalScopes);
-    const userIdClaimResult = OIDCScopeModel.nullable().safeParse(args.userIdClaim);
+    const userIdClaimResult = OIDCClaimModel.nullable().safeParse(args.userIdClaim);
 
     if (
       clientIdResult.success &&
@@ -272,7 +272,7 @@ export class OIDCIntegrationsProvider {
     const additionalScopesResult = maybe(OIDCAdditionalScopesModel).safeParse(
       args.additionalScopes,
     );
-    const userIdClaimResult = maybe(OIDCScopeModel).safeParse(args.userIdClaim);
+    const userIdClaimResult = maybe(OIDCClaimModel).safeParse(args.userIdClaim);
 
     if (
       clientIdResult.success &&
@@ -898,6 +898,13 @@ const OIDCScopeModel = zod
   .max(50, 'Can not be longer than 50 characters.')
   .regex(/^[a-z0-9](?:[a-z0-9.:/_-]*[a-z0-9])?$/, 'Must be a valid scope.');
 
+const OIDCClaimModel = zod
+  .string()
+  .trim()
+  .nonempty('Must not be empty.')
+  .max(50, 'Can not be longer than 50 characters.')
+  .regex(/^[a-z0-9](?:[a-z0-9.:/_-]*[a-z0-9])?$/, 'Must be a valid scope.');
+
 const OIDCAdditionalScopesModel = zod
   .array(OIDCScopeModel)
   .max(20, 'Can not be more than 20 items.');

packages/services/api/src/modules/operations/module.graphql.ts

@@ -388,7 +388,7 @@ export default gql`
     subgraphs: [String!]
     """
     Wether the trace is successful.
-    A trace is a success if no GraphQL errors occured and the HTTP status code is in the 2XX to 3XX range.
+    A trace is a success if no GraphQL errors occurred and the HTTP status code is in the 2XX to 3XX range.
     """
     success: Boolean!
     """
@@ -449,7 +449,7 @@ export default gql`
     traceIds: [ID!]
     """
     Filter based on whether the operation is a success.
-    A operation is successful if no GraphQL error has occured and the result is within the 2XX or 3XX range.
+    A operation is successful if no GraphQL error has occurred and the result is within the 2XX or 3XX range.
     """
     success: [Boolean!]
     """

packages/services/api/src/modules/organization/providers/group-store.ts

@@ -72,7 +72,7 @@ export class GroupStore {
   }
 
   async getGroupByOrganizationIdAndDisplayName(organizationId: string, displayName: string) {
-    const query = psql` /* getGroupById (batch) */
+    const query = psql` /* getGroupByOrganizationIdAndDisplayName (batch) */
       SELECT
         ${groupFields}
       FROM
@@ -102,16 +102,16 @@ export class GroupStore {
 
   async getGroupByOrganizationIdAndExternalGroupId(
     organizationId: string,
-    externaGrouplId: string,
+    externalGroupId: string,
   ) {
-    const query = psql` /* getGroupById (batch) */
+    const query = psql` /* getGroupByOrganizationIdAndExternalGroupId */
       SELECT
         ${groupFields}
       FROM
         "groups"
       WHERE
         "organization_id" = ${organizationId}
-        AND "external_id" = ${externaGrouplId}
+        AND "external_id" = ${externalGroupId}
     `;
 
     return await this.pool.maybeOne(query).then(GroupModel.nullable().parse);
@@ -124,7 +124,7 @@ export class GroupStore {
       count: number;
     },
   ) {
-    const query = psql` /* getGroupById (batch) */
+    const query = psql` /* getOffsetPaginatedGroupsForOrganizationId */
       SELECT
         ${groupFields}
       FROM

packages/services/api/src/modules/organization/providers/provisioned-users-store.ts

@@ -207,7 +207,7 @@ export class ProvisionedUsersStore {
     });
   }
 
-  async enabledUser(userId: string, trx: CommonQueryMethods) {
+  async enableUser(userId: string, trx: CommonQueryMethods) {
     const query = psql`
       UPDATE "users"
       SET "deactivated_at" = NULL

packages/services/api/src/modules/support/providers/support-manager.ts

@@ -357,7 +357,7 @@ export class SupportManager {
           );
         } else {
           this.logger.debug(
-            'An unexpected error occured while connecting the user to the zendesk organization. (err=%s, organization: %s, user: %s, zendeskUserId: %d, zendeskOrganizationId: %d)',
+            'An unexpected error occurred while connecting the user to the zendesk organization. (err=%s, organization: %s, user: %s, zendeskUserId: %d, zendeskOrganizationId: %d)',
             String(err),
             input.organizationId,
             input.userId,

packages/services/server/src/graphql-handler.ts

@@ -196,7 +196,7 @@ export const graphqlHandler = (options: GraphQLHandlerOptions): RouteHandlerMeth
     plugins: [
       useArmor(),
       useHiveErrorHandler(err => {
-        options.logger.error(err, 'Unexpected error occured while handling exception.');
+        options.logger.error(err, 'Unexpected error occurred while handling exception.');
       }),
       useExtendContext(async context => ({
         session: await options.authN.authenticate(context),

packages/services/server/src/public-graphql-handler.ts

@@ -48,7 +48,7 @@ export const createPublicGraphQLHandler = (
         session: await args.authN.authenticate(context),
       })),
       useHiveErrorHandler(err => {
-        args.logger.error(err, 'Unexpected error occured while handling exception.');
+        args.logger.error(err, 'Unexpected error occurred while handling exception.');
       }),
       useHive({
         debug: true,

packages/services/server/src/scim.ts

@@ -363,7 +363,7 @@ export const createSCIMPlugin =
           if (user.deactivatedAt === null && !updates.active) {
             user = await usersStore.disableUser(user.id, trx);
           } else if (user.deactivatedAt !== null && updates.active) {
-            user = await usersStore.enabledUser(user.id, trx);
+            user = await usersStore.enableUser(user.id, trx);
           }
         }
         if (email) {
@@ -491,14 +491,14 @@ export const createSCIMPlugin =
         };
       }
 
-      if (!group.externalId && !group.displayName) {
+      if (!properties.externalId && !properties.displayName) {
         return {
           type: 'success' as const,
           group,
         };
       }
 
-      return await trx.transaction('update group prperties', async () => {
+      return await trx.transaction('update group properties', async () => {
         const result = await groupStore.updateGroupPropertiesByOrganizationIdAndGroupId(
           group.organizationId,
           group.id,
@@ -581,7 +581,7 @@ export const createSCIMPlugin =
       return reply.status(500).send(
         createSCIMError({
           status: 500,
-          detail: 'An unexpected error occured.',
+          detail: 'An unexpected error occurred.',
         }),
       );
     });
@@ -938,7 +938,7 @@ export const createSCIMPlugin =
       for (const operation of body.data.Operations) {
         if (operation.op !== 'replace') {
           auth.logger.debug(
-            'unsupported operation received. we aonly support replace for patch for now',
+            'unsupported operation received. we only support replace and patch for now',
             operation.op,
           );
           continue;
@@ -1092,7 +1092,7 @@ export const createSCIMPlugin =
           'id',
         ]);
         if (filterParseResult.type === 'error') {
-          return reply.status(400).send(auth.error);
+          return reply.status(400).send(filterParseResult.error);
         }
 
         const { property, value } = filterParseResult;

packages/services/server/src/supertokens-at-home.ts

@@ -1462,7 +1462,7 @@ export async function registerSupertokensAtHome(
           req.log.debug('received non 200 status from token endpoint %d', grantResponse.status);
           broadcastLog(
             oidcIntegration.id,
-            `an unexpected error occured while calling your token endoint '${oidcIntegration.tokenEndpoint}'. HTTP Status: ${grantResponse.status} Body: ${await grantResponse.text()}.`,
+            `an unexpected error occurred while calling your token endoint '${oidcIntegration.tokenEndpoint}'. HTTP Status: ${grantResponse.status} Body: ${await grantResponse.text()}.`,
           );
 
           return rep.status(200).send({
@@ -1522,7 +1522,7 @@ export async function registerSupertokensAtHome(
           );
           broadcastLog(
             oidcIntegration.id,
-            `an unexpected error occured while calling the user info endoint '${oidcIntegration.userinfoEndpoint}'. HTTP Status: ${userInfoResponse.status} HTTP Body: ${userInfoBodyRaw}.`,
+            `an unexpected error occurred while calling the user info endoint '${oidcIntegration.userinfoEndpoint}'. HTTP Status: ${userInfoResponse.status} HTTP Body: ${userInfoBodyRaw}.`,
           );
 
           return rep.status(200).send({