@restorecommerce/facade 0.1.44 → 0.2.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.2.0](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.1.44...@restorecommerce/facade@0.2.0) (2022-02-09)
+
+
+### Features
+
+* add oauth ([3e7798e](https://github.com/restorecommerce/libs/commit/3e7798e3aa10ef092872928f5254cd5fbb125f3b))
+
+
+
+
+
 ## [0.1.44](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.1.43...@restorecommerce/facade@0.1.44) (2022-02-02)
 
 

package/debug-run.ts

@@ -51,6 +51,7 @@ function createTestFacade() {
         ],
         jwks,
       },
+      oauth: true,
       apiKey: 'api_key'
     }))
     .useModule(resourceModule({config: serviceConfig.get('resource')}))

package/dist/gql/protos/graphql.js

@@ -194,13 +194,20 @@ const getGQLResolverFunctions = (service, key, serviceKey, grpcClientConfig) =>
                     });
                     return { details: aggregatedResponse, operationStatus };
                 }
-                let items = utils_1.decodeBufferFields(result.items, bufferFields);
-                return {
-                    details: {
-                        items: items,
-                        operationStatus: result.operationStatus // overall status
-                    },
-                };
+                if ('items' in result) {
+                    let items = utils_1.decodeBufferFields(result.items, bufferFields);
+                    return {
+                        details: {
+                            items: items,
+                            operationStatus: result.operationStatus // overall status
+                        },
+                    };
+                }
+                else {
+                    return {
+                        details: utils_1.decodeBufferFields([result], bufferFields)[0]
+                    };
+                }
             }
             catch (error) {
                 console.error(error);

package/dist/modules/identity/gql/types.js

@@ -5,9 +5,10 @@ const user_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/resto
 const role_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/role");
 const authentication_log_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/authentication_log");
 const token_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/token");
+const oauth_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/oauth");
 const protos_1 = require("../../../gql/protos");
 function registerTypings() {
-    protos_1.registerPackagesRecursive(user_1.protoMetadata, role_1.protoMetadata, authentication_log_1.protoMetadata, token_1.protoMetadata);
+    protos_1.registerPackagesRecursive(user_1.protoMetadata, role_1.protoMetadata, authentication_log_1.protoMetadata, token_1.protoMetadata, oauth_1.protoMetadata);
 }
 exports.registerTypings = registerTypings;
 exports.subServices = [

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

@@ -3,6 +3,7 @@ import { Service as userService } from "@restorecommerce/rc-grpc-clients/dist/ge
 import { Service as roleService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/role";
 import { Service as authentication_logService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/authentication_log";
 import { Service as tokenService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/token";
+import { Service as oauthService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/oauth";
 import { GrpcClientConfig } from "@restorecommerce/grpc-client";
 import { Logger } from "winston";
 export declare class IdentitySrvGrpcClient extends RestoreCommerceGrpcClient {
@@ -11,4 +12,5 @@ export declare class IdentitySrvGrpcClient extends RestoreCommerceGrpcClient {
     role: roleService;
     authentication_log: authentication_logService;
     token: tokenService;
+    oauth: oauthService;
 }

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

@@ -6,6 +6,7 @@ const user_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/resto
 const role_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/role");
 const authentication_log_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/authentication_log");
 const token_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/token");
+const oauth_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/oauth");
 const protos_1 = require("../../../gql/protos");
 class IdentitySrvGrpcClient extends rc_grpc_clients_1.RestoreCommerceGrpcClient {
     constructor(cfg, logger) {
@@ -14,6 +15,7 @@ class IdentitySrvGrpcClient extends rc_grpc_clients_1.RestoreCommerceGrpcClient
         this.role = protos_1.getGRPCService(this, role_1.protobufPackage, role_1.protoMetadata.fileDescriptor.service[0]);
         this.authentication_log = protos_1.getGRPCService(this, authentication_log_1.protobufPackage, authentication_log_1.protoMetadata.fileDescriptor.service[0]);
         this.token = protos_1.getGRPCService(this, token_1.protobufPackage, token_1.protoMetadata.fileDescriptor.service[0]);
+        this.oauth = protos_1.getGRPCService(this, oauth_1.protobufPackage, oauth_1.protoMetadata.fileDescriptor.service[0]);
     }
 }
 exports.IdentitySrvGrpcClient = IdentitySrvGrpcClient;

package/dist/modules/identity/index.js

@@ -7,6 +7,7 @@ const federation_1 = require("./gql/federation");
 const oidc_1 = require("./oidc");
 const api_key_1 = require("./api-key/api-key");
 const grpc_1 = require("./grpc");
+const oauth_1 = require("./oauth/oauth");
 exports.identityModule = utils_1.createFacadeModuleFactory('identity', (facade, config) => {
     const identitySrvClient = new grpc_1.IdentitySrvGrpcClient(config.identitySrvClientConfig, facade.logger);
     if (!!config.apiKey) {
@@ -29,6 +30,9 @@ exports.identityModule = utils_1.createFacadeModuleFactory('identity', (facade,
         facade.koa.use(router.routes());
         facade.koa.use(koa_mount_1.default(provider.app));
     }
+    if (config.oauth) {
+        facade.koa.use(oauth_1.createOAuth().routes());
+    }
     const identity = {
         client: identitySrvClient
     };

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

@@ -11,6 +11,7 @@ export interface IdentityConfig {
     identitySrvClientConfig: GrpcClientConfig;
     oidc?: OIDCConfig;
     apiKey?: boolean | string;
+    oauth?: boolean;
 }
 export interface IdentityContext extends FacadeContext {
     identity: {

package/dist/modules/identity/oauth/oauth.d.ts

@@ -0,0 +1,11 @@
+import Router from "koa-router";
+import { IdentityContext } from "../interfaces";
+import { User } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/user";
+export declare const createOAuth: () => Router<{}, IdentityContext>;
+export declare const layout: (context: {
+    body: string;
+    title: string;
+}) => Promise<string>;
+export declare const register: (email: string) => Promise<string>;
+export declare const login: (links: any) => Promise<string>;
+export declare const account: (user: User) => Promise<string>;

package/dist/modules/identity/oauth/oauth.js

@@ -0,0 +1,137 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.account = exports.login = exports.register = exports.layout = exports.createOAuth = void 0;
+const koa_router_1 = require("koa-router");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const handlebars_1 = require("handlebars");
+const utils_1 = require("../oidc/utils");
+const uuid = require("uuid");
+const user_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/user");
+const koa_body_1 = require("koa-body");
+const createOAuth = () => {
+    const router = new koa_router_1.default();
+    router.use(koa_body_1.default({ multipart: true }));
+    router.get('/oauth2-login', async (ctx, next) => {
+        ctx.type = 'html';
+        ctx.body = await exports.login((await ctx.identitySrvClient.oauth.GenerateLinks({})).links);
+        return next();
+    });
+    router.get('/oauth2-urls', async (ctx, next) => {
+        ctx.body = (await ctx.identitySrvClient.oauth.GenerateLinks({})).links;
+        return next();
+    });
+    router.post('/oauth2-register', async (ctx, next) => {
+        const ids = ctx.identitySrvClient;
+        const body = ctx.request.body;
+        const user = await ids.user.Register(user_1.RegisterRequest.fromPartial({
+            email: body.email,
+            name: body.username,
+            firstName: body.first_name,
+            lastName: body.last_name,
+            password: body.password,
+            userType: user_1.UserType.INDIVIDUAL_USER,
+            guest: false,
+        }));
+        if (user.payload) {
+            ctx.type = 'html';
+            ctx.body = await exports.account(user.payload);
+            return next();
+        }
+        if (user.status) {
+            ctx.body = user.status.message;
+        }
+        return next();
+    });
+    router.get('/oauth2/:service', async (ctx, next) => {
+        const ids = ctx.identitySrvClient;
+        const user = await ids.oauth.ExchangeCode({
+            service: ctx.params.service,
+            code: ctx.request.query['code'],
+            state: ctx.request.query['state']
+        });
+        console.log(user);
+        if (!user.user || !user.user.payload || (user.user.status && user.user.status.code !== 200)) {
+            if (user.email) {
+                ctx.type = 'html';
+                ctx.body = await exports.register(user.email);
+                return next();
+            }
+            else {
+                ctx.body = 'Internal Error';
+                return next();
+            }
+        }
+        const token = utils_1.nanoid();
+        // 1 Month
+        const expiresIn = Date.now() + (1000 * 60 * 60 * 24 * 30);
+        await ids.token.upsert({
+            id: uuid.v4().replace(/-/g, ''),
+            type: 'access_token',
+            expiresIn: expiresIn,
+            payload: utils_1.marshallProtobufAny({
+                accountId: user.user.payload.id,
+                exp: expiresIn,
+                jti: token
+            })
+        });
+        ctx.type = 'html';
+        ctx.body = await exports.account(user.user.payload);
+        return next();
+    });
+    return router;
+};
+exports.createOAuth = createOAuth;
+let layoutHbs;
+const layout = async (context) => {
+    if (!layoutHbs) {
+        const layoutTpl = await new Promise((resolve, reject) => {
+            fs_1.default.readFile(path_1.default.resolve(__dirname, 'views/layout.hbs'), (err, data) => err ? reject(err) : resolve(data.toString()));
+        });
+        layoutHbs = handlebars_1.default.compile(layoutTpl);
+    }
+    return layoutHbs(context);
+};
+exports.layout = layout;
+let registerHbs;
+const register = async (email) => {
+    if (!registerHbs) {
+        const registerTpl = await new Promise((resolve, reject) => {
+            fs_1.default.readFile(path_1.default.resolve(__dirname, 'views/register.hbs'), (err, data) => err ? reject(err) : resolve(data.toString()));
+        });
+        registerHbs = handlebars_1.default.compile(registerTpl);
+    }
+    return exports.layout({
+        title: 'Register',
+        body: registerHbs({ email })
+    });
+};
+exports.register = register;
+let loginHbs;
+const login = async (links) => {
+    if (!loginHbs) {
+        const loginTpl = await new Promise((resolve, reject) => {
+            fs_1.default.readFile(path_1.default.resolve(__dirname, 'views/login.hbs'), (err, data) => err ? reject(err) : resolve(data.toString()));
+        });
+        loginHbs = handlebars_1.default.compile(loginTpl);
+    }
+    return exports.layout({
+        title: 'Login',
+        body: loginHbs({ links })
+    });
+};
+exports.login = login;
+let accountHbs;
+const account = async (user) => {
+    if (!accountHbs) {
+        const accountTpl = await new Promise((resolve, reject) => {
+            fs_1.default.readFile(path_1.default.resolve(__dirname, 'views/account.hbs'), (err, data) => err ? reject(err) : resolve(data.toString()));
+        });
+        accountHbs = handlebars_1.default.compile(accountTpl);
+    }
+    return exports.layout({
+        title: 'Account',
+        body: accountHbs({ user })
+    });
+};
+exports.account = account;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@restorecommerce/facade",
-  "version": "0.1.44",
+  "version": "0.2.0",
   "description": "Facade for Restorecommerce microservices",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -24,13 +24,14 @@
     "@cloudnative/health": "^2.1.2",
     "@grpc/grpc-js": "^1.2.12",
     "@grpc/proto-loader": "^0.6.0",
-    "@restorecommerce/grpc-client": "^0.2.14",
-    "@restorecommerce/kafka-client": "^0.2.29",
-    "@restorecommerce/logger": "^0.11.3",
-    "@restorecommerce/rc-grpc-clients": "^0.3.0",
-    "@restorecommerce/service-config": "^0.4.23",
+    "@restorecommerce/grpc-client": "^0.3.0",
+    "@restorecommerce/kafka-client": "^0.3.0",
+    "@restorecommerce/logger": "^0.12.0",
+    "@restorecommerce/rc-grpc-clients": "^0.4.0",
+    "@restorecommerce/service-config": "^0.4.24",
     "apollo-server-koa": "^2.21.2",
     "debug": "^4.3.1",
+    "googleapis": "^92.0.0",
     "handlebars": "^4.7.7",
     "koa": "^2.13.1",
     "koa-body": "^4.2.0",
@@ -39,6 +40,8 @@
     "koa-router": "^10.0.0",
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",
+    "node-fetch": "^2.6.7",
+    "oauth": "^0.9.15",
     "oidc-provider": "^7.2.0",
     "querystring": "^0.2.1",
     "request-ip": "^2.1.3",
@@ -46,7 +49,7 @@
     "ts-proto-descriptors": "^1.2.0",
     "useragent": "^2.3.0",
     "uuid": "^8.3.2",
-    "winston": "^3.3.3"
+    "winston": "^3.4.0"
   },
   "devDependencies": {
     "@graphql-codegen/core": "^1.17.9",
@@ -63,6 +66,7 @@
     "@types/lodash": "^4.14.177",
     "@types/lru-cache": "^5.1.0",
     "@types/node": "^14.14.35",
+    "@types/oauth": "^0.9.1",
     "@types/oidc-provider": "^7.1.1",
     "@types/request-ip": "^0.0.35",
     "@types/supertest": "^2.0.10",
@@ -101,5 +105,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "dd8b26367482e61ada3120acf5e96b23569580f0"
+  "gitHead": "97966555c4e421699a8a7c054f41ccc4385f618f"
 }