@restorecommerce/facade 0.2.1 → 0.3.1

package/CHANGELOG.md

@@ -3,6 +3,46 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.3.1](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.3.0...@restorecommerce/facade@0.3.1) (2022-02-23)
+
+
+### Bug Fixes
+
+* **facade:** use token that was received from ids ([2508cfb](https://github.com/restorecommerce/libs/commit/2508cfb28c099000dad4c037a0eeb1883f152f05))
+
+
+
+
+
+# [0.3.0](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.2.2...@restorecommerce/facade@0.3.0) (2022-02-22)
+
+
+### Bug Fixes
+
+* **facade:** do not internal error ([a98594d](https://github.com/restorecommerce/libs/commit/a98594d2a478965eb3b22fff530b86c290afbbb2))
+* **facade:** use jwt token ([666a08f](https://github.com/restorecommerce/libs/commit/666a08f9b7727cda26a499c3ebaa5335ed38a27a))
+* **protos:** add token to code exchange ([9c17cb6](https://github.com/restorecommerce/libs/commit/9c17cb6e3a16761a85a4b9379c3c6996cc5422e8))
+
+
+### Features
+
+* **facade:** support maps ([2c466fe](https://github.com/restorecommerce/libs/commit/2c466fe1e0ef883ab4b7eb19f637ef13f1f88e96))
+
+
+
+
+
+## [0.2.2](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.2.1...@restorecommerce/facade@0.2.2) (2022-02-15)
+
+
+### Bug Fixes
+
+* store facade token in cookies ([5fe1b53](https://github.com/restorecommerce/libs/commit/5fe1b538955993f6d20626968699867f0120589c))
+
+
+
+
+
 ## [0.2.1](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.2.0...@restorecommerce/facade@0.2.1) (2022-02-14)
 
 

package/debug-run.ts

@@ -15,7 +15,7 @@ import {
   ostorageModule,
   paymentModule,
   schedulingModule
-} from './dist';
+} from './src';
 import { join } from 'path';
 
 const CONFIG_PATH = __dirname;

package/dist/gql/protos/registry.js

@@ -223,6 +223,7 @@ const getTyping = (type) => {
 };
 exports.getTyping = getTyping;
 const resolveMeta = (key, field, rootObjType, objName, input) => {
+    var _a;
     let result;
     switch (field.type) {
         case descriptor_1.FieldDescriptorProto_Type.TYPE_BOOL:
@@ -237,14 +238,23 @@ const resolveMeta = (key, field, rootObjType, objName, input) => {
             if (!exports.registeredTypings.has(objType)) {
                 throw new Error("Typing '" + objType + "' not registered for key '" + key + "' in object: " + objName);
             }
+            let typingData = exports.registeredTypings.get(objType);
+            let mapEntry = false;
+            if (typingData.meta.options) {
+                mapEntry = !!((_a = typingData.meta.options) === null || _a === void 0 ? void 0 : _a.mapEntry);
+            }
+            // TODO Actually unroll maps into entries
+            if (mapEntry) {
+                return MapScalar;
+            }
             if (!input) {
-                result = exports.registeredTypings.get(objType).output;
+                result = typingData.output;
                 break;
             }
             if (objType === types_1.authSubjectType) {
                 return null;
             }
-            result = exports.registeredTypings.get(objType).input;
+            result = typingData.input;
             break;
         case descriptor_1.FieldDescriptorProto_Type.TYPE_BYTES:
             if (input) {

package/dist/modules/identity/gql/schema.generated.d.ts

@@ -26,6 +26,7 @@ export declare type Scalars = {
     Float: number;
     TodoScalar: any;
     Upload: any;
+    MapScalar: any;
 };
 export declare type Query = {
     __typename?: 'Query';
@@ -37,6 +38,7 @@ export declare type IdentityQuery = {
     role: IdentityRoleQuery;
     authentication_log: IdentityAuthenticationLogQuery;
     token: IdentityTokenQuery;
+    oauth: IdentityOauthQuery;
 };
 export declare type IdentityUserQuery = {
     __typename?: 'IdentityUserQuery';
@@ -364,6 +366,27 @@ export declare type IIoRestorecommerceTokenIdentifier = {
     id?: Maybe<Scalars['String']>;
     type?: Maybe<Scalars['String']>;
 };
+export declare type IdentityOauthQuery = {
+    __typename?: 'IdentityOauthQuery';
+    AvailableServices?: Maybe<ProtoIoRestorecommerceOauthServicesResponse>;
+    GenerateLinks?: Maybe<ProtoIoRestorecommerceOauthGenerateLinksResponse>;
+};
+export declare type ProtoIoRestorecommerceOauthServicesResponse = {
+    __typename?: 'ProtoIoRestorecommerceOauthServicesResponse';
+    details?: Maybe<IoRestorecommerceOauthServicesResponse>;
+};
+export declare type IoRestorecommerceOauthServicesResponse = {
+    __typename?: 'IoRestorecommerceOauthServicesResponse';
+    services?: Maybe<Array<Scalars['String']>>;
+};
+export declare type ProtoIoRestorecommerceOauthGenerateLinksResponse = {
+    __typename?: 'ProtoIoRestorecommerceOauthGenerateLinksResponse';
+    details?: Maybe<IoRestorecommerceOauthGenerateLinksResponse>;
+};
+export declare type IoRestorecommerceOauthGenerateLinksResponse = {
+    __typename?: 'IoRestorecommerceOauthGenerateLinksResponse';
+    links?: Maybe<Scalars['MapScalar']>;
+};
 export declare type Mutation = {
     __typename?: 'Mutation';
     identity: IdentityMutation;
@@ -374,6 +397,7 @@ export declare type IdentityMutation = {
     role: IdentityRoleMutation;
     authentication_log: IdentityAuthenticationLogMutation;
     token: IdentityTokenMutation;
+    oauth: IdentityOauthMutation;
 };
 export declare type IdentityUserMutation = {
     __typename?: 'IdentityUserMutation';
@@ -683,6 +707,28 @@ export declare type IIoRestorecommerceTokenTokenData = {
 export declare type IIoRestorecommerceTokenGrantId = {
     grantId?: Maybe<Scalars['String']>;
 };
+export declare type IdentityOauthMutation = {
+    __typename?: 'IdentityOauthMutation';
+    ExchangeCode?: Maybe<ProtoIoRestorecommerceOauthExchangeCodeResponse>;
+};
+export declare type IdentityOauthMutationExchangeCodeArgs = {
+    input: IIoRestorecommerceOauthExchangeCodeRequest;
+};
+export declare type ProtoIoRestorecommerceOauthExchangeCodeResponse = {
+    __typename?: 'ProtoIoRestorecommerceOauthExchangeCodeResponse';
+    details?: Maybe<IoRestorecommerceOauthExchangeCodeResponse>;
+};
+export declare type IoRestorecommerceOauthExchangeCodeResponse = {
+    __typename?: 'IoRestorecommerceOauthExchangeCodeResponse';
+    user?: Maybe<IoRestorecommerceUserUserResponse>;
+    email?: Maybe<Scalars['String']>;
+    token?: Maybe<IoRestorecommerceAuthTokens>;
+};
+export declare type IIoRestorecommerceOauthExchangeCodeRequest = {
+    service?: Maybe<Scalars['String']>;
+    code?: Maybe<Scalars['String']>;
+    state?: Maybe<Scalars['String']>;
+};
 export declare type WithIndex<TObject> = TObject & Record<string, any>;
 export declare type ResolversObject<TObject> = WithIndex<TObject>;
 export declare type ResolverTypeWrapper<T> = Promise<T> | T;
@@ -766,6 +812,12 @@ export declare type ResolversTypes = ResolversObject<{
     IdentityTokenQuery: ResolverTypeWrapper<IdentityTokenQuery>;
     ProtoGoogleProtobufAny: ResolverTypeWrapper<ProtoGoogleProtobufAny>;
     IIoRestorecommerceTokenIdentifier: IIoRestorecommerceTokenIdentifier;
+    IdentityOauthQuery: ResolverTypeWrapper<IdentityOauthQuery>;
+    ProtoIoRestorecommerceOauthServicesResponse: ResolverTypeWrapper<ProtoIoRestorecommerceOauthServicesResponse>;
+    IoRestorecommerceOauthServicesResponse: ResolverTypeWrapper<IoRestorecommerceOauthServicesResponse>;
+    ProtoIoRestorecommerceOauthGenerateLinksResponse: ResolverTypeWrapper<ProtoIoRestorecommerceOauthGenerateLinksResponse>;
+    IoRestorecommerceOauthGenerateLinksResponse: ResolverTypeWrapper<IoRestorecommerceOauthGenerateLinksResponse>;
+    MapScalar: ResolverTypeWrapper<Scalars['MapScalar']>;
     Mutation: ResolverTypeWrapper<{}>;
     IdentityMutation: ResolverTypeWrapper<IdentityMutation>;
     IdentityUserMutation: ResolverTypeWrapper<IdentityUserMutation>;
@@ -806,6 +858,10 @@ export declare type ResolversTypes = ResolversObject<{
     IdentityTokenMutation: ResolverTypeWrapper<IdentityTokenMutation>;
     IIoRestorecommerceTokenTokenData: IIoRestorecommerceTokenTokenData;
     IIoRestorecommerceTokenGrantId: IIoRestorecommerceTokenGrantId;
+    IdentityOauthMutation: ResolverTypeWrapper<IdentityOauthMutation>;
+    ProtoIoRestorecommerceOauthExchangeCodeResponse: ResolverTypeWrapper<ProtoIoRestorecommerceOauthExchangeCodeResponse>;
+    IoRestorecommerceOauthExchangeCodeResponse: ResolverTypeWrapper<IoRestorecommerceOauthExchangeCodeResponse>;
+    IIoRestorecommerceOauthExchangeCodeRequest: IIoRestorecommerceOauthExchangeCodeRequest;
 }>;
 /** Mapping between all available schema types and the resolvers parents */
 export declare type ResolversParentTypes = ResolversObject<{
@@ -857,6 +913,12 @@ export declare type ResolversParentTypes = ResolversObject<{
     IdentityTokenQuery: IdentityTokenQuery;
     ProtoGoogleProtobufAny: ProtoGoogleProtobufAny;
     IIoRestorecommerceTokenIdentifier: IIoRestorecommerceTokenIdentifier;
+    IdentityOauthQuery: IdentityOauthQuery;
+    ProtoIoRestorecommerceOauthServicesResponse: ProtoIoRestorecommerceOauthServicesResponse;
+    IoRestorecommerceOauthServicesResponse: IoRestorecommerceOauthServicesResponse;
+    ProtoIoRestorecommerceOauthGenerateLinksResponse: ProtoIoRestorecommerceOauthGenerateLinksResponse;
+    IoRestorecommerceOauthGenerateLinksResponse: IoRestorecommerceOauthGenerateLinksResponse;
+    MapScalar: Scalars['MapScalar'];
     Mutation: {};
     IdentityMutation: IdentityMutation;
     IdentityUserMutation: IdentityUserMutation;
@@ -896,6 +958,10 @@ export declare type ResolversParentTypes = ResolversObject<{
     IdentityTokenMutation: IdentityTokenMutation;
     IIoRestorecommerceTokenTokenData: IIoRestorecommerceTokenTokenData;
     IIoRestorecommerceTokenGrantId: IIoRestorecommerceTokenGrantId;
+    IdentityOauthMutation: IdentityOauthMutation;
+    ProtoIoRestorecommerceOauthExchangeCodeResponse: ProtoIoRestorecommerceOauthExchangeCodeResponse;
+    IoRestorecommerceOauthExchangeCodeResponse: IoRestorecommerceOauthExchangeCodeResponse;
+    IIoRestorecommerceOauthExchangeCodeRequest: IIoRestorecommerceOauthExchangeCodeRequest;
 }>;
 export declare type QueryResolvers<ContextType = IdentityContext, ParentType extends ResolversParentTypes['Query'] = ResolversParentTypes['Query']> = ResolversObject<{
     identity?: Resolver<ResolversTypes['IdentityQuery'], ParentType, ContextType>;
@@ -905,6 +971,7 @@ export declare type IdentityQueryResolvers<ContextType = IdentityContext, Parent
     role?: Resolver<ResolversTypes['IdentityRoleQuery'], ParentType, ContextType>;
     authentication_log?: Resolver<ResolversTypes['IdentityAuthenticationLogQuery'], ParentType, ContextType>;
     token?: Resolver<ResolversTypes['IdentityTokenQuery'], ParentType, ContextType>;
+    oauth?: Resolver<ResolversTypes['IdentityOauthQuery'], ParentType, ContextType>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
 export declare type IdentityUserQueryResolvers<ContextType = IdentityContext, ParentType extends ResolversParentTypes['IdentityUserQuery'] = ResolversParentTypes['IdentityUserQuery']> = ResolversObject<{
@@ -1152,6 +1219,30 @@ export declare type ProtoGoogleProtobufAnyResolvers<ContextType = IdentityContex
     details?: Resolver<Maybe<ResolversTypes['GoogleProtobufAny']>, ParentType, ContextType>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
+export declare type IdentityOauthQueryResolvers<ContextType = IdentityContext, ParentType extends ResolversParentTypes['IdentityOauthQuery'] = ResolversParentTypes['IdentityOauthQuery']> = ResolversObject<{
+    AvailableServices?: Resolver<Maybe<ResolversTypes['ProtoIoRestorecommerceOauthServicesResponse']>, ParentType, ContextType>;
+    GenerateLinks?: Resolver<Maybe<ResolversTypes['ProtoIoRestorecommerceOauthGenerateLinksResponse']>, ParentType, ContextType>;
+    __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+}>;
+export declare type ProtoIoRestorecommerceOauthServicesResponseResolvers<ContextType = IdentityContext, ParentType extends ResolversParentTypes['ProtoIoRestorecommerceOauthServicesResponse'] = ResolversParentTypes['ProtoIoRestorecommerceOauthServicesResponse']> = ResolversObject<{
+    details?: Resolver<Maybe<ResolversTypes['IoRestorecommerceOauthServicesResponse']>, ParentType, ContextType>;
+    __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+}>;
+export declare type IoRestorecommerceOauthServicesResponseResolvers<ContextType = IdentityContext, ParentType extends ResolversParentTypes['IoRestorecommerceOauthServicesResponse'] = ResolversParentTypes['IoRestorecommerceOauthServicesResponse']> = ResolversObject<{
+    services?: Resolver<Maybe<Array<ResolversTypes['String']>>, ParentType, ContextType>;
+    __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+}>;
+export declare type ProtoIoRestorecommerceOauthGenerateLinksResponseResolvers<ContextType = IdentityContext, ParentType extends ResolversParentTypes['ProtoIoRestorecommerceOauthGenerateLinksResponse'] = ResolversParentTypes['ProtoIoRestorecommerceOauthGenerateLinksResponse']> = ResolversObject<{
+    details?: Resolver<Maybe<ResolversTypes['IoRestorecommerceOauthGenerateLinksResponse']>, ParentType, ContextType>;
+    __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+}>;
+export declare type IoRestorecommerceOauthGenerateLinksResponseResolvers<ContextType = IdentityContext, ParentType extends ResolversParentTypes['IoRestorecommerceOauthGenerateLinksResponse'] = ResolversParentTypes['IoRestorecommerceOauthGenerateLinksResponse']> = ResolversObject<{
+    links?: Resolver<Maybe<ResolversTypes['MapScalar']>, ParentType, ContextType>;
+    __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+}>;
+export interface MapScalarScalarConfig extends GraphQLScalarTypeConfig<ResolversTypes['MapScalar'], any> {
+    name: 'MapScalar';
+}
 export declare type MutationResolvers<ContextType = IdentityContext, ParentType extends ResolversParentTypes['Mutation'] = ResolversParentTypes['Mutation']> = ResolversObject<{
     identity?: Resolver<ResolversTypes['IdentityMutation'], ParentType, ContextType>;
 }>;
@@ -1160,6 +1251,7 @@ export declare type IdentityMutationResolvers<ContextType = IdentityContext, Par
     role?: Resolver<ResolversTypes['IdentityRoleMutation'], ParentType, ContextType>;
     authentication_log?: Resolver<ResolversTypes['IdentityAuthenticationLogMutation'], ParentType, ContextType>;
     token?: Resolver<ResolversTypes['IdentityTokenMutation'], ParentType, ContextType>;
+    oauth?: Resolver<ResolversTypes['IdentityOauthMutation'], ParentType, ContextType>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
 export declare type IdentityUserMutationResolvers<ContextType = IdentityContext, ParentType extends ResolversParentTypes['IdentityUserMutation'] = ResolversParentTypes['IdentityUserMutation']> = ResolversObject<{
@@ -1223,6 +1315,20 @@ export declare type IdentityTokenMutationResolvers<ContextType = IdentityContext
     consume?: Resolver<Maybe<ResolversTypes['ProtoGoogleProtobufAny']>, ParentType, ContextType, RequireFields<IdentityTokenMutationConsumeArgs, 'input'>>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
+export declare type IdentityOauthMutationResolvers<ContextType = IdentityContext, ParentType extends ResolversParentTypes['IdentityOauthMutation'] = ResolversParentTypes['IdentityOauthMutation']> = ResolversObject<{
+    ExchangeCode?: Resolver<Maybe<ResolversTypes['ProtoIoRestorecommerceOauthExchangeCodeResponse']>, ParentType, ContextType, RequireFields<IdentityOauthMutationExchangeCodeArgs, 'input'>>;
+    __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+}>;
+export declare type ProtoIoRestorecommerceOauthExchangeCodeResponseResolvers<ContextType = IdentityContext, ParentType extends ResolversParentTypes['ProtoIoRestorecommerceOauthExchangeCodeResponse'] = ResolversParentTypes['ProtoIoRestorecommerceOauthExchangeCodeResponse']> = ResolversObject<{
+    details?: Resolver<Maybe<ResolversTypes['IoRestorecommerceOauthExchangeCodeResponse']>, ParentType, ContextType>;
+    __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+}>;
+export declare type IoRestorecommerceOauthExchangeCodeResponseResolvers<ContextType = IdentityContext, ParentType extends ResolversParentTypes['IoRestorecommerceOauthExchangeCodeResponse'] = ResolversParentTypes['IoRestorecommerceOauthExchangeCodeResponse']> = ResolversObject<{
+    user?: Resolver<Maybe<ResolversTypes['IoRestorecommerceUserUserResponse']>, ParentType, ContextType>;
+    email?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+    token?: Resolver<Maybe<ResolversTypes['IoRestorecommerceAuthTokens']>, ParentType, ContextType>;
+    __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+}>;
 export declare type Resolvers<ContextType = IdentityContext> = ResolversObject<{
     Query?: QueryResolvers<ContextType>;
     IdentityQuery?: IdentityQueryResolvers<ContextType>;
@@ -1263,6 +1369,12 @@ export declare type Resolvers<ContextType = IdentityContext> = ResolversObject<{
     IoRestorecommerceAuthenticationLogAuthenticationLog?: IoRestorecommerceAuthenticationLogAuthenticationLogResolvers<ContextType>;
     IdentityTokenQuery?: IdentityTokenQueryResolvers<ContextType>;
     ProtoGoogleProtobufAny?: ProtoGoogleProtobufAnyResolvers<ContextType>;
+    IdentityOauthQuery?: IdentityOauthQueryResolvers<ContextType>;
+    ProtoIoRestorecommerceOauthServicesResponse?: ProtoIoRestorecommerceOauthServicesResponseResolvers<ContextType>;
+    IoRestorecommerceOauthServicesResponse?: IoRestorecommerceOauthServicesResponseResolvers<ContextType>;
+    ProtoIoRestorecommerceOauthGenerateLinksResponse?: ProtoIoRestorecommerceOauthGenerateLinksResponseResolvers<ContextType>;
+    IoRestorecommerceOauthGenerateLinksResponse?: IoRestorecommerceOauthGenerateLinksResponseResolvers<ContextType>;
+    MapScalar?: GraphQLScalarType;
     Mutation?: MutationResolvers<ContextType>;
     IdentityMutation?: IdentityMutationResolvers<ContextType>;
     IdentityUserMutation?: IdentityUserMutationResolvers<ContextType>;
@@ -1275,6 +1387,9 @@ export declare type Resolvers<ContextType = IdentityContext> = ResolversObject<{
     IdentityRoleMutation?: IdentityRoleMutationResolvers<ContextType>;
     IdentityAuthenticationLogMutation?: IdentityAuthenticationLogMutationResolvers<ContextType>;
     IdentityTokenMutation?: IdentityTokenMutationResolvers<ContextType>;
+    IdentityOauthMutation?: IdentityOauthMutationResolvers<ContextType>;
+    ProtoIoRestorecommerceOauthExchangeCodeResponse?: ProtoIoRestorecommerceOauthExchangeCodeResponseResolvers<ContextType>;
+    IoRestorecommerceOauthExchangeCodeResponse?: IoRestorecommerceOauthExchangeCodeResponseResolvers<ContextType>;
 }>;
 /**
  * @deprecated

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

@@ -32,4 +32,9 @@ exports.subServices = [
         service: token_1.protoMetadata.fileDescriptor.service[0],
         queries: ['find']
     },
+    {
+        name: 'oauth',
+        service: oauth_1.protoMetadata.fileDescriptor.service[0],
+        queries: ['AvailableServices', 'GenerateLinks']
+    },
 ];

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

@@ -7,6 +7,7 @@ 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 jose = require("jose");
 const Router = eval('require("koa-router")');
 const bodyParser = eval('require("koa-body")');
 const createOAuth = () => {
@@ -17,10 +18,35 @@ const createOAuth = () => {
         ctx.body = await exports.login((await ctx.identitySrvClient.oauth.GenerateLinks({})).links);
         return next();
     });
+    router.get('/oauth2-logout', async (ctx, next) => {
+        ctx.cookies.set('token', undefined);
+        ctx.status = 303;
+        ctx.redirect('/oauth2-login');
+        ctx.body = 'Redirecting to login page';
+        return next();
+    });
     router.get('/oauth2-urls', async (ctx, next) => {
         ctx.body = (await ctx.identitySrvClient.oauth.GenerateLinks({})).links;
         return next();
     });
+    router.get('/oauth2-account', async (ctx, next) => {
+        const token = ctx.cookies.get('token');
+        if (!token) {
+            ctx.body = 'user not logged in';
+            return next();
+        }
+        const ids = ctx.identitySrvClient;
+        const user = await ids.user.FindByToken({
+            token: token
+        });
+        if (!user || !user.payload) {
+            ctx.body = 'user not logged in';
+            return next();
+        }
+        ctx.type = 'html';
+        ctx.body = await exports.account(user.payload);
+        return next();
+    });
     router.post('/oauth2-register', async (ctx, next) => {
         const ids = ctx.identitySrvClient;
         const body = ctx.request.body;
@@ -34,8 +60,11 @@ const createOAuth = () => {
             guest: false,
         }));
         if (user.payload) {
-            ctx.type = 'html';
-            ctx.body = await exports.account(user.payload);
+            const token = await upsertUserToken(ids, user.payload.id);
+            ctx.cookies.set('token', token);
+            ctx.status = 303;
+            ctx.redirect('/oauth2-account');
+            ctx.body = 'Redirecting to account page';
             return next();
         }
         if (user.status) {
@@ -50,38 +79,39 @@ const createOAuth = () => {
             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();
-            }
+        if (!user.user || !user.user.payload || !user.token || (user.user.status && user.user.status.code !== 200)) {
+            ctx.type = 'html';
+            ctx.body = await exports.register(user.email || '');
+            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);
+        ctx.cookies.set('token', user.token.token);
+        ctx.status = 303;
+        ctx.redirect('/oauth2-account');
+        ctx.body = 'Redirecting to account page';
         return next();
     });
     return router;
 };
 exports.createOAuth = createOAuth;
+const upsertUserToken = async (ids, accountId) => {
+    const token = new jose.UnsecuredJWT({})
+        .setIssuedAt()
+        .setExpirationTime('30d')
+        .encode();
+    // 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: accountId,
+            exp: expiresIn,
+            jti: token
+        })
+    });
+    return token;
+};
 let layoutHbs;
 const layout = async (context) => {
     if (!layoutHbs) {

package/dist/modules/identity/oauth/views/account.hbs

@@ -16,8 +16,12 @@
 <div class="rc-login flex col justify-center">
   <div class="self-center justify-center rc-account scale110p">
     <h2>{{title}}</h2>
-    <div class="row center justify-center">
+    <div class="col center justify-center">
       <h3>Welcome {{user.firstName}} {{user.lastName}}!</h3>
+
+      <a href="/oauth2-logout" class="button emphasized">
+        <div class="icogram"><span class="text">Logout</span></div>
+      </a>
     </div>
   </div>
 </div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@restorecommerce/facade",
-  "version": "0.2.1",
+  "version": "0.3.1",
   "description": "Facade for Restorecommerce microservices",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -27,12 +27,13 @@
     "@restorecommerce/grpc-client": "^0.3.1",
     "@restorecommerce/kafka-client": "^0.3.1",
     "@restorecommerce/logger": "^0.12.1",
-    "@restorecommerce/rc-grpc-clients": "^0.4.1",
+    "@restorecommerce/rc-grpc-clients": "^0.4.2",
     "@restorecommerce/service-config": "^0.4.25",
     "apollo-server-koa": "^2.21.2",
     "debug": "^4.3.1",
     "googleapis": "^92.0.0",
     "handlebars": "^4.7.7",
+    "jose": "^4.5.0",
     "koa": "^2.13.1",
     "koa-body": "^4.2.0",
     "koa-helmet": "^6.1.0",
@@ -106,5 +107,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e97bbfe2fe8166dfe1cd47ae60bce54347a4f1c9"
+  "gitHead": "e605e326cc47380032ef2217b6552a1068e9c0de"
 }