@restorecommerce/facade 0.2.0 → 0.3.0

package/CHANGELOG.md

@@ -3,6 +3,49 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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)
+
+
+### Bug Fixes
+
+* **facade:** regenerated schema ([a8fba43](https://github.com/restorecommerce/libs/commit/a8fba43233999191d2583139cefe9a8af647706b))
+* bypass non-compliant koa modules ([8a92b83](https://github.com/restorecommerce/libs/commit/8a92b83ce717f52caa843b00d5db894ca07ab1a9))
+* copy hbs on build ([efd8e78](https://github.com/restorecommerce/libs/commit/efd8e783a09badb84d76f2b72377de438f34d014))
+* switch to sh ([5756072](https://github.com/restorecommerce/libs/commit/57560723184a300b2d315068f29339a5f2dc517e))
+
+
+
+
+
 # [0.2.0](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.1.44...@restorecommerce/facade@0.2.0) (2022-02-09)
 
 

package/copy-hbs.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+
+set -ex
+
+find ./src -type f -name "*.hbs" | cut -d'/' -f3- | xargs -I{} dirname {} | xargs -I{} mkdir -p ./dist/{}
+find ./src -type f -name "*.hbs" | cut -d'/' -f3- | xargs -I{} cp -u ./src/{} ./dist/{}

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/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="koa-bodyparser" />
 /// <reference types="node" />
 import Koa from 'koa';
 import { Logger } from 'winston';

package/dist/interfaces.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="koa-bodyparser" />
 /// <reference types="node" />
 import Koa from 'koa';
 import { Logger } from 'winston';

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

@@ -24,8 +24,9 @@ export declare type Scalars = {
     Boolean: boolean;
     Int: number;
     Float: number;
-    Upload: any;
     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';
@@ -99,6 +101,7 @@ export declare type IoRestorecommerceUserUser = {
     invitedByUserLastName?: Maybe<Scalars['String']>;
     tokens?: Maybe<Array<IoRestorecommerceAuthTokens>>;
     lastAccess?: Maybe<Scalars['Float']>;
+    data?: Maybe<GoogleProtobufAny>;
 };
 export declare type IoRestorecommerceMetaMeta = {
     __typename?: 'IoRestorecommerceMetaMeta';
@@ -123,6 +126,7 @@ export declare type IoRestorecommerceAuthRoleAssociation = {
     role?: Maybe<Scalars['String']>;
     attributes?: Maybe<Array<IoRestorecommerceAttributeAttribute>>;
     id?: Maybe<Scalars['String']>;
+    created?: Maybe<Scalars['Float']>;
 };
 export declare type IoRestorecommerceImageImage = {
     __typename?: 'IoRestorecommerceImageImage';
@@ -151,6 +155,11 @@ export declare type IoRestorecommerceAuthTokens = {
     interactive?: Maybe<Scalars['Boolean']>;
     lastLogin?: Maybe<Scalars['Float']>;
 };
+export declare type GoogleProtobufAny = {
+    __typename?: 'GoogleProtobufAny';
+    typeUrl?: Maybe<Scalars['String']>;
+    value?: Maybe<Scalars['TodoScalar']>;
+};
 export declare type IoRestorecommerceStatusStatus = {
     __typename?: 'IoRestorecommerceStatusStatus';
     id?: Maybe<Scalars['String']>;
@@ -353,15 +362,31 @@ export declare type ProtoGoogleProtobufAny = {
     __typename?: 'ProtoGoogleProtobufAny';
     details?: Maybe<GoogleProtobufAny>;
 };
-export declare type GoogleProtobufAny = {
-    __typename?: 'GoogleProtobufAny';
-    typeUrl?: Maybe<Scalars['String']>;
-    value?: Maybe<Scalars['TodoScalar']>;
-};
 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;
@@ -372,6 +397,7 @@ export declare type IdentityMutation = {
     role: IdentityRoleMutation;
     authentication_log: IdentityAuthenticationLogMutation;
     token: IdentityTokenMutation;
+    oauth: IdentityOauthMutation;
 };
 export declare type IdentityUserMutation = {
     __typename?: 'IdentityUserMutation';
@@ -467,6 +493,7 @@ export declare type IIoRestorecommerceUserUser = {
     invitedByUserLastName?: Maybe<Scalars['String']>;
     tokens?: Maybe<Array<IIoRestorecommerceAuthTokens>>;
     lastAccess?: Maybe<Scalars['Float']>;
+    data?: Maybe<IGoogleProtobufAny>;
 };
 export declare type IIoRestorecommerceMetaMeta = {
     created?: Maybe<Scalars['Float']>;
@@ -482,6 +509,7 @@ export declare type IIoRestorecommerceAuthRoleAssociation = {
     role?: Maybe<Scalars['String']>;
     attributes?: Maybe<Array<IIoRestorecommerceAttributeAttribute>>;
     id?: Maybe<Scalars['String']>;
+    created?: Maybe<Scalars['Float']>;
 };
 export declare type IIoRestorecommerceImageImage = {
     id?: Maybe<Scalars['String']>;
@@ -679,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;
@@ -723,6 +773,8 @@ export declare type ResolversTypes = ResolversObject<{
     IoRestorecommerceImageImage: ResolverTypeWrapper<IoRestorecommerceImageImage>;
     IoRestorecommerceUserUserType: IoRestorecommerceUserUserType;
     IoRestorecommerceAuthTokens: ResolverTypeWrapper<IoRestorecommerceAuthTokens>;
+    GoogleProtobufAny: ResolverTypeWrapper<GoogleProtobufAny>;
+    TodoScalar: ResolverTypeWrapper<Scalars['TodoScalar']>;
     IoRestorecommerceStatusStatus: ResolverTypeWrapper<IoRestorecommerceStatusStatus>;
     Int: ResolverTypeWrapper<Scalars['Int']>;
     IoRestorecommerceStatusOperationStatus: ResolverTypeWrapper<IoRestorecommerceStatusOperationStatus>;
@@ -759,9 +811,13 @@ export declare type ResolversTypes = ResolversObject<{
     IoRestorecommerceAuthenticationLogAuthenticationLog: ResolverTypeWrapper<IoRestorecommerceAuthenticationLogAuthenticationLog>;
     IdentityTokenQuery: ResolverTypeWrapper<IdentityTokenQuery>;
     ProtoGoogleProtobufAny: ResolverTypeWrapper<ProtoGoogleProtobufAny>;
-    GoogleProtobufAny: ResolverTypeWrapper<GoogleProtobufAny>;
-    TodoScalar: ResolverTypeWrapper<Scalars['TodoScalar']>;
     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>;
@@ -802,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<{
@@ -821,6 +881,8 @@ export declare type ResolversParentTypes = ResolversObject<{
     IoRestorecommerceAuthRoleAssociation: IoRestorecommerceAuthRoleAssociation;
     IoRestorecommerceImageImage: IoRestorecommerceImageImage;
     IoRestorecommerceAuthTokens: IoRestorecommerceAuthTokens;
+    GoogleProtobufAny: GoogleProtobufAny;
+    TodoScalar: Scalars['TodoScalar'];
     IoRestorecommerceStatusStatus: IoRestorecommerceStatusStatus;
     Int: Scalars['Int'];
     IoRestorecommerceStatusOperationStatus: IoRestorecommerceStatusOperationStatus;
@@ -850,9 +912,13 @@ export declare type ResolversParentTypes = ResolversObject<{
     IoRestorecommerceAuthenticationLogAuthenticationLog: IoRestorecommerceAuthenticationLogAuthenticationLog;
     IdentityTokenQuery: IdentityTokenQuery;
     ProtoGoogleProtobufAny: ProtoGoogleProtobufAny;
-    GoogleProtobufAny: GoogleProtobufAny;
-    TodoScalar: Scalars['TodoScalar'];
     IIoRestorecommerceTokenIdentifier: IIoRestorecommerceTokenIdentifier;
+    IdentityOauthQuery: IdentityOauthQuery;
+    ProtoIoRestorecommerceOauthServicesResponse: ProtoIoRestorecommerceOauthServicesResponse;
+    IoRestorecommerceOauthServicesResponse: IoRestorecommerceOauthServicesResponse;
+    ProtoIoRestorecommerceOauthGenerateLinksResponse: ProtoIoRestorecommerceOauthGenerateLinksResponse;
+    IoRestorecommerceOauthGenerateLinksResponse: IoRestorecommerceOauthGenerateLinksResponse;
+    MapScalar: Scalars['MapScalar'];
     Mutation: {};
     IdentityMutation: IdentityMutation;
     IdentityUserMutation: IdentityUserMutation;
@@ -892,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>;
@@ -901,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<{
@@ -951,6 +1022,7 @@ export declare type IoRestorecommerceUserUserResolvers<ContextType = IdentityCon
     invitedByUserLastName?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
     tokens?: Resolver<Maybe<Array<ResolversTypes['IoRestorecommerceAuthTokens']>>, ParentType, ContextType>;
     lastAccess?: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
+    data?: Resolver<Maybe<ResolversTypes['GoogleProtobufAny']>, ParentType, ContextType>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
 export declare type IoRestorecommerceMetaMetaResolvers<ContextType = IdentityContext, ParentType extends ResolversParentTypes['IoRestorecommerceMetaMeta'] = ResolversParentTypes['IoRestorecommerceMetaMeta']> = ResolversObject<{
@@ -975,6 +1047,7 @@ export declare type IoRestorecommerceAuthRoleAssociationResolvers<ContextType =
     role?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
     attributes?: Resolver<Maybe<Array<ResolversTypes['IoRestorecommerceAttributeAttribute']>>, ParentType, ContextType>;
     id?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+    created?: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
 export declare type IoRestorecommerceImageImageResolvers<ContextType = IdentityContext, ParentType extends ResolversParentTypes['IoRestorecommerceImageImage'] = ResolversParentTypes['IoRestorecommerceImageImage']> = ResolversObject<{
@@ -1004,6 +1077,14 @@ export declare type IoRestorecommerceAuthTokensResolvers<ContextType = IdentityC
     lastLogin?: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
+export declare type GoogleProtobufAnyResolvers<ContextType = IdentityContext, ParentType extends ResolversParentTypes['GoogleProtobufAny'] = ResolversParentTypes['GoogleProtobufAny']> = ResolversObject<{
+    typeUrl?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+    value?: Resolver<Maybe<ResolversTypes['TodoScalar']>, ParentType, ContextType>;
+    __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+}>;
+export interface TodoScalarScalarConfig extends GraphQLScalarTypeConfig<ResolversTypes['TodoScalar'], any> {
+    name: 'TodoScalar';
+}
 export declare type IoRestorecommerceStatusStatusResolvers<ContextType = IdentityContext, ParentType extends ResolversParentTypes['IoRestorecommerceStatusStatus'] = ResolversParentTypes['IoRestorecommerceStatusStatus']> = ResolversObject<{
     id?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
     code?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
@@ -1138,13 +1219,29 @@ export declare type ProtoGoogleProtobufAnyResolvers<ContextType = IdentityContex
     details?: Resolver<Maybe<ResolversTypes['GoogleProtobufAny']>, ParentType, ContextType>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
-export declare type GoogleProtobufAnyResolvers<ContextType = IdentityContext, ParentType extends ResolversParentTypes['GoogleProtobufAny'] = ResolversParentTypes['GoogleProtobufAny']> = ResolversObject<{
-    typeUrl?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-    value?: Resolver<Maybe<ResolversTypes['TodoScalar']>, 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 interface TodoScalarScalarConfig extends GraphQLScalarTypeConfig<ResolversTypes['TodoScalar'], any> {
-    name: 'TodoScalar';
+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>;
@@ -1154,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<{
@@ -1217,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>;
@@ -1232,6 +1344,8 @@ export declare type Resolvers<ContextType = IdentityContext> = ResolversObject<{
     IoRestorecommerceImageImage?: IoRestorecommerceImageImageResolvers<ContextType>;
     IoRestorecommerceUserUserType?: IoRestorecommerceUserUserTypeResolvers;
     IoRestorecommerceAuthTokens?: IoRestorecommerceAuthTokensResolvers<ContextType>;
+    GoogleProtobufAny?: GoogleProtobufAnyResolvers<ContextType>;
+    TodoScalar?: GraphQLScalarType;
     IoRestorecommerceStatusStatus?: IoRestorecommerceStatusStatusResolvers<ContextType>;
     IoRestorecommerceStatusOperationStatus?: IoRestorecommerceStatusOperationStatusResolvers<ContextType>;
     IoRestorecommerceResourcebaseSortSortOrder?: IoRestorecommerceResourcebaseSortSortOrderResolvers;
@@ -1255,8 +1369,12 @@ export declare type Resolvers<ContextType = IdentityContext> = ResolversObject<{
     IoRestorecommerceAuthenticationLogAuthenticationLog?: IoRestorecommerceAuthenticationLogAuthenticationLogResolvers<ContextType>;
     IdentityTokenQuery?: IdentityTokenQueryResolvers<ContextType>;
     ProtoGoogleProtobufAny?: ProtoGoogleProtobufAnyResolvers<ContextType>;
-    GoogleProtobufAny?: GoogleProtobufAnyResolvers<ContextType>;
-    TodoScalar?: GraphQLScalarType;
+    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>;
@@ -1269,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/index.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.identityModule = void 0;
-const koa_mount_1 = require("koa-mount");
 const utils_1 = require("../../utils");
 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");
+const mount = eval('require("koa-mount")');
 exports.identityModule = utils_1.createFacadeModuleFactory('identity', (facade, config) => {
     const identitySrvClient = new grpc_1.IdentitySrvGrpcClient(config.identitySrvClientConfig, facade.logger);
     if (!!config.apiKey) {
@@ -28,7 +28,7 @@ exports.identityModule = utils_1.createFacadeModuleFactory('identity', (facade,
             config: config.oidc
         });
         facade.koa.use(router.routes());
-        facade.koa.use(koa_mount_1.default(provider.app));
+        facade.koa.use(mount(provider.app));
     }
     if (config.oauth) {
         facade.koa.use(oauth_1.createOAuth().routes());

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

@@ -1,7 +1,7 @@
-import Router from "koa-router";
+import KoaRouter 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 createOAuth: () => KoaRouter<{}, IdentityContext>;
 export declare const layout: (context: {
     body: string;
     title: string;

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

@@ -1,26 +1,52 @@
 "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 jose = require("jose");
+const Router = eval('require("koa-router")');
+const bodyParser = eval('require("koa-body")');
 const createOAuth = () => {
-    const router = new koa_router_1.default();
-    router.use(koa_body_1.default({ multipart: true }));
+    const router = new Router();
+    router.use(bodyParser({ 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-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,43 +79,45 @@ 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();
-            }
+            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);
+        const token = await upsertUserToken(ids, user.user.payload.id);
+        ctx.cookies.set('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) {
         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()));
+            fs_1.readFile(path_1.resolve(__dirname, 'views/layout.hbs'), (err, data) => err ? reject(err) : resolve(data.toString()));
         });
         layoutHbs = handlebars_1.default.compile(layoutTpl);
     }
@@ -97,7 +128,7 @@ 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()));
+            fs_1.readFile(path_1.resolve(__dirname, 'views/register.hbs'), (err, data) => err ? reject(err) : resolve(data.toString()));
         });
         registerHbs = handlebars_1.default.compile(registerTpl);
     }
@@ -111,7 +142,7 @@ 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()));
+            fs_1.readFile(path_1.resolve(__dirname, 'views/login.hbs'), (err, data) => err ? reject(err) : resolve(data.toString()));
         });
         loginHbs = handlebars_1.default.compile(loginTpl);
     }
@@ -125,7 +156,7 @@ 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()));
+            fs_1.readFile(path_1.resolve(__dirname, 'views/account.hbs'), (err, data) => err ? reject(err) : resolve(data.toString()));
         });
         accountHbs = handlebars_1.default.compile(accountTpl);
     }

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

@@ -0,0 +1,27 @@
+<style>
+.rc-login {
+  height: 100%;
+  background-color: #00adef;
+}
+
+.rc-account {
+  width: 815px;
+  box-sizing: border-box;
+  border-radius: .3rem;
+  background: #fff;
+  padding: 1rem;
+}
+</style>
+
+<div class="rc-login flex col justify-center">
+  <div class="self-center justify-center rc-account scale110p">
+    <h2>{{title}}</h2>
+    <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/dist/modules/identity/oauth/views/layout.hbs

@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html >
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
+    <title>{{title}}</title>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@vcl/vcl@2/dist/index.css">
+    <style>
+      .app {
+        height: 100vh;
+        max-width: 100%;
+      }
+      .debug summary {
+        font-weight: bold;
+      }
+      .debug .debug-content {
+        display: none;
+      }
+      .debug .debug-content.visible {
+        display: block;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="app col">
+      <main class="flex col">
+        <div class="flex">
+         {{{ body }}}
+        </div>
+      </main>
+    </div>
+  </body>
+</html>

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

@@ -0,0 +1,27 @@
+<style>
+.rc-login {
+  height: 100%;
+  background-color: #00adef;
+}
+
+.rc-account {
+  width: 815px;
+  box-sizing: border-box;
+  border-radius: .3rem;
+  background: #fff;
+  padding: 1rem;
+}
+</style>
+
+<div class="rc-login flex col justify-center">
+  <div class="self-center justify-center rc-account scale110p">
+    <h2>{{title}}</h2>
+    <div class="col center justify-center">
+      <h3>Login using one of the following providers:</h3>
+
+      <a href="{{links.google}}" class="button emphasized">
+        <div class="icogram"><span class="text">Google</span></div>
+      </a>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,134 @@
+<style>
+  .rc-login {
+    height: 100%;
+    background-color: #00adef;
+  }
+
+  .rc-account {
+    width: 815px;
+    box-sizing: border-box;
+    border-radius: .3rem;
+    background: #fff;
+    padding: 1rem;
+  }
+</style>
+
+<div class="rc-login flex col justify-center">
+  <div class="self-center justify-center rc-account scale110p">
+    <h2>{{title}}</h2>
+    <div class="col center justify-center">
+      <h3>Please register!</h3>
+      <form class="form w-100p" method="post" action="/oauth2-register">
+        <div class="form-control-group embedded-input-field-label floating">
+          <label for="first_name" class="form-control-label">
+            First Name
+            <em class="required-indicator">•</em>
+          </label>
+          <div class="input-field">
+            <input class="input" type="text" autocomplete="off" name="first_name" required>
+          </div>
+        </div>
+
+        <div class="form-control-group embedded-input-field-label floating">
+          <label for="last_name" class="form-control-label">
+            Last Name
+            <em class="required-indicator">•</em>
+          </label>
+          <div class="input-field">
+            <input class="input" type="text" autocomplete="off" name="last_name" required>
+          </div>
+        </div>
+
+        <div class="form-control-group embedded-input-field-label floating">
+          <label for="username" class="form-control-label">
+            Username
+            <em class="required-indicator">•</em>
+          </label>
+          <div class="input-field">
+            <input class="input" type="text" autocomplete="off" name="username" required>
+          </div>
+        </div>
+
+        <div class="form-control-group embedded-input-field-label">
+          <label for="email" class="form-control-label">
+            Email
+            <em class="required-indicator">•</em>
+          </label>
+          <div class="input-field">
+            <input class="input" type="email" autocomplete="off" name="email" value="{{email}}" required>
+          </div>
+        </div>
+
+        <div class="form-control-group embedded-input-field-label floating">
+          <label for="password" class="form-control-label">
+            Password
+            <em class="required-indicator">•</em>
+          </label>
+          <div class="input-field">
+            <input class="input" type="password" autocomplete="off" name="password" required>
+          </div>
+        </div>
+
+        <div class="form-control-group embedded-input-field-label floating">
+          <label for="password_repeated" class="form-control-label">
+            Password Repeated
+            <em class="required-indicator">•</em>
+          </label>
+          <div class="input-field">
+            <input class="input" type="password" autocomplete="off" name="password_repeated" required>
+          </div>
+        </div>
+
+        <button type="submit" class="button emphasized">
+          <div class="icogram"><span class="text">Register</span></div>
+        </button>
+      </form>
+    </div>
+  </div>
+</div>
+
+<script>
+  !function() {
+    const docRoot = document.demoShadowRoot || document;
+
+    function registerInputFieldListeners(fcg) {
+      const inputField = fcg.querySelector('.input-field');
+      const input = inputField.querySelector('input, textarea');
+
+      function updateState() {
+        const hasValue = typeof input.value === 'string' && input.value.length > 0;
+        const hasFocus = docRoot.activeElement === input;
+
+        if (hasFocus) {
+          inputField.classList.add('focused');
+          fcg.classList.add('focused');
+        } else {
+          inputField.classList.remove('focused');
+          fcg.classList.remove('focused');
+        }
+
+        if (hasValue || hasFocus) {
+          fcg.classList.remove('floating');
+        } else {
+          fcg.classList.add('floating');
+        }
+      }
+
+      input.addEventListener('focus', updateState);
+      input.addEventListener('blur', updateState);
+      input.addEventListener('input', updateState);
+
+      updateState();
+
+      let prependedElements = 0, sibling = input;
+      while (sibling = sibling.previousElementSibling) {
+        prependedElements++;
+      }
+      fcg.style.setProperty('--prepended-elements', prependedElements);
+
+    }
+
+    const form = docRoot.querySelector('form');
+    form.querySelectorAll('.form-control-group').forEach(fcg => registerInputFieldListeners(fcg));
+  }();
+</script>

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

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

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

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createOIDCRouter = void 0;
-const koa_router_1 = require("koa-router");
-const koa_body_1 = require("koa-body");
 const templates_1 = require("./templates");
+const Router = eval('require("koa-router")');
+const bodyParser = eval('require("koa-body")');
 function createOIDCRouter({ logger, loginFn, provider, env, templates }) {
     const dev = env === 'development';
     const tplEngine = new templates_1.OIDCTemplateEngine(templates);
-    const router = new koa_router_1.default();
+    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);
@@ -70,7 +70,7 @@ function createOIDCRouter({ logger, loginFn, provider, env, templates }) {
     //     mergeWithLastSubmission: true,
     //   });
     // });
-    router.post('/interaction/:uid/login', koa_body_1.default({
+    router.post('/interaction/:uid/login', bodyParser({
         text: false, json: false
     }), async (ctx) => {
         const { prompt, uid, params, session } = await provider.interactionDetails(ctx.req, ctx.res);

package/dist/modules/identity/oidc/views/consent.hbs

@@ -0,0 +1,49 @@
+<style>
+</style>
+{{!-- <div class="login-client-image">
+  <% if (client.logoUri) { %><img src="<%= client.logoUri %>"><% } %>
+</div>
+
+<ul>
+<% if ([details.scopes.accepted, details.scopes.rejected, details.claims.accepted, details.claims.rejected].every(({ length }) => length === 0)) { %>
+  <li>this is a new authorization</li>
+<% } %>
+
+<% if ([details.scopes.new, details.claims.new].every(({ length }) => length === 0)) { %>
+  <li>the client is asking you to confirm previously given authorization</li>
+<% } %>
+
+<% newScopes = new Set(details.scopes.new); newScopes.delete('openid'); newScopes.delete('offline_access') %>
+<% if (newScopes.size) { %>
+  <li>scopes:</li>
+  <ul>
+    <% newScopes.forEach((scope) => { %>
+      <li><%= scope %></li>
+    <% }) %>
+  </ul>
+<% } %>
+
+<% newClaims = new Set(details.claims.new); ['sub', 'sid', 'auth_time', 'acr', 'amr', 'iss'].forEach(Set.prototype.delete.bind(newClaims)) %>
+<% if (newClaims.size) { %>
+  <li>claims:</li>
+  <ul>
+    <% newClaims.forEach((claim) => { %>
+      <li><%= claim %></li>
+    <% }) %>
+  </ul>
+<% } %>
+
+<% if (params.scope && params.scope.includes('offline_access')) { %>
+  <li>
+  the client is asking to have offline access to this authorization
+    <% if (!details.scopes.new.includes('offline_access')) { %>
+      (which you've previously granted)
+    <% } %>
+  </li>
+<% } %>
+
+</ul>
+ --}}
+<form autocomplete="off" action="/interaction/{{ uid }}/confirm" method="post">
+  <button autofocus type="submit" class="login login-submit">Continue</button>
+</form>

package/dist/modules/identity/oidc/views/layout.hbs

@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<html >
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
+    <title>{{title}}</title>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@vcl/vcl@2/dist/index.css">
+    <style>
+      .app {
+        height: 100vh;
+        max-width: 100%;
+      }
+      .debug summary {
+        font-weight: bold;
+      }
+      .debug .debug-content {
+        display: none;
+      }
+      .debug .debug-content.visible {
+        display: block;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="app col">
+      <main class="flex col">
+        <div class="flex">
+         {{{ body }}}
+        </div>
+        {{#if dev }}
+        {{#if dbg }}
+
+        <div class="debug col align-items-center">
+          <summary class="" style="cursor: pointer;">(Click to expand) DEBUG information</summary>
+          <div class="debug-content">
+            <div>
+              <h2>uid</h2>
+              <p>{{ uid }}</p>
+            </div>
+            {{#if dbg.session}}
+            <div>
+              <h3>Session</h3>
+              <p>{{{ json dbg.session }}}</p>
+            </div>
+            {{/if}}
+
+            {{#if dbg.params}}
+            <div>
+              <h3>Params</h3>
+              <p>{{{ json dbg.params }}}</p>
+            </div>
+            {{/if}}
+            {{#if dbg.prompt}}
+            <div>
+              <h3>Prompt</h3>
+              <p>{{{ json dbg.prompt }}}</p>
+            </div>
+            {{/if}}
+          </div>
+        </div>
+        <script>
+          const sumEl = document.querySelector('.debug > summary');
+          const debugContentEl = document.querySelector('.debug-content');
+          sumEl.addEventListener('click', () => {
+            if (debugContentEl.classList.contains('visible')) {
+              debugContentEl.classList.remove('visible');
+            } else {
+              debugContentEl.classList.add('visible');
+            }
+          });
+        </script>
+      {{/if}}
+      {{/if}}
+      </main>
+    </div>
+
+  </body>
+</html>

package/dist/modules/identity/oidc/views/login.hbs

@@ -0,0 +1,62 @@
+<style>
+.rc-login {
+  height: 100%;
+  background-color: #00adef;
+}
+
+.rc-login-form {
+  width: 815px;
+  box-sizing: border-box;
+  border-radius: .3rem;
+  background: #fff;
+  padding: 1rem;
+}
+</style>
+
+<div class="rc-login flex col justify-center">
+  <div class="self-center justify-center rc-login-form scale110p">
+    <h2>{{title}}</h2>
+    <div class="row rc-login-form-inner">
+      <div class="w-45p gutter-margin-t-b">
+        <form class="form m-0 ng-pristine ng-invalid ng-touched" autocomplete="off" action="/interaction/{{ uid}}/login" method="post">
+          <div class="form-control-group embedded-input-field-label">
+            <label for="identifier" class="form-control-label">
+              E-Mail or Username
+            </label>
+            <div class="input-field {{#if error}}error{{/if}}">
+              <input value="testuser"  id="identifier" name="identifier" type="text">
+            </div>
+          </div>
+          <div class="form-control-group embedded-input-field-label">
+            <label for="password" class="form-control-label">
+              Password
+            </label>
+            <div class="input-field {{#if error}}error{{/if}}">
+              <input value="testpassword" name="password" name="password" type="text">
+            </div>
+            {{#if error}}
+              <div class="form-control-hint error">{{error.message}}</div>
+            {{/if}}
+          </div>
+          <div class="row justify-between">
+            <button type="button" class="button half-transparent"> Forgot your password? </button>
+            <button type="submit" class="button emphasized"> Log in </button>
+          </div>
+        </form>
+      </div>
+      <div class="w-10p divider divider-vertical row center justify-center rc-login-form-divider-v">
+        <div class="divider-rule"></div>
+        <div class="icogram divider-element">
+          <div class="text">or</div>
+        </div>
+      </div>
+      <div class="w-45p col justify-center gutter-margin-t-b">
+        <a href="https://todo" class="col justify-center">
+          <button type="button" class="button emphasized">
+            Create an Account
+          </button>
+        </a>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -442,9 +442,9 @@ export declare type IoRestorecommerceLocationLocation = {
     description?: Maybe<Scalars['String']>;
     organizationId?: Maybe<Scalars['String']>;
     parentId?: Maybe<Scalars['String']>;
-    childrenIds?: Maybe<Array<Scalars['String']>>;
     addressId?: Maybe<Scalars['String']>;
     data?: Maybe<GoogleProtobufAny>;
+    type?: Maybe<Scalars['String']>;
 };
 export declare type GoogleProtobufAny = {
     __typename?: 'GoogleProtobufAny';
@@ -479,7 +479,6 @@ export declare type IoRestorecommerceOrganizationOrganization = {
     meta?: Maybe<IoRestorecommerceMetaMeta>;
     addressId?: Maybe<Scalars['String']>;
     parentId?: Maybe<Scalars['String']>;
-    childrenIds?: Maybe<Array<Scalars['String']>>;
     contactPointIds?: Maybe<Array<Scalars['String']>>;
     website?: Maybe<Scalars['String']>;
     email?: Maybe<Scalars['String']>;
@@ -860,9 +859,9 @@ export declare type IIoRestorecommerceLocationLocation = {
     description?: Maybe<Scalars['String']>;
     organizationId?: Maybe<Scalars['String']>;
     parentId?: Maybe<Scalars['String']>;
-    childrenIds?: Maybe<Array<Scalars['String']>>;
     addressId?: Maybe<Scalars['String']>;
     data?: Maybe<IGoogleProtobufAny>;
+    type?: Maybe<Scalars['String']>;
 };
 export declare type ResourceOrganizationMutation = {
     __typename?: 'ResourceOrganizationMutation';
@@ -885,7 +884,6 @@ export declare type IIoRestorecommerceOrganizationOrganization = {
     meta?: Maybe<IIoRestorecommerceMetaMeta>;
     addressId?: Maybe<Scalars['String']>;
     parentId?: Maybe<Scalars['String']>;
-    childrenIds?: Maybe<Array<Scalars['String']>>;
     contactPointIds?: Maybe<Array<Scalars['String']>>;
     website?: Maybe<Scalars['String']>;
     email?: Maybe<Scalars['String']>;
@@ -1636,9 +1634,9 @@ export declare type IoRestorecommerceLocationLocationResolvers<ContextType = Res
     description?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
     organizationId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
     parentId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-    childrenIds?: Resolver<Maybe<Array<ResolversTypes['String']>>, ParentType, ContextType>;
     addressId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
     data?: Resolver<Maybe<ResolversTypes['GoogleProtobufAny']>, ParentType, ContextType>;
+    type?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
 export declare type GoogleProtobufAnyResolvers<ContextType = ResourceContext, ParentType extends ResolversParentTypes['GoogleProtobufAny'] = ResolversParentTypes['GoogleProtobufAny']> = ResolversObject<{
@@ -1673,7 +1671,6 @@ export declare type IoRestorecommerceOrganizationOrganizationResolvers<ContextTy
     meta?: Resolver<Maybe<ResolversTypes['IoRestorecommerceMetaMeta']>, ParentType, ContextType>;
     addressId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
     parentId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-    childrenIds?: Resolver<Maybe<Array<ResolversTypes['String']>>, ParentType, ContextType>;
     contactPointIds?: Resolver<Maybe<Array<ResolversTypes['String']>>, ParentType, ContextType>;
     website?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
     email?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@restorecommerce/facade",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Facade for Restorecommerce microservices",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -24,15 +24,16 @@
     "@cloudnative/health": "^2.1.2",
     "@grpc/grpc-js": "^1.2.12",
     "@grpc/proto-loader": "^0.6.0",
-    "@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",
+    "@restorecommerce/grpc-client": "^0.3.1",
+    "@restorecommerce/kafka-client": "^0.3.1",
+    "@restorecommerce/logger": "^0.12.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",
@@ -85,7 +86,7 @@
     "typescript": "^4.2.3"
   },
   "scripts": {
-    "build": "npm-run-all build:clean generate build:compile build:codegen:clean build:codegen:compile",
+    "build": "npm-run-all build:clean generate build:compile build:codegen:clean build:codegen:compile copyhbs",
     "build:clean": "rimraf -rf ./dist",
     "build:compile": "tsc -p tsconfig.lib.json",
     "build:codegen:clean": "rimraf -rf ./codegen",
@@ -97,7 +98,8 @@
     "dev:serve": "TS_NODE_PROJECT=tsconfig.test.json nodemon -e ts,hbs -w ./tests -w ./src -x node --inspect=7000 -r ts-node/register tests/server.ts",
     "generate": "ts-node --project tsconfig.generate.json -r tsconfig-paths/register generate.ts",
     "prepublishOnly": "npm run build",
-    "debug-run": "ts-node --project tsconfig.debug.json debug-run.ts"
+    "debug-run": "ts-node --project tsconfig.debug.json debug-run.ts",
+    "copyhbs": "sh copy-hbs.sh"
   },
   "engines": {
     "node": ">= 12.18.0"
@@ -105,5 +107,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "97966555c4e421699a8a7c054f41ccc4385f618f"
+  "gitHead": "48d54d4a52972fa4c7f03a105241ea0662454e83"
 }