feat(authentication, types): split authenticate method into two

packages/authentication/integration-tests/__tests__/services/module/providers.spec.ts

@@ -1,11 +1,10 @@
-import { SqlEntityManager } from "@mikro-orm/postgresql"
-
-import { MikroOrmWrapper } from "../../../utils"
-import { initialize } from "../../../../src"
 import { DB_URL } from "@medusajs/pricing/integration-tests/utils"
-import { MedusaModule } from "@medusajs/modules-sdk"
 import { IAuthenticationModuleService } from "@medusajs/types"
+import { MedusaModule } from "@medusajs/modules-sdk"
+import { MikroOrmWrapper } from "../../../utils"
+import { SqlEntityManager } from "@mikro-orm/postgresql"
 import { createAuthProviders } from "../../../__fixtures__/auth-provider"
+import { initialize } from "../../../../src"
 
 jest.setTimeout(30000)
 
@@ -24,7 +23,7 @@ describe("AuthenticationModuleService - AuthProvider", () => {
       },
     })
 
-    if(service.__hooks?.onApplicationStart) {
+    if (service.__hooks?.onApplicationStart) {
       await service.__hooks.onApplicationStart()
     }
   })
@@ -39,12 +38,18 @@ describe("AuthenticationModuleService - AuthProvider", () => {
       const authProviders = await service.listAuthProviders()
       const serialized = JSON.parse(JSON.stringify(authProviders))
 
-      expect(serialized).toEqual([
-        expect.objectContaining({
-          provider: "usernamePassword",
-          name: "Username/Password Authentication",
-        }),
-      ])
+      expect(serialized).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            provider: "usernamePassword",
+            name: "Username/Password Authentication",
+          }),
+          expect.objectContaining({
+            provider: "google",
+            name: "Google Authentication",
+          }),
+        ])
+      )
     })
   })
 

packages/authentication/integration-tests/__tests__/services/providers/username-password.spec.ts

@@ -1,13 +1,12 @@
-import { SqlEntityManager } from "@mikro-orm/postgresql"
-import Scrypt from "scrypt-kdf"
-
-import { MikroOrmWrapper } from "../../../utils"
-import { initialize } from "../../../../src"
 import { DB_URL } from "@medusajs/pricing/integration-tests/utils"
-import { MedusaModule } from "@medusajs/modules-sdk"
 import { IAuthenticationModuleService } from "@medusajs/types"
-import { createAuthUsers } from "../../../__fixtures__/auth-user"
+import { MedusaModule } from "@medusajs/modules-sdk"
+import { MikroOrmWrapper } from "../../../utils"
+import Scrypt from "scrypt-kdf"
+import { SqlEntityManager } from "@mikro-orm/postgresql"
 import { createAuthProviders } from "../../../__fixtures__/auth-provider"
+import { createAuthUsers } from "../../../__fixtures__/auth-user"
+import { initialize } from "../../../../src"
 
 jest.setTimeout(30000)
 const seedDefaultData = async (testManager) => {
@@ -60,7 +59,7 @@ describe("AuthenticationModuleService - AuthProvider", () => {
         },
       ])
 
