@things-factory/auth-base 10.1.208 → 10.1.213

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/auth-base",
-  "version": "10.1.208",
+  "version": "10.1.213",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -50,5 +50,5 @@
     "passport-jwt": "^4.0.0",
     "passport-local": "^1.0.0"
   },
-  "gitHead": "ffc1ceaa9471b9f4a9b86f46c3021f2fed72d17d"
+  "gitHead": "81f23aa18cb584c7d8185e81cca0d688f509cf8c"
 }

package/translations/ko.json

@@ -88,8 +88,8 @@
   "privilege.allows.env-var.query": "서버 환경 변수의 이름과 값을 볼 수 있습니다.",
   "privilege.allows.equipment-state.mutation": "설비 상태를 바꾸고 멈춘 사유를 남길 수 있습니다.",
   "privilege.allows.equipment-state.query": "설비가 돌고 있는지 멈췄는지 볼 수 있습니다.",
-  "privilege.allows.figure.mutation": "Figure 모델을 만들고 수정할 수 있습니다.",
-  "privilege.allows.figure.query": "Figure 모델과 그 구성을 볼 수 있습니다.",
+  "privilege.allows.figure.mutation": "피규어를 만들고 수정할 수 있습니다.",
+  "privilege.allows.figure.query": "피규어와 그 부품을 볼 수 있습니다.",
   "privilege.allows.inspection.mutation": "검사 결과를 올리고 합부를 판단할 수 있습니다.",
   "privilege.allows.inspection.query": "검사 기준과 검사 결과를 볼 수 있습니다.",
   "privilege.allows.job-order.mutation": "작업지시를 발행·수정하고 종료할 수 있습니다.",
@@ -171,7 +171,7 @@
   "privilege.category.employee": "임직원",
   "privilege.category.env-var": "환경 변수",
   "privilege.category.equipment-state": "설비 상태",
-  "privilege.category.figure": "Figure 모델",
+  "privilege.category.figure": "피규어",
   "privilege.category.inspection": "검사",
   "privilege.category.job-order": "작업 지시",
   "privilege.category.kpi": "성과 지표",

package/dist-server/middlewares/webauthn-middleware.d.ts

@@ -1 +0,0 @@
-export declare function createWebAuthnMiddleware(strategy: 'webauthn-register' | 'webauthn-login'): (context: any, next: any) => Promise<any>;

package/dist-server/middlewares/webauthn-middleware.js

@@ -1,103 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createWebAuthnMiddleware = createWebAuthnMiddleware;
-const tslib_1 = require("tslib");
-const koa_passport_1 = tslib_1.__importDefault(require("koa-passport"));
-const passport_custom_1 = require("passport-custom");
-const shell_1 = require("@things-factory/shell");
-const auth_error_js_1 = require("../errors/auth-error.js");
-const web_auth_credential_js_1 = require("../service/web-auth-credential/web-auth-credential.js");
-const server_1 = require("@simplewebauthn/server");
-koa_passport_1.default.use('webauthn-register', new passport_custom_1.Strategy(async (context, done) => {
-    const { body, session, user, hostname, origin } = context;
-    const challenge = session.challenge;
-    const verification = await (0, server_1.verifyRegistrationResponse)({
-        response: body,
-        expectedChallenge: challenge,
-        expectedOrigin: origin,
-        expectedRPID: hostname,
-        expectedType: 'webauthn.create',
-        requireUserVerification: false
-    });
-    if (verification.verified) {
-        const { registrationInfo } = verification;
-        const publicKey = Buffer.from(registrationInfo.credential.publicKey).toString('base64');
-        if (!registrationInfo) {
-            return done(null, false);
-        }
-        if (user) {
-            const webAuthRepository = (0, shell_1.getRepository)(web_auth_credential_js_1.WebAuthCredential);
-            await webAuthRepository.save({
-                user,
-                credentialId: registrationInfo.credential.id,
-                publicKey,
-                counter: registrationInfo.credential.counter,
-                creator: user,
-                updater: user
-            });
-        }
-        return done(null, user);
-    }
-    else {
-        return done(null, false);
-    }
-}));
-koa_passport_1.default.use('webauthn-login', new passport_custom_1.Strategy(async (context, done) => {
-    try {
-        const { body, session, origin, hostname } = context;
-        const challenge = session.challenge;
-        const assertionResponse = body;
-        const credential = await (0, shell_1.getRepository)(web_auth_credential_js_1.WebAuthCredential).findOne({
-            where: {
-                credentialId: assertionResponse.id
-            },
-            relations: ['user']
-        });
-        if (!credential) {
-            return done(null, false);
-        }
-        const verification = await (0, server_1.verifyAuthenticationResponse)({
-            response: body,
-            expectedChallenge: challenge,
-            expectedOrigin: origin,
-            expectedRPID: hostname,
-            requireUserVerification: false,
-            credential: {
-                id: credential.credentialId,
-                publicKey: new Uint8Array(Buffer.from(credential.publicKey, 'base64')),
-                counter: credential.counter
-            }
-        });
-        if (verification.verified) {
-            const { authenticationInfo } = verification;
-            credential.counter = authenticationInfo.newCounter;
-            await (0, shell_1.getRepository)(web_auth_credential_js_1.WebAuthCredential).save(credential);
-            const user = credential.user;
-            return done(null, user);
-        }
-        else {
-            return done(verification, false);
-        }
-    }
-    catch (error) {
-        return done(error, false);
-    }
-}));
-function createWebAuthnMiddleware(strategy) {
-    return async function webAuthnMiddleware(context, next) {
-        return koa_passport_1.default.authenticate(strategy, { session: true, failureMessage: true, failWithError: true }, async (err, user) => {
-            if (err || !user) {
-                throw new auth_error_js_1.AuthError({
-                    errorCode: auth_error_js_1.AuthError.ERROR_CODES.AUTHN_VERIFICATION_FAILED,
-                    detail: err
-                });
-            }
-            else {
-                context.state.user = user;
-                context.body = { user, verified: true };
-            }
-            await next();
-        })(context, next);
-    };
-}
-//# sourceMappingURL=webauthn-middleware.js.map

