@revisium/core 2.9.2 → 2.10.0-alpha.1

package/dist/src/features/auth/auth.module.js

@@ -12,14 +12,20 @@ const config_1 = require("@nestjs/config");
 const cqrs_1 = require("@nestjs/cqrs");
 const jwt_1 = require("@nestjs/jwt");
 const passport_1 = require("@nestjs/passport");
+const api_key_module_1 = require("../api-key/api-key.module");
 const auth_service_1 = require("./auth.service");
 const casl_ability_factory_1 = require("./casl-ability.factory");
 const commands_1 = require("./commands");
 const auth_api_service_1 = require("./commands/auth-api.service");
 const github_oauth_service_1 = require("./github-oauth.service");
 const google_oauth_service_1 = require("./google-oauth.service");
+const universal_auth_service_1 = require("./guards/universal-auth.service");
+const gql_universal_auth_guard_1 = require("./guards/universal/gql-universal-auth.guard");
+const http_universal_auth_guard_1 = require("./guards/universal/http-universal-auth.guard");
 const jwt_secret_service_1 = require("./jwt-secret.service");
 const no_auth_service_1 = require("./no-auth.service");
+const cookie_service_1 = require("./services/cookie.service");
+const refresh_token_service_1 = require("./services/refresh-token.service");
 const jwt_strategy_1 = require("./strategy/jwt.strategy");
 const database_module_1 = require("../../infrastructure/database/database.module");
 const email_module_1 = require("../../infrastructure/email/email.module");
@@ -37,6 +43,7 @@ exports.AuthModule = AuthModule = __decorate([
                 global: true,
             }),
             email_module_1.EmailModule,
+            api_key_module_1.ApiKeyModule,
         ],
         providers: [
             auth_api_service_1.AuthApiService,
@@ -47,6 +54,17 @@ exports.AuthModule = AuthModule = __decorate([
             github_oauth_service_1.GitHubAuthService,
             casl_ability_factory_1.CaslAbilityFactory,
             no_auth_service_1.NoAuthService,
+            universal_auth_service_1.UniversalAuthService,
+            cookie_service_1.CookieService,
+            refresh_token_service_1.RefreshTokenService,
+            http_universal_auth_guard_1.HttpUniversalAuthGuard,
+            http_universal_auth_guard_1.OptionalHttpUniversalAuthGuard,
+            http_universal_auth_guard_1.HttpJwtPassportGuard,
+            http_universal_auth_guard_1.OptionalHttpJwtPassportGuard,
+            gql_universal_auth_guard_1.GqlUniversalAuthGuard,
+            gql_universal_auth_guard_1.OptionalGqlUniversalAuthGuard,
+            gql_universal_auth_guard_1.GqlJwtPassportGuard,
+            gql_universal_auth_guard_1.OptionalGqlJwtPassportGuard,
             ...commands_1.AUTH_COMMANDS,
         ],
         exports: [
@@ -56,6 +74,15 @@ exports.AuthModule = AuthModule = __decorate([
             auth_api_service_1.AuthApiService,
             jwt_secret_service_1.JwtSecretService,
             no_auth_service_1.NoAuthService,
+            universal_auth_service_1.UniversalAuthService,
+            cookie_service_1.CookieService,
+            refresh_token_service_1.RefreshTokenService,
+            casl_ability_factory_1.CaslAbilityFactory,
+            http_universal_auth_guard_1.HttpUniversalAuthGuard,
+            http_universal_auth_guard_1.OptionalHttpUniversalAuthGuard,
+            gql_universal_auth_guard_1.GqlUniversalAuthGuard,
+            gql_universal_auth_guard_1.OptionalGqlUniversalAuthGuard,
+            api_key_module_1.ApiKeyModule,
         ],
     })
 ], AuthModule);

