@restorecommerce/facade 1.2.0 → 1.3.1

package/dist/modules/identity/oidc/in-memory-adapter.js

@@ -1,71 +1,85 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.InMemoryAdapter = void 0;
-const lru_cache_1 = __importDefault(require("lru-cache"));
-const utils_1 = require("./utils");
-class InMemoryAdapter {
+import LRU from 'lru-cache';
+import { epochTime } from './utils.js';
+export class InMemoryAdapter {
     constructor(type) {
         this.type = type;
-        this.tokenStorage = new lru_cache_1.default({ max: 1000 });
-        this.sessionStorage = new lru_cache_1.default({ max: 1000 });
-        this.grantIdStorage = new lru_cache_1.default({ max: 1000 });
+        this.tokenStorage = new LRU({ max: 1000 });
+        this.sessionStorage = new LRU({ max: 1000 });
+        this.grantIdStorage = new LRU({ max: 1000 });
     }
     key(id) {
         return `${this.type}:${id}`;
     }
-    async upsert(id, payload, expiresIn) {
-        const key = this.key(id);
-        if (this.type === 'Session' && payload.uid) {
-            this.sessionStorage.set(payload.uid, id, {
-                ttl: expiresIn * 1000
-            });
-        }
-        const { grantId, userCode } = payload;
-        if (grantId) {
-            this.grantIdStorage.set(grantId, [key]);
-            const grant = this.grantIdStorage.get(grantId);
-            if (!grant) {
+    upsert(id, payload, expiresIn) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const key = this.key(id);
+            if (this.type === 'Session' && payload.uid) {
+                this.sessionStorage.set(payload.uid, id, {
+                    ttl: expiresIn * 1000
+                });
+            }
+            const { grantId, userCode } = payload;
+            if (grantId) {
                 this.grantIdStorage.set(grantId, [key]);
+                const grant = this.grantIdStorage.get(grantId);
+                if (!grant) {
+                    this.grantIdStorage.set(grantId, [key]);
+                }
+                else {
+                    grant.push(key);
+                }
             }
-            else {
-                grant.push(key);
+            if (userCode) {
+                throw 'UNSUPPORTED';
             }
-        }
-        if (userCode) {
-            throw 'UNSUPPORTED';
-        }
-        this.tokenStorage.set(key, payload, {
-            ttl: expiresIn * 1000
+            this.tokenStorage.set(key, payload, {
+                ttl: expiresIn * 1000
+            });
         });
     }
     findByUserCode(userCode) {
         throw new Error('UNSUPPORTED');
     }
-    async find(id) {
-        return this.tokenStorage.get(this.key(id));
+    find(id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.tokenStorage.get(this.key(id));
+        });
     }
-    async findByUid(uid) {
-        const id = await this.sessionStorage.get(uid);
-        return id ? this.find(id) : undefined;
+    findByUid(uid) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const id = yield this.sessionStorage.get(uid);
+            return id ? this.find(id) : undefined;
+        });
     }
-    async consume(id) {
-        const payload = this.tokenStorage.get(this.key(id));
-        if (payload) {
-            payload.consumed = (0, utils_1.epochTime)();
-        }
+    consume(id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const payload = this.tokenStorage.get(this.key(id));
+            if (payload) {
+                payload.consumed = epochTime();
+            }
+        });
     }
-    async destroy(id) {
-        this.tokenStorage.del(this.key(id));
+    destroy(id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.tokenStorage.del(this.key(id));
+        });
     }
-    async revokeByGrantId(grantId) {
-        const grant = this.grantIdStorage.get(grantId);
-        if (grant) {
-            grant.forEach((token) => this.tokenStorage.del(token));
-            this.grantIdStorage.del(grantId);
-        }
+    revokeByGrantId(grantId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const grant = this.grantIdStorage.get(grantId);
+            if (grant) {
+                grant.forEach((token) => this.tokenStorage.del(token));
+                this.grantIdStorage.del(grantId);
+            }
+        });
     }
 }
-exports.InMemoryAdapter = InMemoryAdapter;

package/dist/modules/identity/oidc/index.d.ts

