Fix wrong merge

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>

packages/ui/src/components/CodeInput.svelte

@@ -31,7 +31,6 @@
     on:change
     on:keyup
     on:input
-    maxlength={1}
     inputmode="numeric"
     autocomplete="off"
     placeholder=""

plugins/login-resources/src/components/Auth.svelte

@@ -18,7 +18,7 @@
       setMetadataLocalStorage(login.metadata.LastToken, result.token)
       setMetadataLocalStorage(login.metadata.LoginEndpoint, result.endpoint)
       setMetadataLocalStorage(login.metadata.LoginEmail, result.email)
-      await afterConfirm('onboard')
+      await afterConfirm()
     } else {
       goTo('login')
     }

plugins/login-resources/src/components/LoginApp.svelte

@@ -51,7 +51,6 @@
   import loginBackWebp from '../../img/login_back.webp'
   import loginBack2xWebp from '../../img/login_back_2x.webp'
   import login from '../plugin'
-  import OnboardForm from './OnboardForm.svelte'
 
   export let page: Pages = 'signup'
 
@@ -138,8 +137,6 @@
             <LoginForm {navigateUrl} />
           {:else if page === 'signup'}
             <SignupForm />
-          {:else if page === 'onboard'}
-            <OnboardForm />
           {:else if page === 'createWorkspace'}
             <CreateWorkspaceForm />
           {:else if page === 'password'}

plugins/login-resources/src/components/OnboardForm.svelte

@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { LoginInfo, WorkspaceLoginInfo } from '@hcengineering/login'
+  import login, { LoginInfo, WorkspaceLoginInfo } from '@hcengineering/login'
   import { OK } from '@hcengineering/platform'
   import { onMount } from 'svelte'
 

plugins/login-resources/src/components/OtpForm.svelte

@@ -81,9 +81,14 @@
 
     if (value == null || value === '') return
 
+    if (value.length === fields.length) {
+      pasteOtpCode(value)
+    } else {
       const index = fields.findIndex(({ id }) => id === target.id)
       if (index === -1) return
 
+      target.value = value[0]
+
       if (Object.values(otpData).every((v) => v !== '')) {
         void validateOtp()
         return
@@ -97,6 +102,7 @@
         nextInput.focus()
       }
     }
