refactor(codegen): INFRA-316 update app00 template and add backend miniapp template

apps/condo/bin/create-b2bapp.js

@@ -2,6 +2,7 @@ const path = require('path')
 
 const { faker } = require('@faker-js/faker')
 
+const { updateAppEnvFile } = require('@open-condo/cli')
 const { prepareKeystoneExpressApp } = require('@open-condo/keystone/prepareKeystoneApp')
 
 const { B2BApp } = require('@condo/domains/miniapp/utils/serverSchema')
@@ -15,34 +16,41 @@ function getJson (data) {
 }
 
 async function main (args) {
-    const [name, options] = args
+    const [b2bAppName, options, appName] = args
     let optionsJson = getJson(options)
-    if (!name) throw new Error('use: create-b2bapp <name> [<options>]')
+    if (!b2bAppName) throw new Error('use: create-b2bapp <name> [<options>]')
     if (options && !optionsJson) throw new Error('<options> argument should be a valid json')
     if (options && !optionsJson.appUrl) throw new Error('<options> argument should have appUrl key')
     const json = optionsJson || {}
 
     const { keystone: context } = await prepareKeystoneExpressApp(path.resolve('./index.js'), { excludeApps: ['NextApp', 'AdminUIApp'] })
 
-    console.info(`NAME: ${name}`)
-    const [b2bapp] = await B2BApp.getAll(context, { name }, { first: 1, sortBy: ['createdAt_DESC'] })
+    console.info(`NAME: ${b2bAppName}`)
+    let b2bAppId
+    const [b2bApp] = await B2BApp.getAll(context, { name: b2bAppName }, { first: 1, sortBy: ['createdAt_DESC'] })
     if (!json.dv) json.dv = 1
     if (!json.sender) json.sender = { 'dv': 1, 'fingerprint': 'create-b2bapp-script' }
-    if (!b2bapp) {
+    if (!b2bApp) {
         if (!json.contextDefaultStatus) json.contextDefaultStatus = 'Finished'
         if (!json.category) json.category = 'OTHER'
         if (!json.developer) json.developer = 'InternalDeveloper'
         if (!json.shortDescription) json.shortDescription = faker.commerce.productDescription()
         if (!json.detailedDescription) json.detailedDescription = faker.lorem.paragraphs(5)
 
-        await B2BApp.create(context, {
-            name, ...json,
+        const b2bApp = await B2BApp.create(context, {
+            name: b2bAppName, ...json,
         })
+        b2bAppId = b2bApp.id
         console.info('B2BApp created!')
     } else {
-        await B2BApp.update(context, b2bapp.id, json)
+        await B2BApp.update(context, b2bApp.id, json)
+        b2bAppId = b2bApp.id
         console.info('B2BApp updated!')
     }
+
+    if (appName) {
+        await updateAppEnvFile(appName, 'CONDO_B2B_APP_ID', b2bAppId)
+    }
 }
 
 main(process.argv.slice(2)).then(

apps/condo/domains/user/oidc/adapter/OidcModelClientAdapter.js

@@ -158,6 +158,7 @@ class OidcModelClientAdapter {
          * - iat {number} - timestamp of the replay object cache's creation
          */
         const expiresAt = expiresIn ? new Date(Date.now() + expiresIn * 1000) : undefined
+        const { isEnabled, ...clientPayload } = payload
         const dvAndSender = {
             dv: 1,
             sender: {
@@ -167,9 +168,9 @@ class OidcModelClientAdapter {
         }
         const item = await OidcClient.getOne(this.context, { clientId: id, deletedAt: null })
         if (!item) {
-            return await OidcClient.create(this.context, { ...dvAndSender, clientId: id, payload, expiresAt })
+            return await OidcClient.create(this.context, { ...dvAndSender, clientId: id, payload: clientPayload, isEnabled, expiresAt })
         } else {
-            return await OidcClient.update(this.context, item.id, { ...dvAndSender, clientId: id, payload, expiresAt })
+            return await OidcClient.update(this.context, item.id, { ...dvAndSender, clientId: id, payload: clientPayload, isEnabled, expiresAt })
         }
     }
 

packages/cli/index.js

@@ -208,10 +208,11 @@ async function prepareCondoAppOidcConfig (appName) {
     return { serverUrl, clientId, clientSecret }
 }
 
-async function prepareCondoAppB2BAppConfig (appName, p2pAppName) {
-    const appUrl = await getAppServerUrl(appName)
+async function prepareCondoAppB2BAppConfig (appName, b2bAppName, withLaunchRoute) {
+    let appUrl = await getAppServerUrl(appName)
+    appUrl = withLaunchRoute ? (appUrl + '/launch') : appUrl
     const opts = JSON.stringify({ appUrl, displayPriority: 2 })
-    await safeExec(`yarn workspace @app/condo node ./bin/create-b2bapp.js ${p2pAppName} ${JSON.stringify(opts)}`)
+    await safeExec(`yarn workspace @app/condo node ./bin/create-b2bapp.js ${b2bAppName} ${JSON.stringify(opts)} ${appName}`)
     return { appUrl }
 }