@@ -1,11 +1,11 @@
 /// <reference types="koa-router" />
 import Provider from 'oidc-provider';
-import { Logger } from 'winston';
-import { IdentityContext } from '../interfaces';
-import { OIDCConfig } from './interfaces';
-import { IdentitySrvGrpcClient } from "../grpc";
-export { OIDCConfig };
-export { createOIDCRouter, CreateOIDCRouterArgs } from './router';
+import { type Logger } from 'winston';
+import { type IdentityContext } from '../interfaces.js';
+import type { OIDCConfig } from './interfaces.js';
+import { type IdentitySrvGrpcClient } from '../grpc/index.js';
+export type { OIDCConfig };
+export { createOIDCRouter, type CreateOIDCRouterArgs } from './router.js';
 export interface CreateOIDCArgs {
     logger: Logger;
     identitySrvClient: IdentitySrvGrpcClient;

package/dist/modules/identity/oidc/index.js

@@ -1,20 +1,22 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createOIDC = exports.createOIDCRouter = void 0;
-const oidc_provider_1 = __importDefault(require("oidc-provider"));
-const router_1 = require("./router");
-const adapter_1 = require("./adapter");
-const user_1 = require("./user");
-const password_grant_1 = require("./password-grant");
-var router_2 = require("./router");
-Object.defineProperty(exports, "createOIDCRouter", { enumerable: true, get: function () { return router_2.createOIDCRouter; } });
-function createOIDC({ identitySrvClient, env, logger, config: { loginFn, post_logout_redirect_uris, localTokenServiceFactory, remoteTokenService, cookies, redirect_uris, client_id, client_secret, issuer, jwks, templates } }) {
+import Provider from 'oidc-provider';
+import { createOIDCRouter } from './router.js';
+import { createIdentityServiceAdapterClass } from './adapter.js';
+import { findUserById, loginUserBody, loginUserCredentials } from './user.js';
+import { registerPasswordGrantType } from './password-grant.js';
+export { createOIDCRouter } from './router.js';
+export function createOIDC({ identitySrvClient, env, logger, config: { loginFn, post_logout_redirect_uris, localTokenServiceFactory, remoteTokenService, cookies, redirect_uris, client_id, client_secret, issuer, jwks, templates } }) {
     var _a, _b;
-    const adapterClass = (0, adapter_1.createIdentityServiceAdapterClass)(remoteTokenService !== null && remoteTokenService !== void 0 ? remoteTokenService : identitySrvClient.token, logger, localTokenServiceFactory);
-    const provider = new oidc_provider_1.default(issuer, {
+    const adapterClass = createIdentityServiceAdapterClass(remoteTokenService !== null && remoteTokenService !== void 0 ? remoteTokenService : identitySrvClient.token, logger, localTokenServiceFactory);
+    const provider = new Provider(issuer, {
         adapter: adapterClass,
         clients: [{
                 post_logout_redirect_uris,
@@ -45,15 +47,15 @@ function createOIDC({ identitySrvClient, env, logger, config: { loginFn, post_lo
         // oidc-provider only looks up the accounts by their ID when it has to read the claims,
         // passing it our Account model method is sufficient, it should return a Promise that resolves
         // with an object with accountId property and a claims method.
-        findAccount: async (ctx, id) => {
-            var _a;
+        findAccount: (ctx, id) => __awaiter(this, void 0, void 0, function* () {
+            var _c;
             try {
-                const userService = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.identitySrvClient) === null || _a === void 0 ? void 0 : _a.user;
+                const userService = (_c = ctx === null || ctx === void 0 ? void 0 : ctx.identitySrvClient) === null || _c === void 0 ? void 0 : _c.user;
                 return {
                     accountId: id,
-                    claims: async (use, scope) => {
+                    claims: (use, scope) => __awaiter(this, void 0, void 0, function* () {
                         try {
-                            const user = await (0, user_1.findUserById)(userService, id);
+                            const user = yield findUserById(userService, id);
                             return {
                                 sub: id,
                                 data: user
@@ -68,13 +70,13 @@ function createOIDC({ identitySrvClient, env, logger, config: { loginFn, post_lo
                                 }
                             };
                         }
-                    },
+                    }),
                 };
             }
             catch (error) {
                 logger.error('OIDC findAccount error', error);
             }
-        },
+        }),
         claims: {
             acr: null,
             sid: null,
@@ -96,9 +98,7 @@ function createOIDC({ identitySrvClient, env, logger, config: { loginFn, post_lo
         // don't run into weird issues with multiple interactions open
         // at a time.
         interactions: {
-            url(ctx) {
-                return `/interaction/${ctx.oidc.uid}`;
-            },
+            url: (ctx) => `/interaction/${ctx.oidc.uid}`,
         },
         features: {
             introspection: {
@@ -115,16 +115,16 @@ function createOIDC({ identitySrvClient, env, logger, config: { loginFn, post_lo
     });
     // Disabled due to playground being disabled
     // provider.use(helmet());
-    const router = (0, router_1.createOIDCRouter)({
-        loginFn: loginFn !== null && loginFn !== void 0 ? loginFn : user_1.loginUserBody,
+    const router = createOIDCRouter({
+        loginFn: loginFn !== null && loginFn !== void 0 ? loginFn : loginUserBody,
         templates,
         logger,
         provider,
         env,
     });
-    (0, password_grant_1.registerPasswordGrantType)({
+    registerPasswordGrantType({
         authLogService: identitySrvClient.authentication_log,
-        authenticate: user_1.loginUserCredentials,
+        authenticate: loginUserCredentials,
         provider
     });
     // Disable forbidding redirect to http/localhost in dev mode
@@ -145,4 +145,3 @@ function createOIDC({ identitySrvClient, env, logger, config: { loginFn, post_lo
         router
     };
 }
-exports.createOIDC = createOIDC;

package/dist/modules/identity/oidc/interfaces.d.ts

@@ -1,9 +1,9 @@
-import { Adapter, errors } from 'oidc-provider';
-import Provider from 'oidc-provider';
-import { IdentityContext } from '../interfaces';
-import { AuthenticationLogServiceClient as authLogService } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/authentication_log';
-import { TokenServiceClient as tokenService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/token";
-import { User } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/user";
+import { type Adapter, errors } from 'oidc-provider';
+import type Provider from 'oidc-provider';
+import { type IdentityContext } from '../interfaces.js';
+import { type AuthenticationLogServiceClient as authLogService } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/authentication_log.js';
+import { type TokenServiceClient as tokenService } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/token.js';
+import { type User } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/user.js';
 export interface OIDCHbsTemplates {
     login?: string;
     layout?: string;

package/dist/modules/identity/oidc/interfaces.js

@@ -1,11 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.InvalidPasswordGrant = void 0;
-const oidc_provider_1 = require("oidc-provider");
-class InvalidPasswordGrant extends oidc_provider_1.errors.InvalidGrant {
+import { errors } from 'oidc-provider';
+export class InvalidPasswordGrant extends errors.InvalidGrant {
     constructor(detail) {
         super('invalid_password_grant');
         Object.assign(this, { error_description: detail, error_detail: detail });
     }
 }
-exports.InvalidPasswordGrant = InvalidPasswordGrant;

package/dist/modules/identity/oidc/password-grant.d.ts

@@ -1,2 +1,2 @@
-import { OIDCPasswordGrantTypeConfig } from './interfaces';
+import { type OIDCPasswordGrantTypeConfig } from './interfaces.js';
 export declare const registerPasswordGrantType: (config: OIDCPasswordGrantTypeConfig) => void;

package/dist/modules/identity/oidc/password-grant.js

@@ -1,59 +1,42 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerPasswordGrantType = void 0;
-const interfaces_1 = require("./interfaces");
-const utils_1 = require("./utils");
-const useragent = __importStar(require("useragent"));
-const uuid = __importStar(require("uuid"));
-const requestIp = __importStar(require("request-ip"));
-const authentication_log_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/authentication_log");
-const auth_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/auth");
-const registerPasswordGrantType = (config) => {
-    const performPasswordGrant = async (ctx, clientId, identifier, password, key) => {
+import { InvalidPasswordGrant } from './interfaces.js';
+import { nanoid, epochTime } from './utils.js';
+import * as useragent from 'useragent';
+import * as uuid from 'uuid';
+import * as requestIp from 'request-ip';
+import { AuthenticationLog, AuthenticationLogList } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/authentication_log.js';
+import { Subject } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/auth.js';
+export const registerPasswordGrantType = (config) => {
+    const performPasswordGrant = (ctx, clientId, identifier, password, key) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b;
-        const client = await ctx.oidc.provider.Client.find(clientId);
+        const client = yield ctx.oidc.provider.Client.find(clientId);
         let account;
         try {
             let user = {
                 identifier,
                 [key]: password
             };
-            account = await config.authenticate(ctx, user);
+            account = yield config.authenticate(ctx, user);
         }
         catch (err) {
             if (err.details && err.details.includes(':')) {
                 err.details = err.details.split(':')[1].trim();
             }
-            throw new interfaces_1.InvalidPasswordGrant(err.details);
+            throw new InvalidPasswordGrant(err.details);
         }
         if (!account || !account.user) {
             if (account.error && account.error.message) {
-                throw new interfaces_1.InvalidPasswordGrant('invalid credentials provided: ' + account.error.message);
+                throw new InvalidPasswordGrant('invalid credentials provided: ' + account.error.message);
             }
-            throw new interfaces_1.InvalidPasswordGrant('invalid credentials provided');
+            throw new InvalidPasswordGrant('invalid credentials provided');
         }
         let expiresIn = config.tokenExpiration;
         if (!expiresIn) {
@@ -80,44 +63,39 @@ const registerPasswordGrantType = (config) => {
             expiresIn
         });
         ctx.oidc.entity('AccessToken', at);
-        const accessToken = await at.save();
+        const accessToken = yield at.save();
         let last_access;
         if ((_a = claims === null || claims === void 0 ? void 0 : claims.data) === null || _a === void 0 ? void 0 : _a.lastAccess) {
             last_access = claims.data.lastAccess;
         }
         if ((_b = claims === null || claims === void 0 ? void 0 : claims.data) === null || _b === void 0 ? void 0 : _b.tokens) {
-            claims.data = {
-                ...claims.data,
-                tokens: []
-            };
+            claims.data = Object.assign(Object.assign({}, claims.data), { tokens: [] });
         }
-        const generateIdToken = async (ctx, clientId, expiresIn, claims) => {
-            const client = await ctx.oidc.provider.Client.find(clientId);
+        const generateIdToken = (ctx, clientId, expiresIn, claims) => __awaiter(void 0, void 0, void 0, function* () {
+            const client = yield ctx.oidc.provider.Client.find(clientId);
             ctx.oidc.entity('Client', client);
             const { IdToken } = ctx.oidc.provider;
-            const jti = (0, utils_1.nanoid)();
-            const exp = (0, utils_1.epochTime)() + expiresIn;
-            const token = new IdToken({
-                ...claims,
-            }, { ctx });
+            const jti = nanoid();
+            const exp = epochTime() + expiresIn;
+            const token = new IdToken(Object.assign({}, claims), { ctx });
             token.set('jti', jti);
             token.scope = 'openid profile';
-            return await token.issue({ expiresAt: exp });
-        };
-        const idToken = await generateIdToken(ctx, clientId, expiresIn, claims);
+            return yield token.issue({ expiresAt: exp });
+        });
+        const idToken = yield generateIdToken(ctx, clientId, expiresIn, claims);
         return {
             access_token: accessToken,
             id_token: idToken,
-            expires_in: (0, utils_1.epochTime)() + at.expiration,
-            last_login: (0, utils_1.epochTime)(),
+            expires_in: epochTime() + at.expiration,
+            last_login: epochTime(),
             token_type: at.tokenType,
             scope: 'openid',
             token_name: tokenName,
             default_scope: defaultScope,
             last_access
         };
-    };
-    config.provider.registerGrantType('password', async (ctx, next) => {
+    });
+    config.provider.registerGrantType('password', (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         try {
             const { body, client } = ctx.oidc;
             ctx.type = 'json';
@@ -137,7 +115,7 @@ const registerPasswordGrantType = (config) => {
                 os = agent.os.toString();
                 agentName = agent.toAgent();
             }
-            ctx.body = await performPasswordGrant(ctx, client.clientId, body.identifier, passwordValue, key);
+            ctx.body = yield performPasswordGrant(ctx, client.clientId, body.identifier, passwordValue, key);
             const token_name = ctx.body.token_name;
             const token = ctx.body.access_token;
             const scope = ctx.body.default_scope;
@@ -149,7 +127,7 @@ const registerPasswordGrantType = (config) => {
             else if (clientIP && clientIP.includes(':')) {
                 ipv6_address = clientIP;
             }
-            const authLogItem = authentication_log_1.AuthenticationLog.fromPartial({
+            const authLogItem = AuthenticationLog.fromPartial({
                 ipv4Address: ipv4_address,
                 ipv6Address: ipv6_address,
                 operatingSystem: os,
@@ -158,13 +136,13 @@ const registerPasswordGrantType = (config) => {
                 activity: 'login',
                 tokenName: token_name
             });
-            await config.authLogService.create(authentication_log_1.AuthenticationLogList.fromPartial({
+            yield config.authLogService.create(AuthenticationLogList.fromPartial({
                 items: [authLogItem],
-                subject: auth_1.Subject.fromPartial({ token, scope })
+                subject: Subject.fromPartial({ token, scope })
             }));
         }
         catch (ex) {
-            if (ex instanceof interfaces_1.InvalidPasswordGrant) {
+            if (ex instanceof InvalidPasswordGrant) {
                 ctx.status = 401;
                 ctx.type = 'json';
                 ctx.body = {
@@ -180,7 +158,6 @@ const registerPasswordGrantType = (config) => {
                 };
             }
         }
-        await next();
-    }, ['identifier', 'password'], []);
+        yield next();
+    }), ['identifier', 'password'], []);
 };
-exports.registerPasswordGrantType = registerPasswordGrantType;

package/dist/modules/identity/oidc/router.d.ts

@@ -1,8 +1,8 @@
-import KoaRouter from 'koa-router';
-import Provider from 'oidc-provider';
-import { Logger } from 'winston';
-import { IdentityContext } from '../interfaces';
-import { OIDCHbsTemplates, OIDCBodyLoginFn } from './interfaces';
+import type KoaRouter from 'koa-router';
+import type Provider from 'oidc-provider';
+import { type Logger } from 'winston';
+import { type IdentityContext } from '../interfaces.js';
+import { type OIDCHbsTemplates, type OIDCBodyLoginFn } from './interfaces.js';
 export interface CreateOIDCRouterArgs {
     logger: Logger;
     provider: Provider;
@@ -10,4 +10,4 @@ export interface CreateOIDCRouterArgs {
     templates?: OIDCHbsTemplates;
     loginFn: OIDCBodyLoginFn;
 }
-export declare function createOIDCRouter({ logger, loginFn, provider, env, templates }: CreateOIDCRouterArgs): KoaRouter<{}, IdentityContext>;
+export declare const createOIDCRouter: ({ logger, loginFn, provider, env, templates }: CreateOIDCRouterArgs) => KoaRouter<{}, IdentityContext>;

package/dist/modules/identity/oidc/router.js

@@ -1,20 +1,26 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createOIDCRouter = void 0;
-const templates_1 = require("./templates");
-const koa_body_1 = require("koa-body");
-const Router = eval('require("koa-router")');
-function createOIDCRouter({ logger, loginFn, provider, env, templates }) {
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { OIDCTemplateEngine } from './templates.js';
+import { koaBody } from 'koa-body';
+import Router from 'koa-router';
+export const createOIDCRouter = ({ logger, loginFn, provider, env, templates }) => {
     const dev = env === 'development';
-    const tplEngine = new templates_1.OIDCTemplateEngine(templates);
+    const tplEngine = new OIDCTemplateEngine(templates);
     const router = new Router();
-    router.get('/interaction/:uid', async (ctx, next) => {
-        const { uid, prompt, params, session, } = await provider.interactionDetails(ctx.req, ctx.res);
-        const client = await provider.Client.find(params.client_id);
+    router.get('/interaction/:uid', (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
+        const { uid, prompt, params, session, } = yield provider.interactionDetails(ctx.req, ctx.res);
+        const client = yield provider.Client.find(params.client_id);
         switch (prompt.name) {
             case 'login': {
                 ctx.type = 'html';
-                ctx.body = await tplEngine.login({
+                ctx.body = yield tplEngine.login({
                     title: 'Login',
                     dev,
                     uid,
@@ -28,7 +34,7 @@ function createOIDCRouter({ logger, loginFn, provider, env, templates }) {
             }
             case 'consent': {
                 console.log('consent', prompt.details);
-                const { prompt: { name, details } } = await provider.interactionDetails(ctx.req, ctx.res);
+                const { prompt: { name, details } } = yield provider.interactionDetails(ctx.req, ctx.res);
                 const consent = {};
                 consent.rejectedScopes = [];
                 // replace = false means previously rejected scopes and claims remain rejected
@@ -55,7 +61,7 @@ function createOIDCRouter({ logger, loginFn, provider, env, templates }) {
             default:
                 return next();
         }
-    });
+    }));
     // router.post('/interaction/:uid/confirm', bodyParser({
     //   text: false, json: false
     // }), async (ctx) => {
@@ -70,16 +76,16 @@ function createOIDCRouter({ logger, loginFn, provider, env, templates }) {
     //     mergeWithLastSubmission: true,
     //   });
     // });
-    router.post('/interaction/:uid/login', (0, koa_body_1.koaBody)({
+    router.post('/interaction/:uid/login', koaBody({
         text: false, json: false
-    }), async (ctx) => {
-        const { prompt, uid, params, session } = await provider.interactionDetails(ctx.req, ctx.res);
+    }), (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+        const { prompt, uid, params, session } = yield provider.interactionDetails(ctx.req, ctx.res);
         if (prompt.name !== 'login') {
             throw new Error('INVALID_PROMPT');
         }
-        const render = async ({ error, identifier, remember } = {}) => {
+        const render = ({ error, identifier, remember } = {}) => __awaiter(void 0, void 0, void 0, function* () {
             ctx.response.type = 'html';
-            ctx.response.body = await tplEngine.login({
+            ctx.response.body = yield tplEngine.login({
                 title: 'Login',
                 uid,
                 identifier,
@@ -96,13 +102,13 @@ function createOIDCRouter({ logger, loginFn, provider, env, templates }) {
                 }
             });
             return;
-        };
+        });
         const body = typeof ctx.request.body === 'object' && ctx.request.body ? ctx.request.body : undefined;
         if (!body) {
             logger.error('OIDC login invalid body', body);
             return render();
         }
-        const { error, user, identifier, remember } = await loginFn(ctx, body);
+        const { error, user, identifier, remember } = yield loginFn(ctx, body);
         if (error || !user) {
             logger.error('OIDC login callback error', error);
             return render({
@@ -132,8 +138,8 @@ function createOIDCRouter({ logger, loginFn, provider, env, templates }) {
         return provider.interactionFinished(ctx.req, ctx.res, result, {
             mergeWithLastSubmission: false,
         });
-    });
-    router.get('/interaction/:uid/abort', async (ctx) => {
+    }));
+    router.get('/interaction/:uid/abort', (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         const result = {
             error: 'access_denied',
             error_description: 'End-User aborted interaction',
@@ -141,7 +147,7 @@ function createOIDCRouter({ logger, loginFn, provider, env, templates }) {
         return provider.interactionFinished(ctx.req, ctx.res, result, {
             mergeWithLastSubmission: false,
         });
-    });
+    }));
     // router.get('/session', async (ctx) => {
     //   const _ctx = provider.app.createContext(ctx.req, ctx.res);
     //   // const session = await provider.Session.get(_ctx)
@@ -154,6 +160,5 @@ function createOIDCRouter({ logger, loginFn, provider, env, templates }) {
     //   };
     // });
     return router;
-}
-exports.createOIDCRouter = createOIDCRouter;
+};
 ;