package/dist-server/middlewares/webauthn-middleware.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"webauthn-middleware.js","sourceRoot":"","sources":["../../server/middlewares/webauthn-middleware.ts"],"names":[],"mappings":"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","sourcesContent":["import passport from 'koa-passport'\nimport { Strategy as CustomStrategy } from 'passport-custom'\n\nimport { getRepository } from '@things-factory/shell'\n\nimport { AuthError } from '../errors/auth-error.js'\n\nimport { WebAuthCredential } from '../service/web-auth-credential/web-auth-credential.js'\nimport {\n  AuthenticatorAssertionResponse,\n  verifyRegistrationResponse,\n  verifyAuthenticationResponse\n} from '@simplewebauthn/server'\n\npassport.use(\n  'webauthn-register',\n  new CustomStrategy(async (context, done) => {\n    const { body, session, user, hostname, origin } = context as any\n\n    const challenge = session.challenge\n\n    const verification = await verifyRegistrationResponse({\n      response: body,\n      expectedChallenge: challenge,\n      expectedOrigin: origin,\n      expectedRPID: hostname,\n      expectedType: 'webauthn.create',\n      requireUserVerification: false\n    })\n\n    if (verification.verified) {\n      const { registrationInfo } = verification\n      const publicKey = Buffer.from(registrationInfo.credential.publicKey).toString('base64')\n      if (!registrationInfo) {\n        return done(null, false)\n      }\n      if (user) {\n        const webAuthRepository = getRepository(WebAuthCredential)\n        await webAuthRepository.save({\n          user,\n          credentialId: registrationInfo.credential.id,\n          publicKey,\n          counter: registrationInfo.credential.counter,\n          creator: user,\n          updater: user\n        })\n      }\n\n      return done(null, user)\n    } else {\n      return done(null, false)\n    }\n  })\n)\n\npassport.use(\n  'webauthn-login',\n  new CustomStrategy(async (context, done) => {\n    try {\n      const { body, session, origin, hostname } = context as any\n\n      const challenge = session.challenge\n\n      const assertionResponse = body as {\n        id: string\n        response: AuthenticatorAssertionResponse\n      }\n\n      const credential = await getRepository(WebAuthCredential).findOne({\n        where: {\n          credentialId: assertionResponse.id\n        },\n        relations: ['user']\n      })\n\n      if (!credential) {\n        return done(null, false)\n      }\n\n      const verification = await verifyAuthenticationResponse({\n        response: body,\n        expectedChallenge: challenge,\n        expectedOrigin: origin,\n        expectedRPID: hostname,\n        requireUserVerification: false,\n        credential: {\n          id: credential.credentialId,\n          publicKey: new Uint8Array(Buffer.from(credential.publicKey, 'base64')),\n          counter: credential.counter\n        }\n      })\n\n      if (verification.verified) {\n        const { authenticationInfo } = verification\n        credential.counter = authenticationInfo.newCounter\n        await getRepository(WebAuthCredential).save(credential)\n\n        const user = credential.user\n        return done(null, user)\n      } else {\n        return done(verification, false)\n      }\n    } catch (error) {\n      return done(error, false)\n    }\n  })\n)\n\nexport function createWebAuthnMiddleware(strategy: 'webauthn-register' | 'webauthn-login') {\n  return async function webAuthnMiddleware(context, next) {\n    return passport.authenticate(\n      strategy,\n      { session: true, failureMessage: true, failWithError: true },\n      async (err, user) => {\n        if (err || !user) {\n          throw new AuthError({\n            errorCode: AuthError.ERROR_CODES.AUTHN_VERIFICATION_FAILED,\n            detail: err\n          })\n        } else {\n          context.state.user = user\n\n          context.body = { user, verified: true }\n        }\n\n        await next()\n      }\n    )(context, next)\n  }\n}\n"]}