+  }
 
   function clearOtpData (): void {
     Object.keys(otpData).forEach((key) => {
@@ -139,9 +145,15 @@
     if (e.clipboardData == null) return
 
     const text = e.clipboardData.getData('text')
+    pasteOtpCode(text)
+  }
+
+  function pasteOtpCode (text: string): boolean {
     const digits = text.split('').filter((it) => it !== ' ')
 
-    if (digits.length !== fields.length) return
+    if (digits.length !== fields.length) {
+      return false
+    }
 
     let focusName: string | undefined = undefined
 
@@ -160,6 +172,8 @@
     if (Object.values(otpData).every((v) => v !== '')) {
       void validateOtp()
     }
+
+    return true
   }
 
   $: if (formElement != null) {

plugins/login-resources/src/index.ts

@@ -62,16 +62,9 @@ export const pages = [
   'confirm',
   'confirmationSend',
   'auth',
-  'login-password',
+  'login-password'
-  'onboard'
 ] as const
 
-export enum OnboardSteps {
-  Workspace = 'workspace',
-  User = 'user',
-  Finish = 'finish'
-}
-
 export enum OtpLoginSteps {
   Email = 'email',
   Otp = 'otp'

plugins/login-resources/src/plugin.ts

@@ -67,12 +67,6 @@ export default mergeIds(loginId, login, {
     SentTo: '' as IntlString,
     CanFindCode: '' as IntlString,
     LoginWithCode: '' as IntlString,
-    LoginWithPassword: '' as IntlString,
+    LoginWithPassword: '' as IntlString
-    FillInProfile: '' as IntlString,
-    SetUpPassword: '' as IntlString,
-    Next: '' as IntlString,
-    Skip: '' as IntlString,
-    SignUpCompleted: '' as IntlString,
-    StartUsingHuly: '' as IntlString
   }
 })

plugins/login-resources/src/utils.ts

@@ -521,7 +521,7 @@ export async function getInviteLinkId (
 ): Promise<string> {
   const accountsUrl = getMetadata(login.metadata.AccountsUrl)
 
-  const exp = expHours * 1000 * 60 * 60
+  const exp = expHours < 0 ? -1 : expHours * 1000 * 60 * 60
 
   if (accountsUrl === undefined) {
     throw new Error('accounts url not specified')
@@ -872,10 +872,10 @@ export function getHref (path: Pages): string {
   return host + url
 }
 
-export async function afterConfirm (wspage: 'onboard' | 'createWorkspace' = 'createWorkspace'): Promise<void> {
+export async function afterConfirm (): Promise<void> {
   const joinedWS = await getWorkspaces()
   if (joinedWS.length === 0) {
-    goTo(wspage)
+    goTo('createWorkspace')
   } else if (joinedWS.length === 1) {
     const result = (await selectWorkspace(joinedWS[0].workspace, null))[1]
     if (result !== undefined) {
@@ -1044,12 +1044,3 @@ export async function doLoginNavigate (
     navigate(loc)
   }
 }
-
-export async function ensureConfirmed (account: LoginInfo): Promise<void> {
-  if (!account.confirmed) {
-    const loc = getCurrentLocation()
-    loc.path[1] = 'confirmationSend'
-    loc.path.length = 2
-    navigate(loc)
-  }
-}

pods/authProviders/src/token.ts

@@ -55,7 +55,7 @@ export function registerToken (
 
         measureCtx.info('Success auth, redirect', { email: user.email, type: 'token' })
         // Successful authentication, redirect to your application
-        ctx.redirect(concatLink(branding?.front ?? frontUrl, '/login/auth'))
+        ctx.redirect(concatLink(branding?.front ?? frontUrl, '/onboard/auth'))
       }
       await next()
     }

server-plugins/chunter-resources/src/index.ts

@@ -515,7 +515,6 @@ async function hideOldActivityChannels (
     const { lastUpdateTimestamp = 0, lastViewedTimestamp = 0 } = context
 
     if (lastUpdateTimestamp > lastViewedTimestamp) continue
-    console.log({ diff: date - lastUpdateTimestamp, delay: hideChannelDelay })
     if (date - lastUpdateTimestamp < hideChannelDelay) continue
 
     const params = hierarchy.as(context, chunter.mixin.ChannelInfo)

server/account-service/src/index.ts

@@ -9,9 +9,8 @@ import account, {
   accountId,
   cleanExpiredOtp,
   cleanInProgressWorkspaces,
-  getMethods,
+  getAllTransactors,
-  cleanExpiredOtp,
+  getMethods
-  getAllTransactors
 } from '@hcengineering/account'
 import accountEn from '@hcengineering/account/lang/en.json'
 import accountRu from '@hcengineering/account/lang/ru.json'
@@ -113,8 +112,6 @@ export function serveAccount (
 
   let worker: UpgradeWorker | undefined
 
-  let worker: UpgradeWorker | undefined
-
   const app = new Koa()
   const router = new Router()
 

server/account/src/operations.ts

@@ -24,7 +24,6 @@ import contact, {
   Person,
   PersonAccount
 } from '@hcengineering/contact'
-import { buildStorageFromConfig, storageConfigFromEnv } from '@hcengineering/server-storage'
 import core, {
   AccountRole,
   BaseWorkspaceInfo,
@@ -40,30 +39,17 @@ import core, {
   Ref,
   roleOrder,
   systemAccountEmail,
+  Timestamp,
   Tx,
   TxOperations,
   Version,
   versionToString,
   WorkspaceId,
-  Timestamp,
   WorkspaceIdWithUrl,
   type Branding
 } from '@hcengineering/core'
 import { consoleModelLogger, MigrateOperation, ModelLogger } from '@hcengineering/model'
 import platform, { getMetadata, PlatformError, Severity, Status, translate } from '@hcengineering/platform'
-import { decodeToken, generateToken } from '@hcengineering/server-token'
-import toolPlugin, {
-  connect,
-  initializeWorkspace,
-  initModel,
-  updateModel,
-  prepareTools,
-  upgradeModel
-} from '@hcengineering/server-tool'
-import { pbkdf2Sync, randomBytes } from 'crypto'
-import { Binary, Db, Filter, ObjectId, type MongoClient } from 'mongodb'
-import fetch from 'node-fetch'
-import otpGenerator from 'otp-generator'
 import {
   DummyFullTextAdapter,
   Pipeline,
@@ -78,6 +64,20 @@ import {
   registerServerPlugins,
   registerStringLoaders
 } from '@hcengineering/server-pipeline'
+import { buildStorageFromConfig, storageConfigFromEnv } from '@hcengineering/server-storage'
+import { decodeToken, generateToken } from '@hcengineering/server-token'
+import toolPlugin, {
+  connect,
+  initializeWorkspace,
+  initModel,
+  prepareTools,
+  updateModel,
+  upgradeModel
+} from '@hcengineering/server-tool'
+import { pbkdf2Sync, randomBytes } from 'crypto'
+import { Binary, Db, Filter, ObjectId, type MongoClient } from 'mongodb'
+import fetch from 'node-fetch'
+import otpGenerator from 'otp-generator'
 
 import { accountPlugin } from './plugin'
 
@@ -692,7 +692,7 @@ export async function checkInvite (ctx: MeasureContext, invite: Invite | null, e
     Analytics.handleError(new Error(`no invite or invite limit exceed ${email}`))
     throw new PlatformError(new Status(Severity.ERROR, platform.status.Forbidden, {}))
   }
-  if (invite.exp < Date.now()) {
+  if (invite.exp !== -1 && invite.exp < Date.now()) {
     ctx.error('invite', { email, state: 'link expired' })
     Analytics.handleError(new Error(`invite link expired ${invite._id.toString()} ${email}`))
     throw new PlatformError(new Status(Severity.ERROR, platform.status.ExpiredLink, {}))
@@ -1577,7 +1577,7 @@ export async function getInviteLink (
   ctx.info('Getting invite link', { workspace: workspace.name, emailMask, limit })
   const data: Omit<Invite, '_id'> = {
     workspace,
-    exp: Date.now() + exp,
+    exp: exp < 0 ? -1 : Date.now() + exp,
     emailMask,
     limit,
     role: role ?? AccountRole.User