dn-react-router-toolkit 0.1.12 → 0.2.0

package/dist/auth/apple_auth.d.mts

@@ -0,0 +1,38 @@
+import { ThirdpartyAuth, ThirdpartyAuthService } from './thirdparty_auth.mjs';
+import './auth_service.mjs';
+import 'jose';
+import 'react-router';
+import './jwt_manager.mjs';
+import '../file/object_storage.mjs';
+import '@aws-sdk/client-s3';
+import './auth_repository.mjs';
+
+declare class AppleAuth implements ThirdpartyAuth {
+    thirdpartyAuth: ThirdpartyAuthService;
+    appleAuthKey: string;
+    appleClientId: string;
+    appleTeamId: string;
+    appleKeyId: string;
+    appleServiceId: string;
+    constructor({ thirdpartyAuth, appleAuthKey, appleClientId, appleTeamId, appleKeyId, appleServiceId, }: {
+        thirdpartyAuth: ThirdpartyAuthService;
+        appleAuthKey: string;
+        appleClientId: string;
+        appleTeamId: string;
+        appleKeyId: string;
+        appleServiceId: string;
+    });
+    login(code: string, type?: "web" | "app"): Promise<{
+        user: {
+            id: string;
+            role: string;
+            name: string;
+            refreshToken: string | null;
+        };
+        accessToken: string;
+        refreshToken: string;
+    }>;
+    private generateAppleClientSecret;
+}
+
+export { AppleAuth };

package/dist/auth/apple_auth.d.ts

@@ -0,0 +1,38 @@
+import { ThirdpartyAuth, ThirdpartyAuthService } from './thirdparty_auth.js';
+import './auth_service.js';
+import 'jose';
+import 'react-router';
+import './jwt_manager.js';
+import '../file/object_storage.js';
+import '@aws-sdk/client-s3';
+import './auth_repository.js';
+
+declare class AppleAuth implements ThirdpartyAuth {
+    thirdpartyAuth: ThirdpartyAuthService;
+    appleAuthKey: string;
+    appleClientId: string;
+    appleTeamId: string;
+    appleKeyId: string;
+    appleServiceId: string;
+    constructor({ thirdpartyAuth, appleAuthKey, appleClientId, appleTeamId, appleKeyId, appleServiceId, }: {
+        thirdpartyAuth: ThirdpartyAuthService;
+        appleAuthKey: string;
+        appleClientId: string;
+        appleTeamId: string;
+        appleKeyId: string;
+        appleServiceId: string;
+    });
+    login(code: string, type?: "web" | "app"): Promise<{
+        user: {
+            id: string;
+            role: string;
+            name: string;
+            refreshToken: string | null;
+        };
+        accessToken: string;
+        refreshToken: string;
+    }>;
+    private generateAppleClientSecret;
+}
+
+export { AppleAuth };

package/dist/{auth-kit → auth}/apple_auth.js