-      const res = await service.authenticate("usernamePassword", {
+      const res = await service.initializeAuthentication("usernamePassword", {
         body: {
           email: "test@test.com",
           password: password,
@@ -82,7 +81,7 @@ describe("AuthenticationModuleService - AuthProvider", () => {
 
       await seedDefaultData(testManager)
 
-      const res = await service.authenticate("usernamePassword", {
+      const res = await service.initializeAuthentication("usernamePassword", {
         body: { email: "test@test.com" },
       })
 
@@ -95,7 +94,7 @@ describe("AuthenticationModuleService - AuthProvider", () => {
     it("fails when no email is given", async () => {
       await seedDefaultData(testManager)
 
-      const res = await service.authenticate("usernamePassword", {
+      const res = await service.initializeAuthentication("usernamePassword", {
         body: { password: "supersecret" },
       })
 
@@ -124,7 +123,7 @@ describe("AuthenticationModuleService - AuthProvider", () => {
         },
       ])
 
-      const res = await service.authenticate("usernamePassword", {
+      const res = await service.initializeAuthentication("usernamePassword", {
         body: {
           email: "test@test.com",
           password: "password",

packages/authentication/package.json

@@ -56,7 +56,9 @@
     "@mikro-orm/postgresql": "5.9.7",
     "awilix": "^8.0.0",
     "dotenv": "^16.1.4",
+    "jsonwebtoken": "^9.0.2",
     "knex": "2.4.2",
-    "scrypt-kdf": "^2.0.1"
+    "scrypt-kdf": "^2.0.1",
+    "simple-oauth2": "^5.0.0"
   }
 }

packages/authentication/src/loaders/providers.ts

@@ -1,9 +1,14 @@
 import * as defaultProviders from "@providers"
 
+import {
+  AwilixContainer,
+  ClassOrFunctionReturning,
+  Constructor,
+  Resolver,
+  asClass,
+} from "awilix"
 import { LoaderOptions, ModulesSdkTypes } from "@medusajs/types"
 
-import { AwilixContainer, ClassOrFunctionReturning, Resolver, asClass, asFunction, asValue } from "awilix"
-
 export default async ({
   container,
 }: LoaderOptions<
@@ -18,7 +23,9 @@ export default async ({
 
   for (const provider of providersToLoad) {
     container.register({
-      [`auth_provider_${provider.PROVIDER}`]: asClass(provider).singleton(),
+      [`auth_provider_${provider.PROVIDER}`]: asClass(
+        provider as Constructor<any>
+      ).singleton(),
     })
   }
 

packages/authentication/src/migrations/.snapshot-medusa-authentication.json

@@ -39,6 +39,15 @@
           ],
           "mappedType": "enum"
         },
+        "config": {
+          "name": "config",
+          "type": "jsonb",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "json"
+        },
         "is_active": {
           "name": "is_active",
           "type": "boolean",

packages/authentication/src/migrations/Migration20240122041959.ts

@@ -0,0 +1,22 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20240122041959 extends Migration {
+
+  async up(): Promise<void> {
+    this.addSql('create table if not exists "auth_provider" ("provider" text not null, "name" text not null, "domain" text check ("domain" in (\'all\', \'store\', \'admin\')) not null default \'all\', "config" jsonb null, "is_active" boolean not null default false, constraint "auth_provider_pkey" primary key ("provider"));');
+
+    this.addSql('create table if not exists "auth_user" ("id" text not null, "entity_id" text not null, "provider_id" text null, "user_metadata" jsonb null, "app_metadata" jsonb null, "provider_metadata" jsonb null, constraint "auth_user_pkey" primary key ("id"));');
+    this.addSql('alter table "auth_user" add constraint "IDX_auth_user_provider_entity_id" unique ("provider_id", "entity_id");');
+
+    this.addSql('alter table "auth_user" add constraint if not exists "auth_user_provider_id_foreign" foreign key ("provider_id") references "auth_provider" ("provider") on delete cascade;');
+  }
+
+  async down(): Promise<void> {
+    this.addSql('alter table "auth_user" drop constraint if exists "auth_user_provider_id_foreign";');
+
+    this.addSql('drop table if exists "auth_provider" cascade;');
+
+    this.addSql('drop table if exists "auth_user" cascade;');
+  }
+
+}

packages/authentication/src/models/auth-provider.ts

@@ -5,9 +5,10 @@ import {
   PrimaryKey,
   Property,
 } from "@mikro-orm/core"
+
 import { ProviderDomain } from "../types/repositories/auth-provider"
 
-type OptionalFields = "domain" | "is_active"
+type OptionalFields = "domain" | "is_active" | "config"
 
 @Entity()
 export default class AuthProvider {
@@ -22,6 +23,9 @@ export default class AuthProvider {
   @Enum({ items: () => ProviderDomain, default: ProviderDomain.ALL })
   domain: ProviderDomain = ProviderDomain.ALL
 
+  @Property({ columnType: "jsonb", nullable: true })
+  config: Record<string, unknown> | null = null
+
   @Property({ columnType: "boolean", default: false })
   is_active = false
 }