feat(user): remove supertokens UserRoles

packages/multi-tenant/src/lib/createTenantOwnerRole.ts

@@ -1,9 +1,34 @@
-import UserRoles from "supertokens-node/recipe/userroles";
+import { RoleService } from "@dzangolab/fastify-user";
 
 import { ROLE_TENANT_OWNER } from "../constants";
 
-const createTenantOwnerRole = async () => {
-  await UserRoles.createNewRoleOrAddPermissions(ROLE_TENANT_OWNER, []);
+import type { ApiConfig } from "@dzangolab/fastify-config";
+import type { Database } from "@dzangolab/fastify-slonik";
+import type {
+  Role,
+  RoleCreateInput,
+  RoleUpdateInput,
+} from "@dzangolab/fastify-user";
+
+const createTenantOwnerRole = async (config: ApiConfig, slonik: Database) => {
+  const service = new RoleService<Role, RoleCreateInput, RoleUpdateInput>(
+    config,
+    slonik
+  );
+
+  const filteredCount = await service.count({
+    key: "role",
+    operator: "eq",
+    value: ROLE_TENANT_OWNER,
+  });
+
+  if (!filteredCount) {
+    await service.create({
+      role: ROLE_TENANT_OWNER,
+      permissions: [],
+      default: false,
+    });
+  }
 };
 
 export default createTenantOwnerRole;

packages/multi-tenant/src/lib/updateContext.ts

@@ -1,9 +1,9 @@
 import { wrapResponse } from "supertokens-node/framework/fastify";
 import Session from "supertokens-node/recipe/session";
-import UserRoles from "supertokens-node/recipe/userroles";
 
 import getUserService from "../lib/getUserService";
 
+import type { User } from "@dzangolab/fastify-user";
 import type { FastifyRequest, FastifyReply } from "fastify";
 import type { MercuriusContext } from "mercurius";
 
@@ -26,7 +26,7 @@ const updateContext = async (
     const service = getUserService(config, slonik, tenant);
 
     /* eslint-disable-next-line unicorn/no-null */
-    let user;
+    let user: User | null = null;
 
     try {
       user = await service.findById(userId);
@@ -39,10 +39,8 @@ const updateContext = async (
       throw new Error("Unable to find user");
     }
 
-    const { roles } = await UserRoles.getRolesForUser(userId);
-
     context.user = user;
-    context.roles = roles;
+    context.roles = user.roles;
   }
 };
 

packages/multi-tenant/src/model/tenants/handlers/all.ts

@@ -1,8 +1,8 @@
-import UserRoles from "supertokens-node/recipe/userroles";
-
 import { ROLE_TENANT_OWNER } from "../../../constants";
+import getUserService from "../../../lib/getUserService";
 import Service from "../service";
 
+import type { User } from "@dzangolab/fastify-user";
 import type { FastifyReply } from "fastify";
 import type { SessionRequest } from "supertokens-node/framework/fastify";
 
@@ -24,11 +24,13 @@ const all = async (request: SessionRequest, reply: FastifyReply) => {
 
   const service = new Service(request.config, request.slonik, request.dbSchema);
 
-  const { roles } = await UserRoles.getRolesForUser(userId);
+  const userService = getUserService(request.config, request.slonik);
+
+  const user = (await userService.findById(userId)) as User;
 
   // [DU 2024-JAN-15] TODO: address the scenario in which a user possesses
   // both roles: ADMIN and TENANT_OWNER
-  if (roles.includes(ROLE_TENANT_OWNER)) {
+  if (user.roles.some(({ role }) => role === ROLE_TENANT_OWNER)) {
     service.ownerId = userId;
   }
 

packages/multi-tenant/src/model/tenants/handlers/tenant.ts

@@ -1,8 +1,8 @@
-import UserRoles from "supertokens-node/recipe/userroles";
-
 import { ROLE_TENANT_OWNER } from "../../../constants";
+import getUserService from "../../../lib/getUserService";
 import Service from "../service";
 
+import type { User } from "@dzangolab/fastify-user";
 import type { FastifyReply } from "fastify";
 import type { SessionRequest } from "supertokens-node/framework/fastify";
 
@@ -24,11 +24,13 @@ const tenant = async (request: SessionRequest, reply: FastifyReply) => {
 
   const service = new Service(request.config, request.slonik, request.dbSchema);
 
-  const { roles } = await UserRoles.getRolesForUser(userId);
+  const userService = getUserService(request.config, request.slonik);
+
+  const user = (await userService.findById(userId)) as User;
 
   // [DU 2024-JAN-15] TODO: address the scenario in which a user possesses
   // both roles: ADMIN and TENANT_OWNER
-  if (roles.includes(ROLE_TENANT_OWNER)) {
+  if (user.roles.some(({ role }) => role === ROLE_TENANT_OWNER)) {
     service.ownerId = userId;
   }
 

packages/multi-tenant/src/model/tenants/handlers/tenants.ts

@@ -1,8 +1,8 @@
-import UserRoles from "supertokens-node/recipe/userroles";
-
 import { ROLE_TENANT_OWNER } from "../../../constants";
+import getUserService from "../../../lib/getUserService";
 import Service from "../service";
 
+import type { User } from "@dzangolab/fastify-user";
 import type { FastifyReply } from "fastify";
 import type { SessionRequest } from "supertokens-node/framework/fastify";
 
@@ -24,11 +24,13 @@ const tenants = async (request: SessionRequest, reply: FastifyReply) => {
 
   const service = new Service(request.config, request.slonik, request.dbSchema);
 
-  const { roles } = await UserRoles.getRolesForUser(userId);
+  const userService = getUserService(request.config, request.slonik);
+
+  const user = (await userService.findById(userId)) as User;
 
   // [DU 2024-JAN-15] TODO: address the scenario in which a user possesses
   // both roles: ADMIN and TENANT_OWNER
-  if (roles.includes(ROLE_TENANT_OWNER)) {
+  if (user.roles.some(({ role }) => role === ROLE_TENANT_OWNER)) {
     service.ownerId = userId;
   }
 

packages/multi-tenant/src/model/tenants/resolver.ts

@@ -1,9 +1,10 @@
+import { User } from "@dzangolab/fastify-user";
 import mercurius from "mercurius";
-import UserRoles from "supertokens-node/recipe/userroles";
 
 import Service from "./service";
 import { ROLE_TENANT_OWNER } from "../../constants";
 import getMultiTenantConfig from "../../lib/getMultiTenantConfig";
+import getUserService from "../../lib/getUserService";
 
 import type { TenantCreateInput } from "./../../types";
 import type { FilterInput, SortInput } from "@dzangolab/fastify-slonik";
@@ -99,11 +100,17 @@ const Query = {
       context.dbSchema
     );
 
-    const { roles } = await UserRoles.getRolesForUser(userId);
+    const userService = getUserService(
+      context.config,
+      context.database,
+      context.tenant
+    );
+
+    const { roles } = (await userService.findById(userId)) as User;
 
     // [DU 2024-JAN-15] TODO: address the scenario in which a user possesses
     // both roles: ADMIN and TENANT_OWNER
-    if (roles.includes(ROLE_TENANT_OWNER)) {
+    if (roles.some(({ role }) => role === ROLE_TENANT_OWNER)) {
       service.ownerId = userId;
     }
 
@@ -138,11 +145,17 @@ const Query = {
       context.dbSchema
     );
 
-    const { roles } = await UserRoles.getRolesForUser(userId);
+    const userService = getUserService(
+      context.config,
+      context.database,
+      context.tenant
+    );
+
+    const { roles } = (await userService.findById(userId)) as User;
 
     // [DU 2024-JAN-15] TODO: address the scenario in which a user possesses
     // both roles: ADMIN and TENANT_OWNER
-    if (roles.includes(ROLE_TENANT_OWNER)) {
+    if (roles.some(({ role }) => role === ROLE_TENANT_OWNER)) {
       service.ownerId = userId;
     }
 
@@ -182,11 +195,17 @@ const Query = {
       context.dbSchema
     );
 
-    const { roles } = await UserRoles.getRolesForUser(userId);
+    const userService = getUserService(
+      context.config,
+      context.database,
+      context.tenant
+    );
+
+    const { roles } = (await userService.findById(userId)) as User;
 
     // [DU 2024-JAN-15] TODO: address the scenario in which a user possesses
     // both roles: ADMIN and TENANT_OWNER
-    if (roles.includes(ROLE_TENANT_OWNER)) {
+    if (roles.some(({ role }) => role === ROLE_TENANT_OWNER)) {
       service.ownerId = userId;
     }
 

packages/multi-tenant/src/plugin.ts

@@ -19,15 +19,15 @@ const plugin = async (
   // Register domain discovery plugin
   await fastify.register(tenantDiscoveryPlugin);
 
-  const { config } = fastify;
+  const { config, slonik } = fastify;
 
   const supertokensConfig = { recipes };
 
   // merge supertokens config
   config.user.supertokens = merge(supertokensConfig, config.user.supertokens);
 
   fastify.addHook("onReady", async () => {
-    await createTenantOwnerRole();
+    await createTenantOwnerRole(config, slonik);
   });
 
   done();

packages/multi-tenant/src/supertokens/recipes/third-party-email-password/emailPasswordSignUp.ts

@@ -1,7 +1,11 @@
-import { areRolesExist, sendEmail, verifyEmail } from "@dzangolab/fastify-user";
+import {
+  areRolesExist,
+  getRolesByNames,
+  sendEmail,
+  verifyEmail,
+} from "@dzangolab/fastify-user";
 import { deleteUser } from "supertokens-node";
 import EmailVerification from "supertokens-node/recipe/emailverification";
-import UserRoles from "supertokens-node/recipe/userroles";
 
 import getUserService from "../../../lib/getUserService";
 import Email from "../../utils/email";
@@ -19,7 +23,7 @@ const emailPasswordSignUp = (
   return async (input) => {
     const roles = (input.userContext.roles || []) as string[];
 
-    if (!(await areRolesExist(roles))) {
+    if (!(await areRolesExist(roles, config, slonik))) {
       log.error(`At least one role from ${roles.join(", ")} does not exist.`);
 
       throw {
@@ -73,22 +77,19 @@ const emailPasswordSignUp = (
         };
       }
 
+      const rolesResponse = await getRolesByNames(roles, config, slonik);
+
+      const rolesIds = rolesResponse.map(({ id }) => id);
+
+      await userService.addRolesToUser(originalResponse.user.id, rolesIds);
+
+      user = (await userService.findById(originalResponse.user.id)) as User;
+
       originalResponse.user = {
         ...originalResponse.user,
         ...user,
       };
 
-      for (const role of roles) {
-        const rolesResponse = await UserRoles.addRoleToUser(
-          originalResponse.user.id,
-          role
-        );
-
-        if (rolesResponse.status !== "OK") {
-          log.error(rolesResponse.status);
-        }
-      }
-
       if (config.user.features?.signUp?.emailVerification) {
         try {
           if (input.userContext.autoVerifyEmail) {

packages/multi-tenant/src/supertokens/recipes/third-party-email-password/thirdPartySignInUp.ts

@@ -1,7 +1,6 @@
 import { areRolesExist } from "@dzangolab/fastify-user";
 import { deleteUser } from "supertokens-node";
 import { getUserByThirdPartyInfo } from "supertokens-node/recipe/thirdpartyemailpassword";
-import UserRoles from "supertokens-node/recipe/userroles";
 
 import getMultiTenantConfig from "../../../lib/getMultiTenantConfig";
 
@@ -13,7 +12,7 @@ const thirdPartySignInUp = (
   originalImplementation: RecipeInterface,
   fastify: FastifyInstance
 ): RecipeInterface["thirdPartySignInUp"] => {
-  const { config, log } = fastify;
+  const { config, log, slonik } = fastify;
 
   return async (input) => {
     const roles = (input.userContext.roles || []) as string[];
@@ -43,29 +42,20 @@ const thirdPartySignInUp = (
       input
     );
 
-    if (originalResponse.status === "OK" && originalResponse.createdNewUser) {
-      if (!(await areRolesExist(roles))) {
-        await deleteUser(originalResponse.user.id);
+    if (
+      originalResponse.status === "OK" &&
+      originalResponse.createdNewUser &&
+      !(await areRolesExist(roles, config, slonik))
+    ) {
+      await deleteUser(originalResponse.user.id);
 
-        log.error(`At least one role from ${roles.join(", ")} does not exist.`);
+      log.error(`At least one role from ${roles.join(", ")} does not exist.`);
 
-        throw {
-          name: "SIGN_UP_FAILED",
-          message: "Something went wrong",
-          statusCode: 500,
-        } as FastifyError;
-      }
-
-      for (const role of roles) {
-        const rolesResponse = await UserRoles.addRoleToUser(
-          originalResponse.user.id,
-          role
-        );
-
-        if (rolesResponse.status !== "OK") {
-          log.error(rolesResponse.status);
-        }
-      }
+      throw {
+        name: "SIGN_UP_FAILED",
+        message: "Something went wrong",
+        statusCode: 500,
+      } as FastifyError;
     }
 
     return originalResponse;

packages/multi-tenant/src/supertokens/recipes/third-party-email-password/thirdPartySignInUpPost.ts

@@ -1,5 +1,5 @@
 import { formatDate } from "@dzangolab/fastify-slonik";
-import { ROLE_USER } from "@dzangolab/fastify-user";
+import { ROLE_USER, getRolesByNames } from "@dzangolab/fastify-user";
 import { deleteUser } from "supertokens-node";
 
 import { ROLE_TENANT_OWNER } from "../../../constants";
@@ -80,7 +80,18 @@ const thirdPartySignInUpPOST = (
             throw new Error("User not found");
           }
 
-          user.roles = input.userContext.roles;
+          const rolesResponse = await getRolesByNames(
+            input.userContext.roles,
+            config,
+            slonik
+          );
+
+          const rolesIds = rolesResponse.map(({ id }) => id);
+
+          await userService.addRolesToUser(originalResponse.user.id, rolesIds);
+
+          user = (await userService.findById(originalResponse.user.id)) as User;
+
           /*eslint-disable-next-line @typescript-eslint/no-explicit-any */
         } catch (error: any) {
           log.error("Error while creating user");
@@ -123,14 +134,11 @@ const thirdPartySignInUpPOST = (
           });
       }
       return {
-        status: "OK",
-        createdNewUser: originalResponse.createdNewUser,
+        ...originalResponse,
         user: {
           ...originalResponse.user,
           ...user,
         },
-        session: originalResponse.session,
-        authCodeResponse: originalResponse.authCodeResponse,
       };
     }