chore(core): move kratos e2e tests and delete e2e dir

.env

@@ -87,7 +87,7 @@ export LOG_LEVEL="info"
 
 export KRATOS_MASTER_USER_PASSWORD="passwordHardtoFindWithNumber123"
 export KRATOS_PG_HOST="localhost"
-export KRATOS_PG_PORT="5433"
+export KRATOS_PG_PORT="5432"
 
 export OTEL_EXPORTER_OTLP_ENDPOINT="http://localhost:4318"
 # TODO: rename to OTEL_SERVICE_NAME 
@@ -96,7 +96,7 @@ export TRACING_SERVICE_NAME="galoy-dev"
 
 export MATTERMOST_WEBHOOK_URL="https://chat.galoy.io/hooks/sometoken"
 
-export KRATOS_PG_CON="postgres://dbuser:secret@localhost:5433/default?sslmode=disable"
+export KRATOS_PG_CON="postgres://dbuser:secret@localhost:5432/default?sslmode=disable"
 
 export UNSECURE_DEFAULT_LOGIN_CODE="000000"
 export UNSECURE_IP_FROM_REQUEST_OBJECT=true

core/api/.env

@@ -88,7 +88,7 @@ export LOG_LEVEL="info"
 export KRATOS_MASTER_USER_PASSWORD="passwordHardtoFindWithNumber123"
 export KRATOS_ADMIN_URL="http://localhost:4434"
 export KRATOS_PG_HOST="localhost"
-export KRATOS_PG_PORT="5433"
+export KRATOS_PG_PORT="5432"
 
 export OTEL_EXPORTER_OTLP_ENDPOINT="http://localhost:4318"
 # TODO: rename to OTEL_SERVICE_NAME
@@ -97,7 +97,7 @@ export TRACING_SERVICE_NAME="galoy-dev"
 
 export MATTERMOST_WEBHOOK_URL="https://chat.galoy.io/hooks/sometoken"
 
-export KRATOS_PG_CON="postgres://dbuser:secret@localhost:5433/default?sslmode=disable"
+export KRATOS_PG_CON="postgres://dbuser:secret@localhost:5432/default?sslmode=disable"
 
 export UNSECURE_DEFAULT_LOGIN_CODE="000000"
 export UNSECURE_IP_FROM_REQUEST_OBJECT=true

core/api/src/domain/authentication/index.types.d.ts

@@ -24,21 +24,39 @@ type IdentityPhone = IdentityBase & {
   phone: PhoneNumber
   email: undefined
   emailVerified: undefined
+
+  username?: undefined
 }
 
 type IdentityEmail = IdentityBase & {
   phone: undefined
   email: EmailAddress
   emailVerified: boolean
+
+  username?: undefined
 }
 
 type IdentityPhoneEmail = IdentityBase & {
   phone: PhoneNumber
   email: EmailAddress
   emailVerified: boolean
+
+  username?: undefined
+}
+
+type IdentityDeviceAccount = IdentityBase & {
+  username: IdentityUsername
+
+  phone?: undefined
+  email?: undefined
+  emailVerified?: undefined
 }
 
-type AnyIdentity = IdentityPhone | IdentityEmail | IdentityPhoneEmail
+type AnyIdentity =
+  | IdentityPhone
+  | IdentityEmail
+  | IdentityPhoneEmail
+  | IdentityDeviceAccount
 
 type Session = {
   identity: AnyIdentity

core/api/src/services/kratos/identity.ts

@@ -8,6 +8,20 @@ import { getKratosPostgres, kratosAdmin, toDomainIdentity } from "./private"
 import { IdentifierNotFoundError } from "@/domain/authentication/errors"
 import { ErrorLevel } from "@/domain/shared"
 
+export const getNextPageToken = (link: string): string | undefined => {
+  const links = link.split(",")
+  const nextLink = links.find((link) => link.includes('rel="next"'))
+
+  if (nextLink) {
+    const matches = nextLink.match(/page_token=([^;&>]+)/)
+    if (matches) {
+      return matches[1]
+    }
+  }
+
+  return undefined
+}
+
 export const IdentityRepository = (): IIdentityRepository => {
   const getIdentity = async (
     kratosUserId: UserId,
@@ -109,17 +123,3 @@ export const IdentityRepository = (): IIdentityRepository => {
     getUserIdFromFlowId,
   }
 }
-
-export const getNextPageToken = (link: string): string | undefined => {
-  const links = link.split(",")
-  const nextLink = links.find((link) => link.includes('rel="next"'))
-
-  if (nextLink) {
-    const matches = nextLink.match(/page_token=([^;&>]+)/)
-    if (matches) {
-      return matches[1]
-    }
-  }
-
-  return undefined
-}

core/api/src/services/kratos/private.ts

@@ -72,10 +72,12 @@ export const toDomainIdentity = (identity: KratosIdentity): AnyIdentity => {
     createdAt = new Date()
   }
 
+  const { username: rawUsername } = identity.traits
   return {
     id: identity.id as UserId,
     phone: identity.traits.phone as PhoneNumber,
     email: identity.traits.email as EmailAddress,
+    username: rawUsername !== undefined ? (rawUsername as IdentityUsername) : rawUsername,
     emailVerified: identity.verifiable_addresses?.[0].verified ?? false,
     totpEnabled: identity?.credentials?.totp?.type === "totp",
     schema: toSchema(identity.schema_id),
@@ -98,10 +100,12 @@ export const toDomainIdentityEmail = (identity: KratosIdentity): IdentityEmail =
     createdAt = new Date()
   }
 
+  const { username: rawUsername } = identity.traits
   return {
     id: identity.id as UserId,
     phone: undefined,
     email: identity.traits.email as EmailAddress,
+    username: rawUsername !== undefined ? (rawUsername as IdentityUsername) : rawUsername,
     emailVerified: identity.verifiable_addresses?.[0].verified ?? false,
     totpEnabled: identity?.credentials?.totp?.type === "totp",
     schema: toSchema(identity.schema_id),
@@ -123,10 +127,12 @@ export const toDomainIdentityPhone = (identity: KratosIdentity): IdentityPhone =
     createdAt = new Date()
   }
 
+  const { username: rawUsername } = identity.traits
   return {
     id: identity.id as UserId,
     phone: identity.traits.phone as PhoneNumber,
     email: undefined,
+    username: rawUsername !== undefined ? (rawUsername as IdentityUsername) : rawUsername,
     emailVerified: undefined,
     totpEnabled: identity?.credentials?.totp?.type === "totp",
     schema: toSchema(identity.schema_id),
@@ -150,10 +156,12 @@ export const toDomainIdentityEmailPhone = (
     createdAt = new Date()
   }
 
+  const { username: rawUsername } = identity.traits
   return {
     id: identity.id as UserId,
     phone: identity.traits.phone as PhoneNumber,
     email: identity.traits.email as EmailAddress,
+    username: rawUsername !== undefined ? (rawUsername as IdentityUsername) : rawUsername,
     emailVerified: identity.verifiable_addresses?.[0].verified ?? false,
     totpEnabled: identity?.credentials?.totp?.type === "totp",
     schema: toSchema(identity.schema_id),