Use the provided alias for new accounts

Author: gonzaloriestra

packages/cli-kit/src/private/node/session.ts

@@ -301,12 +301,13 @@ async function executeCompleteFlow(applications: OAuthApplications, alias?: stri
   outputDebug(outputContent`CLI token received. Exchanging it for application tokens...`)
   const result = await exchangeAccessForApplicationTokens(identityToken, exchangeScopes, store)
 
-  const defaultAlias = alias ?? identityToken.userId
-  const finalAlias = await renderTextPrompt({
-    message: 'Enter an alias to identify this account',
-    defaultValue: defaultAlias,
-    allowEmpty: false,
-  })
+  const finalAlias =
+    alias ??
+    (await renderTextPrompt({
+      message: 'Enter an alias to identify this account',
+      defaultValue: identityToken.userId,
+      allowEmpty: false,
+    }))
 
   const session: Session = {
     identity: {

packages/cli-kit/src/private/node/session/store.test.ts

@@ -1,4 +1,4 @@
-import {ApplicationToken, Sessions} from './schema.js'
+import {Sessions} from './schema.js'
 import {store, fetch, remove, getSessionAlias, updateSessionAlias, findSessionByAlias} from './store.js'
 import {getSessions, removeSessions, setSessions, removeCurrentSessionId} from '../conf-store.js'
 import {identityFqdn} from '../../../public/node/context/fqdn.js'
@@ -232,17 +232,17 @@ describe('session store', () => {
         'identity.fqdn.com': {
           user1: {
             identity: {
-              ...mockSessions['identity.fqdn.com'].user1.identity,
+              ...mockSessions['identity.fqdn.com']!.user1!.identity,
               alias: 'Duplicate Alias',
             },
-            applications: mockSessions['identity.fqdn.com'].user1.applications,
+            applications: mockSessions['identity.fqdn.com']!.user1!.applications,
           },
           user2: {
             identity: {
-              ...mockSessions['identity.fqdn.com'].user2.identity,
+              ...mockSessions['identity.fqdn.com']!.user2!.identity,
               alias: 'Duplicate Alias',
             },
-            applications: mockSessions['identity.fqdn.com'].user2.applications,
+            applications: mockSessions['identity.fqdn.com']!.user2!.applications,
           },
         },
       }
@@ -256,30 +256,3 @@ describe('session store', () => {
     })
   })
 })
-
-function testSession(): Sessions {
-  const testToken: ApplicationToken = {
-    accessToken: 'access',
-    expiresAt: new Date(),
-    scopes: [],
-  }
-  return {
-    'accounts.shopify.com': {
-      '1234-5678': {
-        identity: {
-          accessToken: 'accessToken',
-          refreshToken: 'refreshToken',
-          expiresAt: new Date(),
-          scopes: ['foo'],
-          userId: '1234-5678',
-          alias: '1234-5678',
-        },
-        applications: {
-          adminApi: testToken,
-          partnersApi: testToken,
-          storefrontRendererApi: testToken,
-        },
-      },
-    },
-  }
-}

packages/cli/src/cli/commands/auth/logout.test.ts

@@ -15,6 +15,6 @@ describe('logs out', () => {
 
     // Then
     expect(logout).toHaveBeenCalledOnce()
-    expect(outputMock.success()).toMatchInlineSnapshot('"Logged out from Shopify"')
+    expect(outputMock.success()).toMatchInlineSnapshot('"Logged out from all the accounts"')
   })
 })

packages/cli/src/cli/commands/auth/logout.ts

@@ -7,6 +7,6 @@ export default class Logout extends Command {
 
   async run(): Promise<void> {
     await logout()
-    outputSuccess('Logged out from Shopify')
+    outputSuccess('Logged out from all the accounts')
   }
 }