@@ -17,7 +17,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/auth-kit/apple_auth.ts
+// src/auth/apple_auth.ts
 var apple_auth_exports = {};
 __export(apple_auth_exports, {
   AppleAuth: () => AppleAuth
@@ -25,11 +25,28 @@ __export(apple_auth_exports, {
 module.exports = __toCommonJS(apple_auth_exports);
 var import_jose = require("jose");
 var AppleAuth = class {
-  AUTH;
-  constructor(AUTH) {
-    this.AUTH = AUTH;
+  thirdpartyAuth;
+  appleAuthKey;
+  appleClientId;
+  appleTeamId;
+  appleKeyId;
+  appleServiceId;
+  constructor({
+    thirdpartyAuth,
+    appleAuthKey,
+    appleClientId,
+    appleTeamId,
+    appleKeyId,
+    appleServiceId
+  }) {
+    this.thirdpartyAuth = thirdpartyAuth;
+    this.appleAuthKey = appleAuthKey;
+    this.appleClientId = appleClientId;
+    this.appleTeamId = appleTeamId;
+    this.appleKeyId = appleKeyId;
+    this.appleServiceId = appleServiceId;
   }
-  async signIn(code, type = "web") {
+  async login(code, type = "web") {
     const url = "https://appleid.apple.com/auth/token";
     const client_secret = await this.generateAppleClientSecret(type);
     const res = await fetch(url, {
@@ -38,7 +55,7 @@ var AppleAuth = class {
         "Content-Type": "application/x-www-form-urlencoded"
       },
       body: new URLSearchParams({
-        client_id: type === "web" ? process.env.APPLE_SERVICE_ID : process.env.APPLE_CLIENT_ID,
+        client_id: type === "web" ? this.appleServiceId : this.appleClientId,
         client_secret,
         code,
         grant_type: "authorization_code"
@@ -50,23 +67,19 @@ var AppleAuth = class {
     }
     const data = await res.json();
     const { id_token } = data;
-    const payload = (0, import_jose.decodeJwt)(id_token);
-    const { sub, email, name } = payload;
-    const user = await this.AUTH.getOrCreateUser("apple", {
+    const appleAuth = (0, import_jose.decodeJwt)(id_token);
+    const { sub, email, name } = appleAuth;
+    const payload = {
       id: sub,
       email,
       name
-    });
-    const { accessToken, refreshToken } = await this.AUTH.issueTokenPair(user);
-    return { user, accessToken, refreshToken };
+    };
+    return this.thirdpartyAuth.issueTokensIfUserFound("apple", payload);
   }
   async generateAppleClientSecret(type = "web") {
-    const authKey = process.env.APPLE_AUTH_KEY;
-    const teamId = process.env.APPLE_TEAM_ID;
-    const keyId = process.env.APPLE_KEY_ID;
-    const clientId = type === "web" ? process.env.APPLE_SERVICE_ID : process.env.APPLE_CLIENT_ID;
-    const keyObject = await (0, import_jose.importPKCS8)(authKey, "ES256");
-    return new import_jose.SignJWT().setProtectedHeader({ alg: "ES256", kid: keyId }).setIssuedAt().setIssuer(teamId).setExpirationTime("1h").setAudience("https://appleid.apple.com").setSubject(clientId).sign(keyObject);
+    const clientId = type === "web" ? this.appleServiceId : this.appleClientId;
+    const keyObject = await (0, import_jose.importPKCS8)(this.appleAuthKey, "ES256");
+    return new import_jose.SignJWT().setProtectedHeader({ alg: "ES256", kid: this.appleKeyId }).setIssuedAt().setIssuer(this.appleTeamId).setExpirationTime("1h").setAudience("https://appleid.apple.com").setSubject(clientId).sign(keyObject);
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/auth/apple_auth.mjs

@@ -0,0 +1,63 @@
+// src/auth/apple_auth.ts
+import { decodeJwt, importPKCS8, SignJWT } from "jose";
+var AppleAuth = class {
+  thirdpartyAuth;
+  appleAuthKey;
+  appleClientId;
+  appleTeamId;
+  appleKeyId;
+  appleServiceId;
+  constructor({
+    thirdpartyAuth,
+    appleAuthKey,
+    appleClientId,
+    appleTeamId,
+    appleKeyId,
+    appleServiceId
+  }) {
+    this.thirdpartyAuth = thirdpartyAuth;
+    this.appleAuthKey = appleAuthKey;
+    this.appleClientId = appleClientId;
+    this.appleTeamId = appleTeamId;
+    this.appleKeyId = appleKeyId;
+    this.appleServiceId = appleServiceId;
+  }
+  async login(code, type = "web") {
+    const url = "https://appleid.apple.com/auth/token";
+    const client_secret = await this.generateAppleClientSecret(type);
+    const res = await fetch(url, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded"
+      },
+      body: new URLSearchParams({
+        client_id: type === "web" ? this.appleServiceId : this.appleClientId,
+        client_secret,
+        code,
+        grant_type: "authorization_code"
+      })
+    });
+    if (!res.ok) {
+      console.error(await res.text());
+      throw new Error("Apple \uC778\uC99D\uC5D0 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.");
+    }
+    const data = await res.json();
+    const { id_token } = data;
+    const appleAuth = decodeJwt(id_token);
+    const { sub, email, name } = appleAuth;
+    const payload = {
+      id: sub,
+      email,
+      name
+    };
+    return this.thirdpartyAuth.issueTokensIfUserFound("apple", payload);
+  }
+  async generateAppleClientSecret(type = "web") {
+    const clientId = type === "web" ? this.appleServiceId : this.appleClientId;
+    const keyObject = await importPKCS8(this.appleAuthKey, "ES256");
+    return new SignJWT().setProtectedHeader({ alg: "ES256", kid: this.appleKeyId }).setIssuedAt().setIssuer(this.appleTeamId).setExpirationTime("1h").setAudience("https://appleid.apple.com").setSubject(clientId).sign(keyObject);
+  }
+};
+export {
+  AppleAuth
+};

package/dist/{auth-kit/repository.d.mts → auth/auth_repository.d.mts}

@@ -1,4 +1,4 @@
-interface AuthRepository {
+interface AuthRepository<TFile = unknown> {
     findCredentialById(id: string): Promise<{
         password: string;
         userId: string;
@@ -13,9 +13,9 @@ interface AuthRepository {
     createUser(userData: {
         id: string;
         role: string;
-        profileImageId: string | null;
         name: string;
         email: string;
+        profileImage?: TFile;
     }): Promise<{
         id: string;
         role: string;
@@ -24,18 +24,15 @@ interface AuthRepository {
     findThirdPartyAuth(provider: string, providerId: string): Promise<{
         userId: string;
     } | undefined>;
-    createThirdPartyAuth(authData: {
+    createThirdPartyAuth(params: {
         id: string;
         provider: string;
         userId: string;
     }): Promise<void>;
-    createFile(fileData: {
+    createCredential(params: {
         id: string;
-        name: string;
-        type: string;
-        key: string;
-        size: number;
-        metadata: Record<string, any>;
+        password: string;
+        userId: string;
     }): Promise<void>;
 }
 

package/dist/{auth-kit/repository.d.ts → auth/auth_repository.d.ts}

@@ -1,4 +1,4 @@
-interface AuthRepository {
+interface AuthRepository<TFile = unknown> {
     findCredentialById(id: string): Promise<{
         password: string;
         userId: string;
@@ -13,9 +13,9 @@ interface AuthRepository {
     createUser(userData: {
         id: string;
         role: string;
-        profileImageId: string | null;
         name: string;
         email: string;
+        profileImage?: TFile;
     }): Promise<{
         id: string;
         role: string;
@@ -24,18 +24,15 @@ interface AuthRepository {
     findThirdPartyAuth(provider: string, providerId: string): Promise<{
         userId: string;
     } | undefined>;
-    createThirdPartyAuth(authData: {
+    createThirdPartyAuth(params: {
         id: string;
         provider: string;
         userId: string;
     }): Promise<void>;
-    createFile(fileData: {
+    createCredential(params: {
         id: string;
-        name: string;
-        type: string;
-        key: string;
-        size: number;
-        metadata: Record<string, any>;
+        password: string;
+        userId: string;
     }): Promise<void>;
 }
 

package/dist/{file-kit/repository.js → auth/auth_repository.js}

@@ -13,6 +13,6 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/file-kit/repository.ts
-var repository_exports = {};
-module.exports = __toCommonJS(repository_exports);
+// src/auth/auth_repository.ts
+var auth_repository_exports = {};
+module.exports = __toCommonJS(auth_repository_exports);

package/dist/{auth-kit → auth}/auth_service.d.mts

@@ -1,22 +1,22 @@
 import * as jose from 'jose';
 import * as react_router from 'react-router';
-import { JWTManager } from './jwt.mjs';
-import { ObjectStorage } from '../file-kit/object_storage.mjs';
-import { AuthRepository } from './repository.mjs';
+import { JWTManager } from './jwt_manager.mjs';
+import { ObjectStorage } from '../file/object_storage.mjs';
+import { AuthRepository } from './auth_repository.mjs';
 import '@aws-sdk/client-s3';
 
 declare const ACCESS_TOKEN_KEY = "access_token";
 declare const REFRESH_TOKEN_KEY = "refresh_token";
 declare const ACCESS_TOKEN_COOKIE: react_router.Cookie;
 declare const REFRESH_TOKEN_COOKIE: react_router.Cookie;
-declare class AuthService {
-    repository: AuthRepository;
-    JWT_MANAGER: JWTManager;
-    OBJECT_STORAGE: ObjectStorage;
-    constructor({ repository, JWT_MANAGER, OBJECT_STORAGE, }: {
-        repository: AuthRepository;
-        JWT_MANAGER: JWTManager;
-        OBJECT_STORAGE: ObjectStorage;
+declare class AuthService<TFile = unknown> {
+    authRepository: AuthRepository<TFile>;
+    jwtManager: JWTManager;
+    objectStorage: ObjectStorage;
+    constructor({ authRepository, jwtManager, objectStorage, }: {
+        authRepository: AuthRepository<TFile>;
+        jwtManager: JWTManager;
+        objectStorage: ObjectStorage;
     });
     verify(request: Request): Promise<jose.JWTPayload | undefined>;
     verifyOrRefresh(request: Request): Promise<jose.JWTPayload | undefined>;
@@ -58,17 +58,6 @@ declare class AuthService {
         name: string;
         refreshToken: string | null;
     } | undefined>;
-    getOrCreateUser(provider: string, info: {
-        id: string;
-        email: string;
-        name?: string;
-        picture?: string;
-    }): Promise<{
-        id: string;
-        role: string;
-        name: string;
-    }>;
-    protected savePicture(picture?: string): Promise<string | undefined>;
 }
 
 export { ACCESS_TOKEN_COOKIE, ACCESS_TOKEN_KEY, AuthService, REFRESH_TOKEN_COOKIE, REFRESH_TOKEN_KEY };

package/dist/{auth-kit → auth}/auth_service.d.ts

@@ -1,22 +1,22 @@
 import * as jose from 'jose';
 import * as react_router from 'react-router';
-import { JWTManager } from './jwt.js';
-import { ObjectStorage } from '../file-kit/object_storage.js';
-import { AuthRepository } from './repository.js';
+import { JWTManager } from './jwt_manager.js';
+import { ObjectStorage } from '../file/object_storage.js';
+import { AuthRepository } from './auth_repository.js';
 import '@aws-sdk/client-s3';
 
 declare const ACCESS_TOKEN_KEY = "access_token";
 declare const REFRESH_TOKEN_KEY = "refresh_token";
 declare const ACCESS_TOKEN_COOKIE: react_router.Cookie;
 declare const REFRESH_TOKEN_COOKIE: react_router.Cookie;
-declare class AuthService {
-    repository: AuthRepository;
-    JWT_MANAGER: JWTManager;
-    OBJECT_STORAGE: ObjectStorage;
-    constructor({ repository, JWT_MANAGER, OBJECT_STORAGE, }: {
-        repository: AuthRepository;
-        JWT_MANAGER: JWTManager;
-        OBJECT_STORAGE: ObjectStorage;
+declare class AuthService<TFile = unknown> {
+    authRepository: AuthRepository<TFile>;
+    jwtManager: JWTManager;
+    objectStorage: ObjectStorage;
+    constructor({ authRepository, jwtManager, objectStorage, }: {
+        authRepository: AuthRepository<TFile>;
+        jwtManager: JWTManager;
+        objectStorage: ObjectStorage;
     });
     verify(request: Request): Promise<jose.JWTPayload | undefined>;
     verifyOrRefresh(request: Request): Promise<jose.JWTPayload | undefined>;
@@ -58,17 +58,6 @@ declare class AuthService {
         name: string;
         refreshToken: string | null;
     } | undefined>;
-    getOrCreateUser(provider: string, info: {
-        id: string;
-        email: string;
-        name?: string;
-        picture?: string;
-    }): Promise<{
-        id: string;
-        role: string;
-        name: string;
-    }>;
-    protected savePicture(picture?: string): Promise<string | undefined>;
 }
 
 export { ACCESS_TOKEN_COOKIE, ACCESS_TOKEN_KEY, AuthService, REFRESH_TOKEN_COOKIE, REFRESH_TOKEN_KEY };

package/dist/{auth-kit → auth}/auth_service.js

@@ -27,7 +27,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/auth-kit/auth_service.ts
+// src/auth/auth_service.ts
 var auth_service_exports = {};
 __export(auth_service_exports, {
   ACCESS_TOKEN_COOKIE: () => ACCESS_TOKEN_COOKIE,
@@ -38,7 +38,6 @@ __export(auth_service_exports, {
 });
 module.exports = __toCommonJS(auth_service_exports);
 var import_bcryptjs = __toESM(require("bcryptjs"));
-var import_uuid = require("uuid");
 var import_react_router = require("react-router");
 var ACCESS_TOKEN_KEY = "access_token";
 var REFRESH_TOKEN_KEY = "refresh_token";
@@ -55,22 +54,22 @@ var REFRESH_TOKEN_COOKIE = (0, import_react_router.createCookie)(REFRESH_TOKEN_K
   sameSite: "strict"
 });
 var AuthService = class {
-  repository;
-  JWT_MANAGER;
-  OBJECT_STORAGE;
+  authRepository;
+  jwtManager;
+  objectStorage;
   constructor({
-    repository,
-    JWT_MANAGER,
-    OBJECT_STORAGE
+    authRepository,
+    jwtManager,
+    objectStorage
   }) {
-    this.repository = repository;
-    this.JWT_MANAGER = JWT_MANAGER;
-    this.OBJECT_STORAGE = OBJECT_STORAGE;
+    this.authRepository = authRepository;
+    this.jwtManager = jwtManager;
+    this.objectStorage = objectStorage;
   }
   async verify(request) {
     const accessToken = await this.getAccessTokenFromRequest(request);
     if (accessToken) {
-      return this.JWT_MANAGER.verifyAccessToken(accessToken);
+      return this.jwtManager.verifyAccessToken(accessToken);
     }
   }
   async verifyOrRefresh(request) {
@@ -106,7 +105,7 @@ var AuthService = class {
           refreshToken
         );
         await this.getAccessTokenSetCookie(refreshedAccessToken);
-        const payload = this.JWT_MANAGER.decode(refreshedAccessToken);
+        const payload = this.jwtManager.decode(refreshedAccessToken);
         if (payload) {
           return payload;
         }
@@ -119,14 +118,14 @@ var AuthService = class {
     }
   }
   async signIn({ id, password }) {
-    const credential = await this.repository.findCredentialById(id);
+    const credential = await this.authRepository.findCredentialById(id);
     if (!credential) {
       throw Error("\uC544\uC774\uB514 \uB610\uB294 \uBE44\uBC00\uBC88\uD638\uAC00 \uD2C0\uB838\uC2B5\uB2C8\uB2E4.");
     }
     if (!await import_bcryptjs.default.compare(password, credential.password)) {
       throw Error("\uC544\uC774\uB514 \uB610\uB294 \uBE44\uBC00\uBC88\uD638\uAC00 \uD2C0\uB838\uC2B5\uB2C8\uB2E4.");
     }
-    const user = await this.repository.findUserById(credential.userId);
+    const user = await this.authRepository.findUserById(credential.userId);
     if (!user) {
       throw Error("\uD68C\uC6D0 \uC815\uBCF4\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.");
     }
@@ -137,19 +136,19 @@ var AuthService = class {
     };
   }
   async issueAccessToken(user) {
-    return this.JWT_MANAGER.signAccessToken({
+    return this.jwtManager.signAccessToken({
       userId: user.id,
       role: user.role,
       name: user.name
     });
   }
   async issueTokenPair(user) {
-    const refreshToken = await this.JWT_MANAGER.signRefreshToken({
+    const refreshToken = await this.jwtManager.signRefreshToken({
       userId: user.id,
       role: user.role,
       name: user.name
     });
-    await this.repository.updateUserRefreshToken(
+    await this.authRepository.updateUserRefreshToken(
       user.id,
       await import_bcryptjs.default.hash(refreshToken, 10)
     );
@@ -157,7 +156,7 @@ var AuthService = class {
     return { refreshToken, accessToken };
   }
   async refreshAccessToken(refreshToken) {
-    const payload = await this.JWT_MANAGER.verifyRefreshToken(refreshToken);
+    const payload = await this.jwtManager.verifyRefreshToken(refreshToken);
     if (!payload) {
       throw new Error("\uD1A0\uD070\uC774 \uC720\uD6A8\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.");
     }
@@ -165,7 +164,7 @@ var AuthService = class {
     if (typeof userId !== "string") {
       throw new Error("\uD1A0\uD070\uC774 \uC704\uC870\uB418\uC5C8\uC2B5\uB2C8\uB2E4.");
     }
-    const user = await this.repository.findUserById(userId);
+    const user = await this.authRepository.findUserById(userId);
     if (!user) {
       throw Error("\uC774\uC6A9\uC790\uB97C \uCC3E\uC9C0 \uBABB\uD588\uC2B5\uB2C8\uB2E4.");
     }
@@ -180,78 +179,26 @@ var AuthService = class {
   }
   async getAccessTokenSetCookie(accessToken) {
     return ACCESS_TOKEN_COOKIE.serialize(accessToken, {
-      expires: accessToken ? this.JWT_MANAGER.getExpirationTime(accessToken) : /* @__PURE__ */ new Date(0)
+      expires: accessToken ? this.jwtManager.getExpirationTime(accessToken) : /* @__PURE__ */ new Date(0)
     });
   }
   async getRefreshTokenSetCookie(refreshToken) {
     return REFRESH_TOKEN_COOKIE.serialize(refreshToken, {
-      expires: refreshToken ? this.JWT_MANAGER.getExpirationTime(refreshToken) : /* @__PURE__ */ new Date(0)
+      expires: refreshToken ? this.jwtManager.getExpirationTime(refreshToken) : /* @__PURE__ */ new Date(0)
     });
   }
   async findUser(provider, info) {
-    const thirdPartyAuth = await this.repository.findThirdPartyAuth(
+    const thirdPartyAuth = await this.authRepository.findThirdPartyAuth(
       provider,
       info.id
     );
     if (thirdPartyAuth) {
-      const user = await this.repository.findUserById(thirdPartyAuth.userId);
+      const user = await this.authRepository.findUserById(thirdPartyAuth.userId);
       if (user) {
         return user;
       }
     }
   }
-  async getOrCreateUser(provider, info) {
-    const thirdPartyAuth = await this.repository.findThirdPartyAuth(
-      provider,
-      info.id
-    );
-    if (thirdPartyAuth) {
-      const user = await this.repository.findUserById(thirdPartyAuth.userId);
-      if (user) {
-        return user;
-      }
-    }
-    const userId = (0, import_uuid.v4)();
-    const email = info.email;
-    const name = info.name || "\uC775\uBA85";
-    const picture = info.picture;
-    const profileImageId = await this.savePicture(picture) || null;
-    const result = await this.repository.createUser({
-      id: userId,
-      role: "user",
-      profileImageId,
-      name,
-      email
-    });
-    await this.repository.createThirdPartyAuth({
-      id: info.id,
-      provider,
-      userId
-    });
-    return result;
-  }
-  async savePicture(picture) {
-    if (!picture) {
-      return;
-    }
-    const res = await fetch(picture);
-    if (!res.ok) {
-      return;
-    }
-    const buffer = await res.arrayBuffer();
-    const id = (0, import_uuid.v4)();
-    const key = `/users/${id}/picture`;
-    await this.OBJECT_STORAGE.put(key, Buffer.from(buffer));
-    await this.repository.createFile({
-      id,
-      name: "picture",
-      type: "image/*",
-      key,
-      size: buffer.byteLength,
-      metadata: {}
-    });
-    return id;
-  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {