refactor: make UserProvider functional

backend/src/auth/external/facebook.auth.ts

@@ -1,4 +1,4 @@
-import { UserProvider } from "@backend/auth/user/user-provider.js";
+import UserProvider from "@backend/auth/user/user-provider.js";
 import { createPath, retrieveRefererPath } from "@backend/config/api-path.js";
 import { APP_CONFIG } from "@backend/config/application-config.js";
 import { BlEnv } from "@backend/config/env.js";
@@ -26,7 +26,7 @@ function createPassportStrategy() {
 
         try {
           const username = extractUsername(profile);
-          userAndTokens = await new UserProvider().loginOrCreate(
+          userAndTokens = await UserProvider.loginOrCreate(
             username,
             provider,
             providerId,

backend/src/auth/external/google.auth.ts

@@ -1,4 +1,4 @@
-import { UserProvider } from "@backend/auth/user/user-provider.js";
+import UserProvider from "@backend/auth/user/user-provider.js";
 import { createPath, retrieveRefererPath } from "@backend/config/api-path.js";
 import { APP_CONFIG } from "@backend/config/application-config.js";
 import { BlEnv } from "@backend/config/env.js";
@@ -29,7 +29,7 @@ function createPassportStrategy() {
         let userAndTokens;
 
         try {
-          userAndTokens = await new UserProvider().loginOrCreate(
+          userAndTokens = await UserProvider.loginOrCreate(
             username,
             provider,
             providerId,

backend/src/auth/user/user-provider.ts

@@ -3,38 +3,41 @@ import TokenHandler from "@backend/auth/token/token.handler.js";
 import UserHandler from "@backend/auth/user/user.handler.js";
 import { User } from "@backend/types/user.js";
 
-export class UserProvider {
-  public async loginOrCreate(
-    username: string,
-    provider: string,
-    providerId: string,
-  ): Promise<{
-    user: User;
-    tokens: { accessToken: string; refreshToken: string };
-  }> {
-    const user = await this.getUser(username, provider, providerId);
+async function getUser(
+  username: string,
+  provider: string,
+  providerId: string,
+): Promise<User> {
+  let user;
+  try {
+    user = await UserHandler.get(provider, providerId);
+  } catch {
+    user = await UserHandler.create(username, provider, providerId);
+  }
 
-    await UserHandler.valid(username);
+  return user;
+}
 
-    await LocalLoginHandler.createDefaultLocalLoginIfNoneIsFound(username);
+async function loginOrCreate(
+  username: string,
+  provider: string,
+  providerId: string,
+): Promise<{
+  user: User;
+  tokens: { accessToken: string; refreshToken: string };
+}> {
+  const user = await getUser(username, provider, providerId);
 
-    const tokens = await TokenHandler.createTokens(username);
+  await UserHandler.valid(username);
 
-    return { user: user, tokens: tokens };
-  }
+  await LocalLoginHandler.createDefaultLocalLoginIfNoneIsFound(username);
 
-  private async getUser(
-    username: string,
-    provider: string,
-    providerId: string,
-  ): Promise<User> {
-    let user;
-    try {
-      user = await UserHandler.get(provider, providerId);
-    } catch {
-      user = await UserHandler.create(username, provider, providerId);
-    }
-
-    return user;
-  }
+  const tokens = await TokenHandler.createTokens(username);
+
+  return { user: user, tokens: tokens };
 }
+
+const UserProvider = {
+  loginOrCreate,
+};
+export default UserProvider;

backend/src/tests/user-provider.spec.ts

@@ -1,7 +1,7 @@
 import "mocha";
 import LocalLoginHandler from "@backend/auth/local/local-login.handler.js";
 import TokenHandler from "@backend/auth/token/token.handler.js";
-import { UserProvider } from "@backend/auth/user/user-provider.js";
+import UserProvider from "@backend/auth/user/user-provider.js";
 import UserHandler from "@backend/auth/user/user.handler.js";
 import { BlError } from "@shared/bl-error/bl-error.js";
 import { expect, use as chaiUse, should } from "chai";
@@ -18,7 +18,6 @@ describe("UserProvider", () => {
   let userValidStub: sinon.SinonStub;
   let createTokenStub: sinon.SinonStub;
   let createDefaultLocalLoginStub: sinon.SinonStub;
-  const userProvider = new UserProvider();
 
   beforeEach(() => {
     sandbox = createSandbox();
@@ -41,7 +40,7 @@ describe("UserProvider", () => {
       userValidStub.rejects(new BlError("user is not valid"));
 
       return expect(
-        userProvider.loginOrCreate("[email protected]", "local", "abcdef"),
+        UserProvider.loginOrCreate("[email protected]", "local", "abcdef"),
       ).to.eventually.be.rejectedWith(BlError, /user is not valid/);
     });
 
@@ -53,7 +52,7 @@ describe("UserProvider", () => {
       );
 
       return expect(
-        userProvider.loginOrCreate("[email protected]", "local", "abcde"),
+        UserProvider.loginOrCreate("[email protected]", "local", "abcde"),
       ).to.eventually.be.rejectedWith(
         BlError,
         /local login could not be created/,
@@ -66,7 +65,7 @@ describe("UserProvider", () => {
         userCreateStub.rejects(new BlError("user could not be created"));
 
         return expect(
-          userProvider.loginOrCreate("[email protected]", "local", "abcde"),
+          UserProvider.loginOrCreate("[email protected]", "local", "abcde"),
         ).to.eventually.be.rejectedWith(BlError, /user could not be created/);
       });
 
@@ -80,7 +79,7 @@ describe("UserProvider", () => {
         createTokenStub.resolves(tokens);
 
         return expect(
-          userProvider.loginOrCreate("[email protected]", "local", "abcdefg"),
+          UserProvider.loginOrCreate("[email protected]", "local", "abcdefg"),
         ).to.eventually.be.eql({ user: user, tokens: tokens });
       });
     });
@@ -96,7 +95,7 @@ describe("UserProvider", () => {
         createTokenStub.resolves(tokens);
 
         return expect(
-          userProvider.loginOrCreate("[email protected]", "local", "abcdefg"),
+          UserProvider.loginOrCreate("[email protected]", "local", "abcdefg"),
         ).to.eventually.be.eql({ user: user, tokens: tokens });
       });
     });