package/dist/src/features/auth/auth.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../../../../src/features/auth/auth.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,2CAA8C;AAC9C,uCAA0C;AAC1C,qCAAwC;AACxC,+CAAkD;AAClD,iDAA6D;AAC7D,iEAA4E;AAC5E,yCAA2D;AAC3D,kEAA6E;AAC7E,iEAA2E;AAC3E,iEAA4E;AAC5E,6DAAwE;AACxE,uDAAkE;AAClE,0DAAsE;AACtE,mFAA6E;AAC7E,0EAAoE;AAiC7D,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,gCAAU;qBAAV,UAAU;IA/BtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,iBAAU;YACV,gCAAc;YACd,qBAAY;YACZ,yBAAc;YACd,eAAS,CAAC,QAAQ,CAAC;gBACjB,MAAM,EAAE,IAAI;aACb,CAAC;YACF,0BAAW;SACZ;QACD,SAAS,EAAE;YACT,iCAAc;YACd,0BAAW;YACX,0BAAW;YACX,qCAAgB;YAChB,yCAAkB;YAClB,wCAAiB;YACjB,yCAAkB;YAClB,+BAAa;YACb,GAAG,wBAAa;SACjB;QACD,OAAO,EAAE;YACP,0BAAW;YACX,yCAAkB;YAClB,wCAAiB;YACjB,iCAAc;YACd,qCAAgB;YAChB,+BAAa;SACd;KACF,CAAC;GACW,UAAU,CAAG"}
+{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../../../../src/features/auth/auth.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,2CAA8C;AAC9C,uCAA0C;AAC1C,qCAAwC;AACxC,+CAAkD;AAClD,8DAAmE;AACnE,iDAA6D;AAC7D,iEAA4E;AAC5E,yCAA2D;AAC3D,kEAA6E;AAC7E,iEAA2E;AAC3E,iEAA4E;AAC5E,4EAAuF;AACvF,0FAKqE;AACrE,4FAKsE;AACtE,6DAAwE;AACxE,uDAAkE;AAClE,8DAA0E;AAC1E,4EAAuF;AACvF,0DAAsE;AACtE,mFAA6E;AAC7E,0EAAoE;AAsD7D,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,gCAAU;qBAAV,UAAU;IApDtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,iBAAU;YACV,gCAAc;YACd,qBAAY;YACZ,yBAAc;YACd,eAAS,CAAC,QAAQ,CAAC;gBACjB,MAAM,EAAE,IAAI;aACb,CAAC;YACF,0BAAW;YACX,6BAAY;SACb;QACD,SAAS,EAAE;YACT,iCAAc;YACd,0BAAW;YACX,0BAAW;YACX,qCAAgB;YAChB,yCAAkB;YAClB,wCAAiB;YACjB,yCAAkB;YAClB,+BAAa;YACb,6CAAoB;YACpB,8BAAa;YACb,2CAAmB;YACnB,kDAAsB;YACtB,0DAA8B;YAC9B,gDAAoB;YACpB,wDAA4B;YAC5B,gDAAqB;YACrB,wDAA6B;YAC7B,8CAAmB;YACnB,sDAA2B;YAC3B,GAAG,wBAAa;SACjB;QACD,OAAO,EAAE;YACP,0BAAW;YACX,yCAAkB;YAClB,wCAAiB;YACjB,iCAAc;YACd,qCAAgB;YAChB,+BAAa;YACb,6CAAoB;YACpB,8BAAa;YACb,2CAAmB;YACnB,yCAAkB;YAClB,kDAAsB;YACtB,0DAA8B;YAC9B,gDAAqB;YACrB,wDAA6B;YAC7B,6BAAY;SACb;KACF,CAAC;GACW,UAAU,CAAG"}

package/dist/src/features/auth/auth.service.d.ts

@@ -1,15 +1,43 @@
+import { ConfigService } from '@nestjs/config';
 import { JwtService } from '@nestjs/jwt';
 import { JwtSecretService } from '../../features/auth/jwt-secret.service';
+import { RefreshTokenMeta, RefreshTokenService } from '../../features/auth/services/refresh-token.service';
+import { PrismaService } from '../../infrastructure/database/prisma.service';
+export declare const BCRYPT_ROUNDS = 10;
+type AccessTokenClaims = {
+    username?: string | null;
+    email?: string | null;
+    sub: string;
+    ver?: number;
+};
+export type AccessTokenResult = {
+    accessToken: string;
+    expiresIn: number;
+};
+export type IssuedTokens = AccessTokenResult & {
+    refreshToken: string | null;
+};
+export type IssueTokensUser = {
+    id: string;
+    username: string | null;
+    email: string | null;
+    tokenVersion: number;
+};
 export declare class AuthService {
     private readonly jwtService;
     private readonly jwtSecret;
-    constructor(jwtService: JwtService, jwtSecret: JwtSecretService);
-    login(payload: {
-        username?: string | null;
-        email?: string | null;
-        sub: string;
-    }): string;
+    private readonly configService;
+    private readonly refreshTokenService;
+    private readonly prisma;
+    private readonly logger;
+    constructor(jwtService: JwtService, jwtSecret: JwtSecretService, configService: ConfigService, refreshTokenService: RefreshTokenService, prisma: PrismaService);
+    login(payload: AccessTokenClaims): string;
+    issueTokens(user: IssueTokensUser, meta?: RefreshTokenMeta): Promise<IssuedTokens>;
+    issueAccessTokenForUserId(userId: string): Promise<AccessTokenResult>;
+    signAccessToken(payload: AccessTokenClaims): AccessTokenResult;
     hashPassword(password: string): Promise<string>;
     comparePassword(password: string, hash: string): Promise<boolean>;
     generateConfirmationCode(): string;
+    private resolveExpiresInSeconds;
 }
+export {};

package/dist/src/features/auth/auth.service.js

@@ -41,23 +41,80 @@ var __importStar = (this && this.__importStar) || (function () {
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var AuthService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AuthService = void 0;
+exports.AuthService = exports.BCRYPT_ROUNDS = void 0;
 const common_1 = require("@nestjs/common");
+const config_1 = require("@nestjs/config");
 const jwt_1 = require("@nestjs/jwt");
 const bcrypt = __importStar(require("bcrypt"));
+const ms_1 = __importDefault(require("ms"));
 const crypto = __importStar(require("node:crypto"));
 const jwt_secret_service_1 = require("./jwt-secret.service");
-let AuthService = class AuthService {
-    constructor(jwtService, jwtSecret) {
+const refresh_token_service_1 = require("./services/refresh-token.service");
+const prisma_service_1 = require("../../infrastructure/database/prisma.service");
+const DEFAULT_ACCESS_TOKEN_TTL = '30m';
+const DEFAULT_ACCESS_TOKEN_EXPIRES_IN_SECONDS = 30 * 60;
+exports.BCRYPT_ROUNDS = 10;
+let AuthService = AuthService_1 = class AuthService {
+    constructor(jwtService, jwtSecret, configService, refreshTokenService, prisma) {
         this.jwtService = jwtService;
         this.jwtSecret = jwtSecret;
+        this.configService = configService;
+        this.refreshTokenService = refreshTokenService;
+        this.prisma = prisma;
+        this.logger = new common_1.Logger(AuthService_1.name);
     }
     login(payload) {
-        return this.jwtService.sign({ ...payload }, { secret: this.jwtSecret.secret });
+        return this.signAccessToken(payload).accessToken;
+    }
+    async issueTokens(user, meta) {
+        const access = this.signAccessToken({
+            sub: user.id,
+            username: user.username,
+            email: user.email,
+            ver: user.tokenVersion,
+        });
+        const refreshToken = await this.refreshTokenService.createToken(user.id, undefined, meta);
+        return { ...access, refreshToken };
+    }
+    async issueAccessTokenForUserId(userId) {
+        const user = await this.prisma.user.findUnique({
+            where: { id: userId },
+            select: {
+                id: true,
+                username: true,
+                email: true,
+                tokenVersion: true,
+            },
+        });
+        if (!user) {
+            throw new common_1.UnauthorizedException('User not found');
+        }
+        return this.signAccessToken({
+            sub: user.id,
+            username: user.username,
+            email: user.email,
+            ver: user.tokenVersion,
+        });
+    }
+    signAccessToken(payload) {
+        const expiresInSeconds = this.resolveExpiresInSeconds(this.configService.get('JWT_ACCESS_TOKEN_TTL') ??
+            DEFAULT_ACCESS_TOKEN_TTL);
+        const accessToken = this.jwtService.sign({ ...payload }, {
+            secret: this.jwtSecret.secret,
+            expiresIn: expiresInSeconds,
+        });
+        return {
+            accessToken,
+            expiresIn: expiresInSeconds,
+        };
     }
     hashPassword(password) {
-        return bcrypt.hash(password, 10);
+        return bcrypt.hash(password, exports.BCRYPT_ROUNDS);
     }
     comparePassword(password, hash) {
         return bcrypt.compare(password, hash);
@@ -65,11 +122,29 @@ let AuthService = class AuthService {
     generateConfirmationCode() {
         return crypto.randomUUID().toString();
     }
+    resolveExpiresInSeconds(ttl) {
+        try {
+            const millis = (0, ms_1.default)(ttl);
+            if (typeof millis !== 'number' ||
+                !Number.isFinite(millis) ||
+                millis <= 0) {
+                return DEFAULT_ACCESS_TOKEN_EXPIRES_IN_SECONDS;
+            }
+            return Math.floor(millis / 1000);
+        }
+        catch {
+            this.logger.warn(`Could not parse JWT_ACCESS_TOKEN_TTL='${ttl}'; falling back to ${DEFAULT_ACCESS_TOKEN_EXPIRES_IN_SECONDS}s`);
+            return DEFAULT_ACCESS_TOKEN_EXPIRES_IN_SECONDS;
+        }
+    }
 };
 exports.AuthService = AuthService;
-exports.AuthService = AuthService = __decorate([
+exports.AuthService = AuthService = AuthService_1 = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [jwt_1.JwtService,
-        jwt_secret_service_1.JwtSecretService])
+        jwt_secret_service_1.JwtSecretService,
+        config_1.ConfigService,
+        refresh_token_service_1.RefreshTokenService,
+        prisma_service_1.PrismaService])
 ], AuthService);
 //# sourceMappingURL=auth.service.js.map

package/dist/src/features/auth/auth.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../src/features/auth/auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAyC;AACzC,+CAAiC;AACjC,oDAAsC;AACtC,6DAAwE;AAGjE,IAAM,WAAW,GAAjB,MAAM,WAAW;IACtB,YACmB,UAAsB,EACtB,SAA2B;QAD3B,eAAU,GAAV,UAAU,CAAY;QACtB,cAAS,GAAT,SAAS,CAAkB;IAC3C,CAAC;IAEG,KAAK,CAAC,OAIZ;QAEC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CACzB,EAAE,GAAG,OAAO,EAAE,EACd,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAClC,CAAC;IACJ,CAAC;IAEM,YAAY,CAAC,QAAgB;QAClC,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IACnC,CAAC;IAEM,eAAe,CAAC,QAAgB,EAAE,IAAY;QACnD,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACxC,CAAC;IAEM,wBAAwB;QAC7B,OAAO,MAAM,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,CAAC;IACxC,CAAC;CACF,CAAA;AA7BY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAGoB,gBAAU;QACX,qCAAgB;GAHnC,WAAW,CA6BvB"}
+{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../src/features/auth/auth.service.ts"],"names":[],"mappings":"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"}

package/dist/src/features/auth/casl-ability.factory.d.ts

@@ -1,11 +1,14 @@
-import { MongoQuery } from '@casl/ability';
+import { MongoAbility, MongoQuery } from '@casl/ability';
 import { UserRole } from '../../features/auth/consts';
+import { ICaslRule } from '../../features/auth/types';
 import { AuthCacheService } from '../../infrastructure/cache/services/auth-cache.service';
 import { PrismaService } from '../../infrastructure/database/prisma.service';
 export declare class CaslAbilityFactory {
     private readonly prisma;
     private readonly authCache;
     constructor(prisma: PrismaService, authCache: AuthCacheService);
-    createAbility(...roles: UserRole[]): Promise<import("@casl/ability").MongoAbility<import("@casl/ability").AbilityTuple, MongoQuery>>;
+    createAbility(...roles: UserRole[]): Promise<MongoAbility<import("@casl/ability").AbilityTuple, MongoQuery>>;
+    createFromRules(rules: ICaslRule[]): MongoAbility<import("@casl/ability").AbilityTuple, MongoQuery>;
+    private applyRule;
     private getPermissions;
 }

package/dist/src/features/auth/casl-ability.factory.js

@@ -28,6 +28,33 @@ let CaslAbilityFactory = class CaslAbilityFactory {
         }
         return build();
     }
+    createFromRules(rules) {
+        const { can, cannot, build } = new ability_1.AbilityBuilder(ability_1.createMongoAbility);
+        for (const rule of rules) {
+            const fn = rule.inverted ? cannot : can;
+            const actions = Array.isArray(rule.action) ? rule.action : [rule.action];
+            const subjects = Array.isArray(rule.subject)
+                ? rule.subject
+                : [rule.subject];
+            for (const action of actions) {
+                for (const subject of subjects) {
+                    this.applyRule(fn, action, subject, rule);
+                }
+            }
+        }
+        return build();
+    }
+    applyRule(fn, action, subject, rule) {
+        if (rule.conditions) {
+            fn(action, subject, rule.fields, rule.conditions);
+        }
+        else if (rule.fields) {
+            fn(action, subject, rule.fields);
+        }
+        else {
+            fn(action, subject);
+        }
+    }
     getPermissions(role) {
         return this.prisma.role
             .findUniqueOrThrow({

package/dist/src/features/auth/casl-ability.factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"casl-ability.factory.js","sourceRoot":"","sources":["../../../../src/features/auth/casl-ability.factory.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA+E;AAE/E,2CAA4C;AAE5C,+FAAwF;AACxF,iFAA2E;AAGpE,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,YACmB,MAAqB,EACrB,SAA2B;QAD3B,WAAM,GAAN,MAAM,CAAe;QACrB,cAAS,GAAT,SAAS,CAAkB;IAC3C,CAAC;IAEJ,KAAK,CAAC,aAAa,CAAC,GAAG,KAAiB;QACtC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,wBAAc,CAAC,4BAAkB,CAAC,CAAC;QAE9D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,KAAK,MAAM,EACT,MAAM,EACN,OAAO,EACP,SAAS,GACV,IAAI,MAAM,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,GAAG,EAAE,CACnD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAC1B,EAAE,CAAC;gBACF,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,SAAkC,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;QAED,OAAO,KAAK,EAAE,CAAC;IACjB,CAAC;IAEO,cAAc,CAAC,IAAc;QACnC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI;aACpB,iBAAiB,CAAC;YACjB,KAAK,EAAE;gBACL,EAAE,EAAE,IAAI;aACT;SACF,CAAC;aACD,WAAW,EAAE,CAAC;IACnB,CAAC;CACF,CAAA;AAjCY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAGgB,8BAAa;QACV,qCAAgB;GAHnC,kBAAkB,CAiC9B"}
+{"version":3,"file":"casl-ability.factory.js","sourceRoot":"","sources":["../../../../src/features/auth/casl-ability.factory.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAKuB;AAEvB,2CAA4C;AAG5C,+FAAwF;AACxF,iFAA2E;AAGpE,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,YACmB,MAAqB,EACrB,SAA2B;QAD3B,WAAM,GAAN,MAAM,CAAe;QACrB,cAAS,GAAT,SAAS,CAAkB;IAC3C,CAAC;IAEJ,KAAK,CAAC,aAAa,CAAC,GAAG,KAAiB;QACtC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,wBAAc,CAAC,4BAAkB,CAAC,CAAC;QAE9D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,KAAK,MAAM,EACT,MAAM,EACN,OAAO,EACP,SAAS,GACV,IAAI,MAAM,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,GAAG,EAAE,CACnD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAC1B,EAAE,CAAC;gBACF,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,SAAkC,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;QAED,OAAO,KAAK,EAAE,CAAC;IACjB,CAAC;IAED,eAAe,CAAC,KAAkB;QAChC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,wBAAc,CAAC,4BAAkB,CAAC,CAAC;QAEtE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC;YACxC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACzE,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;gBAC1C,CAAC,CAAC,IAAI,CAAC,OAAO;gBACd,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAEnB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC7B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;oBAC/B,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;gBAC5C,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,KAAK,EAAE,CAAC;IACjB,CAAC;IAEO,SAAS,CACf,EAAuC,EACvC,MAAc,EACd,OAAe,EACf,IAAe;QAEf,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,EAAE,CACA,MAAM,EACN,OAAO,EACP,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,UAAmC,CACzC,CAAC;QACJ,CAAC;aAAM,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACvB,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IAEO,cAAc,CAAC,IAAc;QACnC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI;aACpB,iBAAiB,CAAC;YACjB,KAAK,EAAE;gBACL,EAAE,EAAE,IAAI;aACT;SACF,CAAC;aACD,WAAW,EAAE,CAAC;IACnB,CAAC;CACF,CAAA;AAzEY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAGgB,8BAAa;QACV,qCAAgB;GAHnC,kBAAkB,CAyE9B"}

package/dist/src/features/auth/commands/auth-api.service.d.ts

@@ -1,10 +1,13 @@
 import { CommandBus } from '@nestjs/cqrs';
+import { AuthService } from '../../../features/auth/auth.service';
 import { CheckOrganizationPermissionCommandData, CheckProjectPermissionCommandData, CheckSystemPermissionCommandData, ConfirmEmailCodeCommandData, ConfirmEmailCodeCommandReturnType, CreateUserCommandData, LoginCommandData, LoginCommandReturnType, LoginGithubCommandData, LoginGithubCommandReturnType, LoginGoogleCommandData, LoginGoogleCommandReturnType, SignUpCommandData } from '../../../features/auth/commands/impl';
 import { AuthCacheService } from '../../../infrastructure/cache/services/auth-cache.service';
 export declare class AuthApiService {
     private readonly commandBus;
     private readonly authCache;
-    constructor(commandBus: CommandBus, authCache: AuthCacheService);
+    private readonly authService;
+    constructor(commandBus: CommandBus, authCache: AuthCacheService, authService: AuthService);
+    issueAccessTokenForUserId(userId: string): Promise<import("../../../features/auth/auth.service").AccessTokenResult>;
     checkSystemPermission(data: CheckSystemPermissionCommandData): Promise<boolean>;
     checkOrganizationPermission(data: CheckOrganizationPermissionCommandData): Promise<boolean>;
     checkProjectPermission(data: CheckProjectPermissionCommandData): Promise<boolean>;

package/dist/src/features/auth/commands/auth-api.service.js

@@ -12,12 +12,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthApiService = void 0;
 const common_1 = require("@nestjs/common");
 const cqrs_1 = require("@nestjs/cqrs");
+const auth_service_1 = require("../auth.service");
 const impl_1 = require("./impl");
 const auth_cache_service_1 = require("../../../infrastructure/cache/services/auth-cache.service");
 let AuthApiService = class AuthApiService {
-    constructor(commandBus, authCache) {
+    constructor(commandBus, authCache, authService) {
         this.commandBus = commandBus;
         this.authCache = authCache;
+        this.authService = authService;
+    }
+    issueAccessTokenForUserId(userId) {
+        return this.authService.issueAccessTokenForUserId(userId);
     }
     checkSystemPermission(data) {
         return this.authCache.systemPermissionCheck(data, () => {
@@ -57,6 +62,7 @@ exports.AuthApiService = AuthApiService;
 exports.AuthApiService = AuthApiService = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [cqrs_1.CommandBus,
-        auth_cache_service_1.AuthCacheService])
+        auth_cache_service_1.AuthCacheService,
+        auth_service_1.AuthService])
 ], AuthApiService);
 //# sourceMappingURL=auth-api.service.js.map

package/dist/src/features/auth/commands/auth-api.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth-api.service.js","sourceRoot":"","sources":["../../../../../src/features/auth/commands/auth-api.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uCAA0C;AAC1C,iCA4ByC;AACzC,kGAAwF;AAGjF,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YACmB,UAAsB,EACtB,SAA2B;QAD3B,eAAU,GAAV,UAAU,CAAY;QACtB,cAAS,GAAT,SAAS,CAAkB;IAC3C,CAAC;IAEG,qBAAqB,CAAC,IAAsC;QACjE,OAAO,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,IAAI,EAAE,GAAG,EAAE;YACrD,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAG5B,IAAI,mCAA4B,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,2BAA2B,CAChC,IAA4C;QAE5C,OAAO,IAAI,CAAC,SAAS,CAAC,2BAA2B,CAAC,IAAI,EAAE,GAAG,EAAE;YAC3D,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAG5B,IAAI,yCAAkC,CAAC,IAAI,CAAC,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,sBAAsB,CAAC,IAAuC;QACnE,OAAO,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,GAAG,EAAE;YACtD,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAG5B,IAAI,oCAA6B,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,IAAsB;QACjC,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAC5B,IAAI,mBAAY,CAAC,IAAI,CAAC,CACvB,CAAC;IACJ,CAAC;IAEM,WAAW,CAAC,IAA4B;QAC7C,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAG5B,IAAI,yBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;IAClC,CAAC;IAEM,WAAW,CAAC,IAA4B;QAC7C,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAG5B,IAAI,yBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;IAClC,CAAC;IAEM,UAAU,CAAC,IAA2B;QAC3C,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAG5B,IAAI,wBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;IACjC,CAAC;IAEM,MAAM,CAAC,IAAuB;QACnC,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAC5B,IAAI,oBAAa,CAAC,IAAI,CAAC,CACxB,CAAC;IACJ,CAAC;IAEM,gBAAgB,CAAC,IAAiC;QACvD,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAG5B,IAAI,8BAAuB,CAAC,IAAI,CAAC,CAAC,CAAC;IACvC,CAAC;CACF,CAAA;AA1EY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAGoB,iBAAU;QACX,qCAAgB;GAHnC,cAAc,CA0E1B"}
+{"version":3,"file":"auth-api.service.js","sourceRoot":"","sources":["../../../../../src/features/auth/commands/auth-api.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uCAA0C;AAC1C,kDAA6D;AAC7D,iCA4ByC;AACzC,kGAAwF;AAGjF,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YACmB,UAAsB,EACtB,SAA2B,EAC3B,WAAwB;QAFxB,eAAU,GAAV,UAAU,CAAY;QACtB,cAAS,GAAT,SAAS,CAAkB;QAC3B,gBAAW,GAAX,WAAW,CAAa;IACxC,CAAC;IAEG,yBAAyB,CAAC,MAAc;QAC7C,OAAO,IAAI,CAAC,WAAW,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC;IAC5D,CAAC;IAEM,qBAAqB,CAAC,IAAsC;QACjE,OAAO,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,IAAI,EAAE,GAAG,EAAE;YACrD,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAG5B,IAAI,mCAA4B,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,2BAA2B,CAChC,IAA4C;QAE5C,OAAO,IAAI,CAAC,SAAS,CAAC,2BAA2B,CAAC,IAAI,EAAE,GAAG,EAAE;YAC3D,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAG5B,IAAI,yCAAkC,CAAC,IAAI,CAAC,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,sBAAsB,CAAC,IAAuC;QACnE,OAAO,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,GAAG,EAAE;YACtD,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAG5B,IAAI,oCAA6B,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,IAAsB;QACjC,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAC5B,IAAI,mBAAY,CAAC,IAAI,CAAC,CACvB,CAAC;IACJ,CAAC;IAEM,WAAW,CAChB,IAA4B;QAE5B,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAG5B,IAAI,yBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;IAClC,CAAC;IAEM,WAAW,CAChB,IAA4B;QAE5B,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAG5B,IAAI,yBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;IAClC,CAAC;IAEM,UAAU,CAAC,IAA2B;QAC3C,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAG5B,IAAI,wBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;IACjC,CAAC;IAEM,MAAM,CAAC,IAAuB;QACnC,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAC5B,IAAI,oBAAa,CAAC,IAAI,CAAC,CACxB,CAAC;IACJ,CAAC;IAEM,gBAAgB,CAAC,IAAiC;QACvD,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAG5B,IAAI,8BAAuB,CAAC,IAAI,CAAC,CAAC,CAAC;IACvC,CAAC;CACF,CAAA;AAnFY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAGoB,iBAAU;QACX,qCAAgB;QACd,0BAAW;GAJhC,cAAc,CAmF1B"}

package/dist/src/features/auth/commands/handlers/confirm-email-code.handler.d.ts

@@ -6,9 +6,7 @@ export declare class ConfirmEmailCodeHandler implements ICommandHandler<ConfirmE
     private readonly prisma;
     private readonly authService;
     constructor(prisma: PrismaService, authService: AuthService);
-    execute({ data }: ConfirmEmailCodeCommand): Promise<{
-        accessToken: string;
-    }>;
+    execute({ data }: ConfirmEmailCodeCommand): Promise<import("../../../../features/auth/auth.service").IssuedTokens>;
     private confirmEmail;
     private getUser;
 }

package/dist/src/features/auth/commands/handlers/confirm-email-code.handler.js

@@ -28,14 +28,11 @@ let ConfirmEmailCodeHandler = class ConfirmEmailCodeHandler {
         if (user.isEmailConfirmed) {
             throw new common_1.UnauthorizedException('Email is already confirmed');
         }
-        await this.confirmEmail(user.id);
-        return {
-            accessToken: this.authService.login({
-                username: user.username || '',
-                email: user.email || '',
-                sub: user.id,
-            }),
-        };
+        const updated = await this.confirmEmail(user.id);
+        return this.authService.issueTokens(updated, {
+            ip: data.ip,
+            userAgent: data.userAgent,
+        });
     }
     confirmEmail(userId) {
         return this.prisma.user.update({

package/dist/src/features/auth/commands/handlers/confirm-email-code.handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"confirm-email-code.handler.js","sourceRoot":"","sources":["../../../../../../src/features/auth/commands/handlers/confirm-email-code.handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAuD;AACvD,uCAA+D;AAC/D,uFAA2E;AAC3E,qDAA6D;AAC7D,kCAGyC;AAGlC,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAIlC,YACmB,MAAqB,EACrB,WAAwB;QADxB,WAAM,GAAN,MAAM,CAAe;QACrB,gBAAW,GAAX,WAAW,CAAa;IACxC,CAAC;IAEG,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAA2B;QACpD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE3C,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,8BAAqB,CAAC,gBAAgB,CAAC,CAAC;QACpD,CAAC;QAED,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,MAAM,IAAI,8BAAqB,CAAC,4BAA4B,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEjC,OAAO;YACL,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;gBAClC,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE;gBAC7B,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;gBACvB,GAAG,EAAE,IAAI,CAAC,EAAE;aACb,CAAC;SACH,CAAC;IACJ,CAAC;IAEO,YAAY,CAAC,MAAc;QACjC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;YAC7B,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;YACrB,IAAI,EAAE;gBACJ,gBAAgB,EAAE,IAAI;gBACtB,SAAS,EAAE,EAAE;aACd;SACF,CAAC,CAAC;IACL,CAAC;IAEO,OAAO,CAAC,SAAiB;QAC/B,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;YAChC,KAAK,EAAE;gBACL,SAAS;aACV;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAhDY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,qBAAc,EAAC,8BAAuB,CAAC;qCAMX,8BAAa;QACR,0BAAW;GANhC,uBAAuB,CAgDnC"}
+{"version":3,"file":"confirm-email-code.handler.js","sourceRoot":"","sources":["../../../../../../src/features/auth/commands/handlers/confirm-email-code.handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAuD;AACvD,uCAA+D;AAC/D,uFAA2E;AAC3E,qDAA6D;AAC7D,kCAGyC;AAGlC,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAIlC,YACmB,MAAqB,EACrB,WAAwB;QADxB,WAAM,GAAN,MAAM,CAAe;QACrB,gBAAW,GAAX,WAAW,CAAa;IACxC,CAAC;IAEG,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAA2B;QACpD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE3C,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,8BAAqB,CAAC,gBAAgB,CAAC,CAAC;QACpD,CAAC;QAED,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,MAAM,IAAI,8BAAqB,CAAC,4BAA4B,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEjD,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,OAAO,EAAE;YAC3C,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;IACL,CAAC;IAEO,YAAY,CAAC,MAAc;QACjC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;YAC7B,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;YACrB,IAAI,EAAE;gBACJ,gBAAgB,EAAE,IAAI;gBACtB,SAAS,EAAE,EAAE;aACd;SACF,CAAC,CAAC;IACL,CAAC;IAEO,OAAO,CAAC,SAAiB;QAC/B,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;YAChC,KAAK,EAAE;gBACL,SAAS;aACV;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA7CY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,qBAAc,EAAC,8BAAuB,CAAC;qCAMX,8BAAa;QACR,0BAAW;GANhC,uBAAuB,CA6CnC"}

package/dist/src/features/auth/commands/handlers/create-user.handler.d.ts

@@ -1,7 +1,7 @@
 import { ICommandHandler } from '@nestjs/cqrs';
 import { AuthService } from '../../../../features/auth/auth.service';
 import { CreateUserCommand, CreateUserCommandReturnType } from '../../../../features/auth/commands/impl';
-import { IdService } from '../../../../infrastructure/database/id.service';
+import { IdService } from '@revisium/engine';
 import { PrismaService } from '../../../../infrastructure/database/prisma.service';
 export declare class CreateUserHandler implements ICommandHandler<CreateUserCommand, CreateUserCommandReturnType> {
     private readonly prisma;

package/dist/src/features/auth/commands/handlers/create-user.handler.js

@@ -16,7 +16,7 @@ const auth_service_1 = require("../../auth.service");
 const impl_1 = require("../impl");
 const consts_1 = require("../../consts");
 const validateUsername_1 = require("../../../share/utils/validateUrlLikeId/validateUsername");
-const id_service_1 = require("../../../../infrastructure/database/id.service");
+const engine_1 = require("@revisium/engine");
 const prisma_service_1 = require("../../../../infrastructure/database/prisma.service");
 let CreateUserHandler = class CreateUserHandler {
     constructor(prisma, idService, authService) {
@@ -116,7 +116,7 @@ exports.CreateUserHandler = CreateUserHandler;
 exports.CreateUserHandler = CreateUserHandler = __decorate([
     (0, cqrs_1.CommandHandler)(impl_1.CreateUserCommand),
     __metadata("design:paramtypes", [prisma_service_1.PrismaService,
-        id_service_1.IdService,
+        engine_1.IdService,
         auth_service_1.AuthService])
 ], CreateUserHandler);
 //# sourceMappingURL=create-user.handler.js.map

package/dist/src/features/auth/commands/handlers/create-user.handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-user.handler.js","sourceRoot":"","sources":["../../../../../../src/features/auth/commands/handlers/create-user.handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAqD;AACrD,uCAA+D;AAC/D,qDAA6D;AAC7D,kCAGyC;AACzC,yCAAuE;AACvE,8FAA+F;AAC/F,+EAAmE;AACnE,uFAA2E;AAIpE,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAI5B,YACmB,MAAqB,EACrB,SAAoB,EACpB,WAAwB;QAFxB,WAAM,GAAN,MAAM,CAAe;QACrB,cAAS,GAAT,SAAS,CAAW;QACpB,gBAAW,GAAX,WAAW,CAAa;IACxC,CAAC;IAEJ,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAqB;QACvC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,IAAA,mCAAgB,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC;QAED,IAAI,CAAC,IAAA,0BAAiB,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,4BAAmB,CAAC,oBAAoB,CAAC,CAAC;QACtD,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9C,MAAM,IAAI,4BAAmB,CAAC,wCAAwC,CAAC,CAAC;QAC1E,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAEtC,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,IAAI,4BAAmB,CAAC,qBAAqB,CAAC,CAAC;QACvD,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;YACnE,MAAM,IAAI,4BAAmB,CAC3B,0BAA0B,IAAI,CAAC,QAAQ,iBAAiB,CACzD,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IAEO,KAAK,CAAC,6BAA6B,CAAC,IAA+B;QACzE,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;QAEzC,MAAM,eAAe,GAA2B;YAC9C,EAAE,EAAE,MAAM;YACV,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,IAAI,EAAE;gBACJ,OAAO,EAAE;oBACP,EAAE,EAAE,IAAI,CAAC,MAAM;iBAChB;aACF;YACD,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACrB,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC;gBACpD,CAAC,CAAC,EAAE;SACP,CAAC;QAEF,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,eAAe,CAAC,iBAAiB,GAAG;gBAClC,MAAM,EAAE;oBACN,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE;oBAC7B,YAAY,EAAE;wBACZ,MAAM,EAAE;4BACN,EAAE,EAAE,IAAI,CAAC,QAAQ;4BACjB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;yBACtC;qBACF;oBACD,IAAI,EAAE;wBACJ,OAAO,EAAE;4BACP,EAAE,EAAE,iBAAQ,CAAC,iBAAiB;yBAC/B;qBACF;iBACF;aACF,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;YAC5B,IAAI,EAAE,eAAe;SACtB,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,cAAsB;QACpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC;YACtD,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE;YAC9D,MAAM,EAAE;gBACN,EAAE,EAAE,IAAI;aACT;SACF,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC;IACzB,CAAC;IAEO,OAAO,CAAC,IAA+B;QAC7C,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;YAChC,KAAK,EAAE;gBACL,EAAE,EAAE;oBACF,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE;oBACrB,GAAG,CAAC,IAAI,CAAC,QAAQ;wBACf,CAAC,CAAC;4BACE;gCACE,QAAQ,EAAE;oCACR,MAAM,EAAE,IAAI,CAAC,QAAQ;oCACrB,IAAI,EAAE,aAAsB;iCAC7B;6BACF;yBACF;wBACH,CAAC,CAAC,EAAE,CAAC;iBACR;aACF;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAjHY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,qBAAc,EAAC,wBAAiB,CAAC;qCAML,8BAAa;QACV,sBAAS;QACP,0BAAW;GAPhC,iBAAiB,CAiH7B"}
+{"version":3,"file":"create-user.handler.js","sourceRoot":"","sources":["../../../../../../src/features/auth/commands/handlers/create-user.handler.ts"],"names":[],"mappings":"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"}

package/dist/src/features/auth/commands/handlers/login-github.handler.d.ts

@@ -9,9 +9,7 @@ export declare class LoginGithubHandler implements ICommandHandler<LoginGithubCo
     private readonly githubOauthService;
     private readonly authService;
     constructor(commandBus: CommandBus, prisma: PrismaService, githubOauthService: GitHubAuthService, authService: AuthService);
-    execute({ data }: LoginGithubCommand): Promise<{
-        accessToken: string;
-    }>;
+    execute({ data }: LoginGithubCommand): Promise<import("../../../../features/auth/auth.service").IssuedTokens>;
     private getUser;
     private createUser;
 }

package/dist/src/features/auth/commands/handlers/login-github.handler.js

@@ -27,13 +27,10 @@ let LoginGithubHandler = class LoginGithubHandler {
     async execute({ data }) {
         const email = await this.githubOauthService.getEmail(data.code);
         const user = (await this.getUser(email)) || (await this.createUser(email));
-        return {
-            accessToken: this.authService.login({
-                username: user.username,
-                email,
-                sub: user.id,
-            }),
-        };
+        return this.authService.issueTokens(user, {
+            ip: data.ip,
+            userAgent: data.userAgent,
+        });
     }
     getUser(emailOrUserName) {
         return this.prisma.user.findFirst({

package/dist/src/features/auth/commands/handlers/login-github.handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"login-github.handler.js","sourceRoot":"","sources":["../../../../../../src/features/auth/commands/handlers/login-github.handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA8D;AAC9D,uCAA2E;AAC3E,qDAA6D;AAC7D,kCAKyC;AACzC,yCAA2D;AAC3D,qEAA2E;AAC3E,uFAA2E;AAGpE,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAI7B,YACmB,UAAsB,EACtB,MAAqB,EACrB,kBAAqC,EACrC,WAAwB;QAHxB,eAAU,GAAV,UAAU,CAAY;QACtB,WAAM,GAAN,MAAM,CAAe;QACrB,uBAAkB,GAAlB,kBAAkB,CAAmB;QACrC,gBAAW,GAAX,WAAW,CAAa;IACxC,CAAC;IAEJ,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAsB;QACxC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEhE,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;QAE3E,OAAO;YACL,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;gBAClC,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,KAAK;gBACL,GAAG,EAAE,IAAI,CAAC,EAAE;aACb,CAAC;SACH,CAAC;IACJ,CAAC;IAEO,OAAO,CAAC,eAAuB;QACrC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;YAChC,KAAK,EAAE;gBACL,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC;aAChE;SACF,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,KAAa;QACpC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAI3B,IAAI,wBAAiB,CAAC;YACpB,KAAK;YACL,QAAQ,EAAE,EAAE;YACZ,gBAAgB,EAAE,IAAI;YACtB,MAAM,EAAE,wBAAe,CAAC,UAAU;SACnC,CAAC,CACH,CAAC;QAEF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAEvC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,qCAA4B,CAAC,cAAc,CAAC,CAAC;QACzD,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAtDY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,qBAAc,EAAC,yBAAkB,CAAC;qCAMF,iBAAU;QACd,8BAAa;QACD,wCAAiB;QACxB,0BAAW;GARhC,kBAAkB,CAsD9B"}
+{"version":3,"file":"login-github.handler.js","sourceRoot":"","sources":["../../../../../../src/features/auth/commands/handlers/login-github.handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA8D;AAC9D,uCAA2E;AAC3E,qDAA6D;AAC7D,kCAKyC;AACzC,yCAA2D;AAC3D,qEAA2E;AAC3E,uFAA2E;AAGpE,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAI7B,YACmB,UAAsB,EACtB,MAAqB,EACrB,kBAAqC,EACrC,WAAwB;QAHxB,eAAU,GAAV,UAAU,CAAY;QACtB,WAAM,GAAN,MAAM,CAAe;QACrB,uBAAkB,GAAlB,kBAAkB,CAAmB;QACrC,gBAAW,GAAX,WAAW,CAAa;IACxC,CAAC;IAEJ,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAsB;QACxC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEhE,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;QAE3E,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,EAAE;YACxC,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;IACL,CAAC;IAEO,OAAO,CAAC,eAAuB;QACrC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;YAChC,KAAK,EAAE;gBACL,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC;aAChE;SACF,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,KAAa;QACpC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAI3B,IAAI,wBAAiB,CAAC;YACpB,KAAK;YACL,QAAQ,EAAE,EAAE;YACZ,gBAAgB,EAAE,IAAI;YACtB,MAAM,EAAE,wBAAe,CAAC,UAAU;SACnC,CAAC,CACH,CAAC;QAEF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAEvC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,qCAA4B,CAAC,cAAc,CAAC,CAAC;QACzD,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAnDY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,qBAAc,EAAC,yBAAkB,CAAC;qCAMF,iBAAU;QACd,8BAAa;QACD,wCAAiB;QACxB,0BAAW;GARhC,kBAAkB,CAmD9B"}

package/dist/src/features/auth/commands/handlers/login-google.handler.d.ts

@@ -9,9 +9,7 @@ export declare class LoginGoogleHandler implements ICommandHandler<LoginGoogleCo
     private readonly googleOauthService;
     private readonly authService;
     constructor(commandBus: CommandBus, prisma: PrismaService, googleOauthService: GoogleOauthService, authService: AuthService);
-    execute({ data }: LoginGoogleCommand): Promise<{
-        accessToken: string;
-    }>;
+    execute({ data }: LoginGoogleCommand): Promise<import("../../../../features/auth/auth.service").IssuedTokens>;
     private getUser;
     private createUser;
 }

package/dist/src/features/auth/commands/handlers/login-google.handler.js

@@ -27,13 +27,10 @@ let LoginGoogleHandler = class LoginGoogleHandler {
     async execute({ data }) {
         const info = await this.googleOauthService.getInfo(data.redirectUrl, data.code);
         const user = (await this.getUser(info.email)) || (await this.createUser(info.email));
-        return {
-            accessToken: this.authService.login({
-                username: user.username,
-                email: info.email,
-                sub: user.id,
-            }),
-        };
+        return this.authService.issueTokens(user, {
+            ip: data.ip,
+            userAgent: data.userAgent,
+        });
     }
     getUser(emailOrUserName) {
         return this.prisma.user.findFirst({

package/dist/src/features/auth/commands/handlers/login-google.handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"login-google.handler.js","sourceRoot":"","sources":["../../../../../../src/features/auth/commands/handlers/login-google.handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA8D;AAC9D,uCAA2E;AAC3E,qDAA6D;AAC7D,kCAKyC;AACzC,yCAA2D;AAC3D,qEAA4E;AAC5E,uFAA2E;AAGpE,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAI7B,YACmB,UAAsB,EACtB,MAAqB,EACrB,kBAAsC,EACtC,WAAwB;QAHxB,eAAU,GAAV,UAAU,CAAY;QACtB,WAAM,GAAN,MAAM,CAAe;QACrB,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,gBAAW,GAAX,WAAW,CAAa;IACxC,CAAC;IAEJ,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAsB;QACxC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAChD,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,IAAI,CACV,CAAC;QAEF,MAAM,IAAI,GACR,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAE1E,OAAO;YACL,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;gBAClC,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,GAAG,EAAE,IAAI,CAAC,EAAE;aACb,CAAC;SACH,CAAC;IACJ,CAAC;IAEO,OAAO,CAAC,eAAuB;QACrC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;YAChC,KAAK,EAAE;gBACL,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC;aAChE;SACF,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,KAAa;QACpC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAI3B,IAAI,wBAAiB,CAAC;YACpB,KAAK;YACL,QAAQ,EAAE,EAAE;YACZ,gBAAgB,EAAE,IAAI;YACtB,MAAM,EAAE,wBAAe,CAAC,UAAU;SACnC,CAAC,CACH,CAAC;QAEF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAEvC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,qCAA4B,CAAC,cAAc,CAAC,CAAC;QACzD,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AA1DY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,qBAAc,EAAC,yBAAkB,CAAC;qCAMF,iBAAU;QACd,8BAAa;QACD,yCAAkB;QACzB,0BAAW;GARhC,kBAAkB,CA0D9B"}
+{"version":3,"file":"login-google.handler.js","sourceRoot":"","sources":["../../../../../../src/features/auth/commands/handlers/login-google.handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA8D;AAC9D,uCAA2E;AAC3E,qDAA6D;AAC7D,kCAKyC;AACzC,yCAA2D;AAC3D,qEAA4E;AAC5E,uFAA2E;AAGpE,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAI7B,YACmB,UAAsB,EACtB,MAAqB,EACrB,kBAAsC,EACtC,WAAwB;QAHxB,eAAU,GAAV,UAAU,CAAY;QACtB,WAAM,GAAN,MAAM,CAAe;QACrB,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,gBAAW,GAAX,WAAW,CAAa;IACxC,CAAC;IAEJ,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAsB;QACxC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAChD,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,IAAI,CACV,CAAC;QAEF,MAAM,IAAI,GACR,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAE1E,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,EAAE;YACxC,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;IACL,CAAC;IAEO,OAAO,CAAC,eAAuB;QACrC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;YAChC,KAAK,EAAE;gBACL,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC;aAChE;SACF,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,KAAa;QACpC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAI3B,IAAI,wBAAiB,CAAC;YACpB,KAAK;YACL,QAAQ,EAAE,EAAE;YACZ,gBAAgB,EAAE,IAAI;YACtB,MAAM,EAAE,wBAAe,CAAC,UAAU;SACnC,CAAC,CACH,CAAC;QAEF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAEvC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,qCAA4B,CAAC,cAAc,CAAC,CAAC;QACzD,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAvDY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,qBAAc,EAAC,yBAAkB,CAAC;qCAMF,iBAAU;QACd,8BAAa;QACD,yCAAkB;QACzB,0BAAW;GARhC,kBAAkB,CAuD9B"}