@forge/cli-shared 5.1.0-next.1 → 5.1.0-next.3

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @forge/cli-shared
 
+## 5.1.0-next.3
+
+### Patch Changes
+
+- Updated dependencies [8944e0c]
+  - @forge/manifest@7.4.1-next.1
+
+## 5.1.0-next.2
+
+### Patch Changes
+
+- 7bf2dda: Get AAID from AGG when credentials are supplied via environment
+
 ## 5.1.0-next.1
 
 ### Minor Changes

package/out/auth/personal/credential-store.d.ts

@@ -1,7 +1,8 @@
 import * as t from 'io-ts';
-import { Logger } from '../../ui';
 import { CachedConf } from '../../cache';
 import { UserError } from '../../shared';
+import { Logger } from '../../ui';
+import { UserRepository } from './user-repository';
 export declare const EMAIL_KEY = "FORGE_EMAIL";
 export declare const API_TOKEN_KEY = "FORGE_API_TOKEN";
 export interface Keytar {
@@ -30,7 +31,6 @@ export declare class KeytarAccessError extends UserError {
 }
 export interface CredentialGetter {
     getCredentials(): Promise<PersonalApiCredentialsValidated>;
-    getInstructionsWhenInvalid(): string;
 }
 export interface CredentialStore extends CredentialGetter {
     setCredentials(credentials: PersonalApiCredentialsValidated): Promise<void>;
@@ -41,8 +41,9 @@ export declare class CredentialStoreImpl implements CredentialStore {
     private readonly instructionsURL;
     private readonly keytar;
     private readonly cachedConfig;
+    private readonly userRepository;
     private keytarAccount;
-    constructor(logger: Logger, instructionsURL: string, keytar: Keytar | null, cachedConfig: CachedConf);
+    constructor(logger: Logger, instructionsURL: string, keytar: Keytar | null, cachedConfig: CachedConf, userRepository: UserRepository);
     private wrapKeytarError;
     decodeCredentials(credentialsString: string | null): PersonalApiCredentialsValidated;
     getCredentialsKeytar(keytar: Keytar): Promise<PersonalApiCredentialsValidated | undefined>;
@@ -51,7 +52,6 @@ export declare class CredentialStoreImpl implements CredentialStore {
     getCredentials(): Promise<PersonalApiCredentialsValidated>;
     setCredentials(credentials: PersonalApiCredentialsValidated): Promise<void>;
     deleteCredentials(): Promise<void>;
-    getInstructionsWhenInvalid(): string;
 }
-export declare function getCredentialStore(logger: Logger): CredentialStore;
+export declare function getCredentialStore(logger: Logger, userRepository: UserRepository): CredentialStore;
 //# sourceMappingURL=credential-store.d.ts.map

package/out/auth/personal/credential-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"credential-store.d.ts","sourceRoot":"","sources":["../../../src/auth/personal/credential-store.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,OAAO,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAQ,MAAM,UAAU,CAAC;AACxC,OAAO,EAAuB,UAAU,EAAE,MAAM,aAAa,CAAC;AAG9D,OAAO,EAAE,SAAS,EAAa,MAAM,cAAc,CAAC;AAEpD,eAAO,MAAM,SAAS,gBAAgB,CAAC;AACvC,eAAO,MAAM,aAAa,oBAAoB,CAAC;AAc/C,MAAM,WAAW,MAAM;IACrB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAEtE,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/E,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACjE;AAUD,eAAO,MAAM,2BAA2B;;;EAGtC,CAAC;AAEH,eAAO,MAAM,oCAAoC;;;;EAI/C,CAAC;AAEH,oBAAY,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,2BAA2B,CAAC,CAAC;AAClF,oBAAY,+BAA+B,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,oCAAoC,CAAC,CAAC;AAEpG,qBAAa,mBAAoB,SAAQ,SAAS;;CAIjD;AAED,qBAAa,aAAc,SAAQ,SAAS;;CAI3C;AAED,qBAAa,iBAAkB,SAAQ,SAAS;CAAG;AAEnD,MAAM,WAAW,gBAAgB;IAC/B,cAAc,IAAI,OAAO,CAAC,+BAA+B,CAAC,CAAC;IAE3D,0BAA0B,IAAI,MAAM,CAAC;CACtC;AAED,MAAM,WAAW,eAAgB,SAAQ,gBAAgB;IACvD,cAAc,CAAC,WAAW,EAAE,+BAA+B,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5E,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC;AAED,qBAAa,mBAAoB,YAAW,eAAe;IAIvD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAN/B,OAAO,CAAC,aAAa,CAAS;gBAGX,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,YAAY,EAAE,UAAU;IAK3C,OAAO,CAAC,eAAe;IAoBvB,iBAAiB,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,+BAA+B;IAoB9E,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,+BAA+B,GAAG,SAAS,CAAC;IAehG,+BAA+B,IAAI,+BAA+B,GAAG,SAAS;IAS9E,kCAAkC,IAAI,IAAI;IAIpC,cAAc,IAAI,OAAO,CAAC,+BAA+B,CAAC;IA6B1D,cAAc,CAAC,WAAW,EAAE,+BAA+B,GAAG,OAAO,CAAC,IAAI,CAAC;IAY3E,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAYxC,0BAA0B,IAAI,MAAM;CAMrC;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,CAKlE"}
+{"version":3,"file":"credential-store.d.ts","sourceRoot":"","sources":["../../../src/auth/personal/credential-store.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,OAAO,CAAC;AAC3B,OAAO,EAAuB,UAAU,EAAE,MAAM,aAAa,CAAC;AAG9D,OAAO,EAAE,SAAS,EAAa,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,MAAM,EAAQ,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,eAAO,MAAM,SAAS,gBAAgB,CAAC;AACvC,eAAO,MAAM,aAAa,oBAAoB,CAAC;AAa/C,MAAM,WAAW,MAAM;IACrB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAEtE,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/E,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACjE;AAUD,eAAO,MAAM,2BAA2B;;;EAGtC,CAAC;AAEH,eAAO,MAAM,oCAAoC;;;;EAI/C,CAAC;AAEH,oBAAY,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,2BAA2B,CAAC,CAAC;AAClF,oBAAY,+BAA+B,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,oCAAoC,CAAC,CAAC;AAEpG,qBAAa,mBAAoB,SAAQ,SAAS;;CAIjD;AAED,qBAAa,aAAc,SAAQ,SAAS;;CAI3C;AAED,qBAAa,iBAAkB,SAAQ,SAAS;CAAG;AAEnD,MAAM,WAAW,gBAAgB;IAC/B,cAAc,IAAI,OAAO,CAAC,+BAA+B,CAAC,CAAC;CAC5D;AAED,MAAM,WAAW,eAAgB,SAAQ,gBAAgB;IACvD,cAAc,CAAC,WAAW,EAAE,+BAA+B,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5E,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC;AAED,qBAAa,mBAAoB,YAAW,eAAe;IAIvD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAPjC,OAAO,CAAC,aAAa,CAAS;gBAGX,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,YAAY,EAAE,UAAU,EACxB,cAAc,EAAE,cAAc;IAKjD,OAAO,CAAC,eAAe;IAoBvB,iBAAiB,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,+BAA+B;IAoB9E,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,+BAA+B,GAAG,SAAS,CAAC;IAehG,+BAA+B,IAAI,+BAA+B,GAAG,SAAS;IAS9E,kCAAkC,IAAI,IAAI;IAIpC,cAAc,IAAI,OAAO,CAAC,+BAA+B,CAAC;IA8B1D,cAAc,CAAC,WAAW,EAAE,+BAA+B,GAAG,OAAO,CAAC,IAAI,CAAC;IAY3E,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;CAWzC;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,GAAG,eAAe,CAKlG"}

package/out/auth/personal/credential-store.js

@@ -5,14 +5,13 @@ const tslib_1 = require("tslib");
 const os_1 = require("os");
 const Either_1 = require("fp-ts/lib/Either");
 const t = tslib_1.__importStar(require("io-ts"));
-const ui_1 = require("../../ui");
 const cache_1 = require("../../cache");
 const instruction_1 = require("../instruction");
 const graphql_1 = require("../../graphql");
 const shared_1 = require("../../shared");
+const ui_1 = require("../../ui");
 exports.EMAIL_KEY = 'FORGE_EMAIL';
 exports.API_TOKEN_KEY = 'FORGE_API_TOKEN';
-const AAID_KEY = 'FORGE_AAID';
 const KEYTAR_SERVICE = 'Atlassian';
 const CACHE_CREDENTIALS_KEY = 'forge-credentials';
 var KeytarAccount;
@@ -60,12 +59,14 @@ class CredentialStoreImpl {
     instructionsURL;
     keytar;
     cachedConfig;
+    userRepository;
     keytarAccount;
-    constructor(logger, instructionsURL, keytar, cachedConfig) {
+    constructor(logger, instructionsURL, keytar, cachedConfig, userRepository) {
         this.logger = logger;
         this.instructionsURL = instructionsURL;
         this.keytar = keytar;
         this.cachedConfig = cachedConfig;
+        this.userRepository = userRepository;
         this.keytarAccount = (0, graphql_1.getEnvironment)(KeytarAccount);
     }
     wrapKeytarError(e) {
@@ -140,11 +141,12 @@ class CredentialStoreImpl {
             }
         }
         if (process.env[exports.API_TOKEN_KEY] && process.env[exports.EMAIL_KEY]) {
-            return {
+            const credentials = {
                 email: process.env[exports.EMAIL_KEY],
-                token: process.env[exports.API_TOKEN_KEY],
-                accountId: process.env[AAID_KEY] || ''
+                token: process.env[exports.API_TOKEN_KEY]
             };
+            const { accountId } = await this.userRepository.getUser(credentials);
+            return { ...credentials, accountId };
         }
         if (this.keytar) {
             const result = await this.getCredentialsKeytar(this.keytar);
@@ -177,18 +179,12 @@ class CredentialStoreImpl {
         }
         this.deleteInsecurePlaintextCredentials();
     }
-    getInstructionsWhenInvalid() {
-        if (process.env[exports.API_TOKEN_KEY] && process.env[exports.EMAIL_KEY]) {
-            return ui_1.Text.error.invalidTokenInEnv(this.instructionsURL, exports.EMAIL_KEY, exports.API_TOKEN_KEY);
-        }
-        return ui_1.Text.error.invalidTokenInKeytar;
-    }
 }
 exports.CredentialStoreImpl = CredentialStoreImpl;
-function getCredentialStore(logger) {
+function getCredentialStore(logger, userRepository) {
     const keytar = getKeytar();
     const cachedConfig = cache_1.CachedConf.getCache(cache_1.CONFIG_PROJECT_NAME);
     const instructionsUrl = (0, instruction_1.getInstructionsUrl)();
-    return new CredentialStoreImpl(logger, instructionsUrl, keytar, cachedConfig);
+    return new CredentialStoreImpl(logger, instructionsUrl, keytar, cachedConfig, userRepository);
 }
 exports.getCredentialStore = getCredentialStore;

package/out/auth/personal/index.d.ts

@@ -3,4 +3,5 @@ export * from './login';
 export * from './logout';
 export * from './me-graphql-client';
 export * from './token-authenticator';
+export * from './user-repository';
 //# sourceMappingURL=index.d.ts.map

package/out/auth/personal/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/auth/personal/index.ts"],"names":[],"mappings":"AAEA,cAAc,oBAAoB,CAAC;AACnC,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/auth/personal/index.ts"],"names":[],"mappings":"AAEA,cAAc,oBAAoB,CAAC;AACnC,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC"}

package/out/auth/personal/index.js

@@ -6,3 +6,4 @@ tslib_1.__exportStar(require("./login"), exports);
 tslib_1.__exportStar(require("./logout"), exports);
 tslib_1.__exportStar(require("./me-graphql-client"), exports);
 tslib_1.__exportStar(require("./token-authenticator"), exports);
+tslib_1.__exportStar(require("./user-repository"), exports);

package/out/auth/personal/login.d.ts

@@ -1,19 +1,10 @@
-import { GraphQLClient, User } from '../../graphql';
-import { Logger } from '../../ui';
-import { Authenticator } from '../../auth';
-import { CredentialStore, PersonalApiCredentials, PersonalApiCredentialsValidated } from './credential-store';
+import { User } from '../../graphql';
+import { UserRepository } from '../../auth';
+import { CredentialStore, PersonalApiCredentials } from './credential-store';
 export declare class LoginCommand {
-    private readonly createGraphQLClient;
+    private readonly userRepository;
     private readonly store;
-    private readonly logger;
-    constructor(createGraphQLClient: (authenticator: Authenticator) => GraphQLClient, store: CredentialStore, logger: Logger);
-    execute(credentials: PersonalApiCredentials): Promise<{
-        user: User;
-        creds: PersonalApiCredentialsValidated;
-        analytics: {
-            userId: string;
-        };
-    }>;
-    getUser(credentials: PersonalApiCredentials): Promise<User>;
+    constructor(userRepository: UserRepository, store: CredentialStore);
+    execute(credentials: PersonalApiCredentials): Promise<User>;
 }
 //# sourceMappingURL=login.d.ts.map

package/out/auth/personal/login.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../src/auth/personal/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAI3C,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,+BAA+B,EAAE,MAAM,oBAAoB,CAAC;AAE9G,qBAAa,YAAY;IAErB,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAFN,mBAAmB,EAAE,CAAC,aAAa,EAAE,aAAa,KAAK,aAAa,EACpE,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,MAAM;IAGpB,OAAO,CAAC,WAAW,EAAE,sBAAsB,GAAG,OAAO,CAAC;QACjE,IAAI,EAAE,IAAI,CAAC;QACX,KAAK,EAAE,+BAA+B,CAAC;QACvC,SAAS,EAAE;YAAE,MAAM,EAAE,MAAM,CAAA;SAAE,CAAC;KAC/B,CAAC;IAmBW,OAAO,CAAC,WAAW,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;CAUzE"}
+{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../src/auth/personal/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAErC,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAE7E,qBAAa,YAAY;IAErB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,KAAK;gBADL,cAAc,EAAE,cAAc,EAC9B,KAAK,EAAE,eAAe;IAG5B,OAAO,CAAC,WAAW,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;CAOzE"}

package/out/auth/personal/login.js

@@ -1,40 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoginCommand = void 0;
-const me_graphql_client_1 = require("./me-graphql-client");
-const token_authenticator_1 = require("./token-authenticator");
 class LoginCommand {
-    createGraphQLClient;
+    userRepository;
     store;
-    logger;
-    constructor(createGraphQLClient, store, logger) {
-        this.createGraphQLClient = createGraphQLClient;
+    constructor(userRepository, store) {
+        this.userRepository = userRepository;
         this.store = store;
-        this.logger = logger;
     }
     async execute(credentials) {
-        const user = await this.getUser(credentials);
-        const creds = {
-            ...credentials,
-            accountId: user.accountId
-        };
-        await this.store.setCredentials(creds);
-        return {
-            user,
-            creds,
-            analytics: {
-                userId: creds.accountId
-            }
-        };
-    }
-    async getUser(credentials) {
-        const authenticator = new token_authenticator_1.PersonalTokenAuthenticator({
-            getCredentials: async () => ({ ...credentials, accountId: '' }),
-            getInstructionsWhenInvalid: this.store.getInstructionsWhenInvalid
-        });
-        const graphqlClient = this.createGraphQLClient(authenticator);
-        const meClient = new me_graphql_client_1.MeGraphqlClient(graphqlClient, this.logger);
-        return await meClient.getUser();
+        const user = await this.userRepository.getUser(credentials);
+        await this.store.setCredentials({ ...credentials, accountId: user.accountId });
+        return user;
     }
 }
 exports.LoginCommand = LoginCommand;

package/out/auth/personal/token-authenticator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token-authenticator.d.ts","sourceRoot":"","sources":["../../../src/auth/personal/token-authenticator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,qBAAa,0BAA2B,YAAW,aAAa;IAClD,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAAf,eAAe,EAAE,gBAAgB;IAEjD,sBAAsB;IAO5B,0BAA0B,IAAI,MAAM;CAG5C"}
+{"version":3,"file":"token-authenticator.d.ts","sourceRoot":"","sources":["../../../src/auth/personal/token-authenticator.ts"],"names":[],"mappings":"AACA,OAAO,EAA+B,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAE9E,OAAO,EAAiB,gBAAgB,EAAa,MAAM,oBAAoB,CAAC;AAEhF,qBAAa,0BAA2B,YAAW,aAAa;IAClD,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAAf,eAAe,EAAE,gBAAgB;IAEjD,sBAAsB;IAO5B,0BAA0B,IAAI,MAAM;CAO5C"}

package/out/auth/personal/token-authenticator.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PersonalTokenAuthenticator = void 0;
+const ui_1 = require("../../ui");
 const authenticator_1 = require("../authenticator");
+const instruction_1 = require("../instruction");
+const credential_store_1 = require("./credential-store");
 class PersonalTokenAuthenticator {
     credentialStore;
     constructor(credentialStore) {
@@ -12,7 +15,11 @@ class PersonalTokenAuthenticator {
         return (0, authenticator_1.getBasicAuthorizationHeader)(email, token);
     }
     getInstructionsWhenInvalid() {
-        return this.credentialStore.getInstructionsWhenInvalid();
+        const instructionsUrl = (0, instruction_1.getInstructionsUrl)();
+        if (process.env[credential_store_1.API_TOKEN_KEY] && process.env[credential_store_1.EMAIL_KEY]) {
+            return ui_1.Text.error.invalidTokenInEnv(instructionsUrl, credential_store_1.EMAIL_KEY, credential_store_1.API_TOKEN_KEY);
+        }
+        return ui_1.Text.error.invalidTokenInKeytar;
     }
 }
 exports.PersonalTokenAuthenticator = PersonalTokenAuthenticator;

package/out/auth/personal/user-repository.d.ts

@@ -0,0 +1,14 @@
+import { GraphQLClient, User } from '../../graphql';
+import { Logger } from '../../ui';
+import { Authenticator } from '..';
+import { PersonalApiCredentials } from './credential-store';
+export interface UserRepository {
+    getUser(credentials: PersonalApiCredentials): Promise<User>;
+}
+export declare class UserRepositoryImpl {
+    private readonly createGraphQLClient;
+    private readonly logger;
+    constructor(createGraphQLClient: (authenticator: Authenticator) => GraphQLClient, logger: Logger);
+    getUser(credentials: PersonalApiCredentials): Promise<User>;
+}
+//# sourceMappingURL=user-repository.d.ts.map

package/out/auth/personal/user-repository.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"user-repository.d.ts","sourceRoot":"","sources":["../../../src/auth/personal/user-repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AAInC,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAE5D,MAAM,WAAW,cAAc;IAC7B,OAAO,CAAC,WAAW,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7D;AAED,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADN,mBAAmB,EAAE,CAAC,aAAa,EAAE,aAAa,KAAK,aAAa,EACpE,MAAM,EAAE,MAAM;IAGpB,OAAO,CAAC,WAAW,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;CASzE"}

package/out/auth/personal/user-repository.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserRepositoryImpl = void 0;
+const me_graphql_client_1 = require("./me-graphql-client");
+const token_authenticator_1 = require("./token-authenticator");
+class UserRepositoryImpl {
+    createGraphQLClient;
+    logger;
+    constructor(createGraphQLClient, logger) {
+        this.createGraphQLClient = createGraphQLClient;
+        this.logger = logger;
+    }
+    async getUser(credentials) {
+        const authenticator = new token_authenticator_1.PersonalTokenAuthenticator({
+            getCredentials: async () => ({ ...credentials, accountId: '' })
+        });
+        const graphqlClient = this.createGraphQLClient(authenticator);
+        const meClient = new me_graphql_client_1.MeGraphqlClient(graphqlClient, this.logger);
+        return await meClient.getUser();
+    }
+}
+exports.UserRepositoryImpl = UserRepositoryImpl;

package/out/graphql/graphql-types.d.ts

@@ -2510,6 +2510,7 @@ export declare type CcpEntitlementExperienceCapabilitiesChangeOfferingArgs = {
 };
 export declare type CcpEntitlementExperienceCapabilitiesChangeOfferingV2Args = {
     offeringKey?: InputMaybe<Scalars['ID']['input']>;
+    skipTrial?: InputMaybe<Scalars['Boolean']['input']>;
 };
 export declare type CcpEntitlementPreDunning = CommerceEntitlementPreDunning & {
     __typename?: 'CcpEntitlementPreDunning';
@@ -27726,9 +27727,10 @@ export declare type HelpLayoutAnnouncementElementData = {
 export declare type HelpLayoutAnnouncementInput = {
     visualConfig?: InputMaybe<HelpLayoutVisualConfigInput>;
 };
-export declare type HelpLayoutAtomicElement = HelpLayoutAnnouncementElement | HelpLayoutHeadingAtomicElement | HelpLayoutHeroElement | HelpLayoutImageAtomicElement | HelpLayoutParagraphAtomicElement | HelpLayoutPortalsListElement | HelpLayoutSearchAtomicElement | HelpLayoutSuggestedRequestFormsListElement | HelpLayoutTopicsListElement;
+export declare type HelpLayoutAtomicElement = HelpLayoutAnnouncementElement | HelpLayoutEditorElement | HelpLayoutHeadingAtomicElement | HelpLayoutHeroElement | HelpLayoutImageAtomicElement | HelpLayoutParagraphAtomicElement | HelpLayoutPortalsListElement | HelpLayoutSearchAtomicElement | HelpLayoutSuggestedRequestFormsListElement | HelpLayoutTopicsListElement;
 export declare type HelpLayoutAtomicElementInput = {
     announcementInput?: InputMaybe<HelpLayoutAnnouncementInput>;
+    editorInput?: InputMaybe<HelpLayoutEditorInput>;
     elementTypeKey: HelpLayoutAtomicElementKey;
     headingConfigInput?: InputMaybe<HelpLayoutHeadingConfigInput>;
     heroElementInput?: InputMaybe<HelpLayoutHeroElementInput>;
@@ -27741,6 +27743,7 @@ export declare type HelpLayoutAtomicElementInput = {
 };
 export declare enum HelpLayoutAtomicElementKey {
     Announcement = "ANNOUNCEMENT",
+    Editor = "EDITOR",
     Heading = "HEADING",
     Hero = "HERO",
     Image = "IMAGE",
@@ -27797,13 +27800,25 @@ export declare type HelpLayoutCreationInput = {
     parentAri: Scalars['ID']['input'];
     sections: Array<HelpLayoutSectionInput>;
 };
-export declare type HelpLayoutElement = HelpLayoutAnnouncementElement | HelpLayoutHeadingAtomicElement | HelpLayoutHeroElement | HelpLayoutImageAtomicElement | HelpLayoutLinkCardCompositeElement | HelpLayoutParagraphAtomicElement | HelpLayoutPortalsListElement | HelpLayoutSearchAtomicElement | HelpLayoutSuggestedRequestFormsListElement | HelpLayoutTopicsListElement | QueryError;
+export declare type HelpLayoutEditorElement = HelpLayoutVisualEntity & Node & {
+    __typename?: 'HelpLayoutEditorElement';
+    adf?: Maybe<Scalars['String']['output']>;
+    elementType?: Maybe<HelpLayoutAtomicElementType>;
+    id: Scalars['ID']['output'];
+    visualConfig?: Maybe<HelpLayoutVisualConfig>;
+};
+export declare type HelpLayoutEditorInput = {
+    adf: Scalars['String']['input'];
+    visualConfig?: InputMaybe<HelpLayoutVisualConfigInput>;
+};
+export declare type HelpLayoutElement = HelpLayoutAnnouncementElement | HelpLayoutEditorElement | HelpLayoutHeadingAtomicElement | HelpLayoutHeroElement | HelpLayoutImageAtomicElement | HelpLayoutLinkCardCompositeElement | HelpLayoutParagraphAtomicElement | HelpLayoutPortalsListElement | HelpLayoutSearchAtomicElement | HelpLayoutSuggestedRequestFormsListElement | HelpLayoutTopicsListElement | QueryError;
 export declare enum HelpLayoutElementCategory {
     Basic = "BASIC",
     Navigation = "NAVIGATION"
 }
 export declare type HelpLayoutElementInput = {
     announcementInput?: InputMaybe<HelpLayoutAnnouncementInput>;
+    editorInput?: InputMaybe<HelpLayoutEditorInput>;
     elementTypeKey: HelpLayoutElementKey;
     headingConfigInput?: InputMaybe<HelpLayoutHeadingConfigInput>;
     heroElementInput?: InputMaybe<HelpLayoutHeroElementInput>;
@@ -27817,6 +27832,7 @@ export declare type HelpLayoutElementInput = {
 };
 export declare enum HelpLayoutElementKey {
     Announcement = "ANNOUNCEMENT",
+    Editor = "EDITOR",
     Heading = "HEADING",
     Hero = "HERO",
     Image = "IMAGE",
@@ -42618,6 +42634,11 @@ export declare type JsmChatCreateConversationResponse = {
     __typename?: 'JsmChatCreateConversationResponse';
     id: Scalars['ID']['output'];
 };
+export declare type JsmChatDeleteSlackChannelMappingOutput = {
+    __typename?: 'JsmChatDeleteSlackChannelMappingOutput';
+    message?: Maybe<Scalars['String']['output']>;
+    status?: Maybe<Scalars['Boolean']['output']>;
+};
 export declare type JsmChatDisconnectJiraProjectInput = {
     activationId: Scalars['ID']['input'];
     projectId: Scalars['ID']['input'];
@@ -42697,6 +42718,7 @@ export declare type JsmChatMutation = {
     createComment?: Maybe<JsmChatCreateCommentOutput>;
     createConversation?: Maybe<JsmChatCreateConversationPayload>;
     createConversationMessage?: Maybe<JsmChatCreateConversationMessagePayload>;
+    deleteSlackChannelMapping: JsmChatDeleteSlackChannelMappingOutput;
     disconnectJiraProject?: Maybe<JsmChatDisconnectJiraProjectResponse>;
     disconnectMsTeamsJiraProject?: Maybe<JsmChatDisconnectJiraProjectResponse>;
     updateChannelSettings: JsmChatUpdateChannelSettingsOutput;
@@ -42727,6 +42749,10 @@ export declare type JsmChatMutationCreateConversationMessageArgs = {
     input: JsmChatCreateConversationMessageInput;
     workspaceAri: Scalars['ID']['input'];
 };
+export declare type JsmChatMutationDeleteSlackChannelMappingArgs = {
+    jiraProjectAri: Scalars['ID']['input'];
+    slackChannelAri: Scalars['ID']['input'];
+};
 export declare type JsmChatMutationDisconnectJiraProjectArgs = {
     input: JsmChatDisconnectJiraProjectInput;
 };
@@ -43768,17 +43794,17 @@ export declare type MarketplaceConsoleDevSpaceProgramEnrollment = {
 };
 export declare type MarketplaceConsoleDevSpaceSupportAvailability = {
     __typename?: 'MarketplaceConsoleDevSpaceSupportAvailability';
-    availableFrom?: Maybe<Scalars['String']['output']>;
-    availableTo?: Maybe<Scalars['String']['output']>;
-    days?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
-    holidays?: Maybe<Array<Maybe<MarketplaceConsoleDevSpaceSupportContactHoliday>>>;
-    timezone?: Maybe<Scalars['String']['output']>;
+    availableFrom: Scalars['String']['output'];
+    availableTo: Scalars['String']['output'];
+    days?: Maybe<Array<Scalars['String']['output']>>;
+    holidays?: Maybe<Array<MarketplaceConsoleDevSpaceSupportContactHoliday>>;
+    timezone: Scalars['String']['output'];
 };
 export declare type MarketplaceConsoleDevSpaceSupportContactHoliday = {
     __typename?: 'MarketplaceConsoleDevSpaceSupportContactHoliday';
-    date?: Maybe<Scalars['String']['output']>;
-    repeatAnnually?: Maybe<Scalars['Boolean']['output']>;
-    title?: Maybe<Scalars['String']['output']>;
+    date: Scalars['String']['output'];
+    repeatAnnually: Scalars['Boolean']['output'];
+    title: Scalars['String']['output'];
 };
 export declare type MarketplaceConsoleDevSpaceSupportDetails = {
     __typename?: 'MarketplaceConsoleDevSpaceSupportDetails';
@@ -43787,6 +43813,7 @@ export declare type MarketplaceConsoleDevSpaceSupportDetails = {
     contactName?: Maybe<Scalars['String']['output']>;
     contactPhone?: Maybe<Scalars['String']['output']>;
     emergencyContact?: Maybe<Scalars['String']['output']>;
+    slaUrl?: Maybe<Scalars['String']['output']>;
     targetResponseTimeInHrs?: Maybe<Scalars['Int']['output']>;
     url?: Maybe<Scalars['String']['output']>;
 };
@@ -50757,6 +50784,7 @@ export declare type SearchResultSlackMessage = SearchResult & {
     iconUrl?: Maybe<Scalars['URL']['output']>;
     id: Scalars['ID']['output'];
     lastModifiedDate?: Maybe<Scalars['String']['output']>;
+    mentions?: Maybe<Array<ThirdPartyUser>>;
     scoreL2Ranker?: Maybe<Scalars['Float']['output']>;
     title: Scalars['String']['output'];
     type: SearchResultType;
@@ -53619,6 +53647,16 @@ export declare type ToolchainDisassociateContainersPayload = Payload & {
     errors?: Maybe<Array<MutationError>>;
     success: Scalars['Boolean']['output'];
 };
+export declare enum ToolchainDisassociateEntitiesErrorCode {
+    UnknownAssociation = "UNKNOWN_ASSOCIATION"
+}
+export declare type ToolchainDisassociateEntitiesErrorExtension = MutationErrorExtension & {
+    __typename?: 'ToolchainDisassociateEntitiesErrorExtension';
+    entityId?: Maybe<Scalars['ID']['output']>;
+    errorCode?: Maybe<ToolchainDisassociateEntitiesErrorCode>;
+    errorType?: Maybe<Scalars['String']['output']>;
+    statusCode?: Maybe<Scalars['Int']['output']>;
+};
 export declare type ToolchainDisassociateEntitiesInput = {
     cloudId: Scalars['ID']['input'];
     disassociations: Array<ToolchainDisassociateEntityInput>;
@@ -55374,9 +55412,66 @@ export declare type UnifiedAtlassianProductEdge = UnifiedIEdge & {
 };
 export declare type UnifiedForums = UnifiedINode & {
     __typename?: 'UnifiedForums';
+    badges?: Maybe<UnifiedUForumsBadgesResult>;
+    groups?: Maybe<UnifiedUForumsGroupsResult>;
     id: Scalars['ID']['output'];
     snapshot?: Maybe<UnifiedUForumsSnapshotResult>;
 };
+export declare type UnifiedForumsBadgesArgs = {
+    after?: InputMaybe<Scalars['String']['input']>;
+    first?: InputMaybe<Scalars['Int']['input']>;
+};
+export declare type UnifiedForumsGroupsArgs = {
+    after?: InputMaybe<Scalars['String']['input']>;
+    first?: InputMaybe<Scalars['Int']['input']>;
+};
+export declare type UnifiedForumsBadge = UnifiedIBadge & UnifiedINode & {
+    __typename?: 'UnifiedForumsBadge';
+    description?: Maybe<Scalars['String']['output']>;
+    id: Scalars['ID']['output'];
+    imageUrl?: Maybe<Scalars['String']['output']>;
+    lastCompletedDate?: Maybe<Scalars['String']['output']>;
+    name?: Maybe<Scalars['String']['output']>;
+    type?: Maybe<Scalars['String']['output']>;
+};
+export declare type UnifiedForumsBadgeEdge = UnifiedIEdge & {
+    __typename?: 'UnifiedForumsBadgeEdge';
+    cursor?: Maybe<Scalars['String']['output']>;
+    node?: Maybe<UnifiedForumsBadge>;
+};
+export declare type UnifiedForumsBadgesConnection = UnifiedIConnection & {
+    __typename?: 'UnifiedForumsBadgesConnection';
+    edges?: Maybe<Array<Maybe<UnifiedForumsBadgeEdge>>>;
+    pageInfo: UnifiedPageInfo;
+    totalCount?: Maybe<Scalars['Int']['output']>;
+};
+export declare type UnifiedForumsGroup = UnifiedINode & {
+    __typename?: 'UnifiedForumsGroup';
+    avatar?: Maybe<UnifiedForumsGroupAvatar>;
+    description?: Maybe<Scalars['String']['output']>;
+    groupMemberCount?: Maybe<Scalars['Int']['output']>;
+    id: Scalars['ID']['output'];
+    title?: Maybe<Scalars['String']['output']>;
+    viewHref?: Maybe<Scalars['String']['output']>;
+};
+export declare type UnifiedForumsGroupAvatar = {
+    __typename?: 'UnifiedForumsGroupAvatar';
+    largeHref?: Maybe<Scalars['String']['output']>;
+    mediumHref?: Maybe<Scalars['String']['output']>;
+    smallHref?: Maybe<Scalars['String']['output']>;
+    tinyHref?: Maybe<Scalars['String']['output']>;
+};
+export declare type UnifiedForumsGroupEdge = UnifiedIEdge & {
+    __typename?: 'UnifiedForumsGroupEdge';
+    cursor?: Maybe<Scalars['String']['output']>;
+    node?: Maybe<UnifiedForumsGroup>;
+};
+export declare type UnifiedForumsGroupsConnection = UnifiedIConnection & {
+    __typename?: 'UnifiedForumsGroupsConnection';
+    edges?: Maybe<Array<Maybe<UnifiedForumsGroupEdge>>>;
+    pageInfo: UnifiedPageInfo;
+    totalCount?: Maybe<Scalars['Int']['output']>;
+};
 export declare type UnifiedForumsSnapshot = UnifiedINode & {
     __typename?: 'UnifiedForumsSnapshot';
     acceptedAnswersCreated?: Maybe<Scalars['Int']['output']>;
@@ -55398,10 +55493,14 @@ export declare type UnifiedForumsSnapshot = UnifiedINode & {
 };
 export declare type UnifiedGamification = UnifiedINode & {
     __typename?: 'UnifiedGamification';
-    badges?: Maybe<Array<Maybe<UnifiedUGamificationBadgeResult>>>;
+    badges?: Maybe<UnifiedUGamificationBadgesResult>;
     id: Scalars['ID']['output'];
 };
-export declare type UnifiedGamificationBadge = UnifiedINode & {
+export declare type UnifiedGamificationBadgesArgs = {
+    after?: InputMaybe<Scalars['String']['input']>;
+    first?: InputMaybe<Scalars['Int']['input']>;
+};
+export declare type UnifiedGamificationBadge = UnifiedIBadge & UnifiedINode & {
     __typename?: 'UnifiedGamificationBadge';
     description?: Maybe<Scalars['String']['output']>;
     id: Scalars['ID']['output'];
@@ -55410,6 +55509,24 @@ export declare type UnifiedGamificationBadge = UnifiedINode & {
     name?: Maybe<Scalars['String']['output']>;
     type?: Maybe<Scalars['String']['output']>;
 };
+export declare type UnifiedGamificationBadgeEdge = UnifiedIEdge & {
+    __typename?: 'UnifiedGamificationBadgeEdge';
+    cursor?: Maybe<Scalars['String']['output']>;
+    node?: Maybe<UnifiedGamificationBadge>;
+};
+export declare type UnifiedGamificationBadgesConnection = UnifiedIConnection & {
+    __typename?: 'UnifiedGamificationBadgesConnection';
+    edges?: Maybe<Array<Maybe<UnifiedGamificationBadgeEdge>>>;
+    pageInfo: UnifiedPageInfo;
+    totalCount?: Maybe<Scalars['Int']['output']>;
+};
+export declare type UnifiedIBadge = {
+    description?: Maybe<Scalars['String']['output']>;
+    id: Scalars['ID']['output'];
+    imageUrl?: Maybe<Scalars['String']['output']>;
+    name?: Maybe<Scalars['String']['output']>;
+    type?: Maybe<Scalars['String']['output']>;
+};
 export declare type UnifiedIConnection = {
     edges?: Maybe<Array<Maybe<UnifiedIEdge>>>;
     pageInfo: UnifiedPageInfo;
@@ -55539,6 +55656,7 @@ export declare type UnifiedPayload = {
 };
 export declare type UnifiedProfile = UnifiedINode & {
     __typename?: 'UnifiedProfile';
+    badges?: Maybe<UnifiedProfileBadgesConnection>;
     bio?: Maybe<Scalars['String']['output']>;
     company?: Maybe<Scalars['String']['output']>;
     forums?: Maybe<UnifiedUForumsResult>;
@@ -55558,6 +55676,30 @@ export declare type UnifiedProfile = UnifiedINode & {
     xUrl?: Maybe<Scalars['String']['output']>;
     youtubeUrl?: Maybe<Scalars['String']['output']>;
 };
+export declare type UnifiedProfileBadgesArgs = {
+    after?: InputMaybe<Scalars['String']['input']>;
+    first?: InputMaybe<Scalars['Int']['input']>;
+};
+export declare type UnifiedProfileBadge = UnifiedIBadge & UnifiedINode & {
+    __typename?: 'UnifiedProfileBadge';
+    description?: Maybe<Scalars['String']['output']>;
+    id: Scalars['ID']['output'];
+    imageUrl?: Maybe<Scalars['String']['output']>;
+    lastCompletedDate?: Maybe<Scalars['String']['output']>;
+    name?: Maybe<Scalars['String']['output']>;
+    type?: Maybe<Scalars['String']['output']>;
+};
+export declare type UnifiedProfileBadgeEdge = UnifiedIEdge & {
+    __typename?: 'UnifiedProfileBadgeEdge';
+    cursor?: Maybe<Scalars['String']['output']>;
+    node?: Maybe<UnifiedProfileBadge>;
+};
+export declare type UnifiedProfileBadgesConnection = UnifiedIConnection & {
+    __typename?: 'UnifiedProfileBadgesConnection';
+    edges?: Maybe<Array<Maybe<UnifiedProfileBadgeEdge>>>;
+    pageInfo: UnifiedPageInfo;
+    totalCount?: Maybe<Scalars['Int']['output']>;
+};
 export declare type UnifiedProfileInput = {
     bio?: InputMaybe<Scalars['String']['input']>;
     company?: InputMaybe<Scalars['String']['input']>;
@@ -55636,12 +55778,15 @@ export declare type UnifiedRecentCourseEdge = UnifiedIEdge & {
 };
 export declare type UnifiedUAccountResult = UnifiedAccount | UnifiedQueryError;
 export declare type UnifiedUAtlassianProductResult = UnifiedAtlassianProductConnection | UnifiedQueryError;
+export declare type UnifiedUForumsBadgesResult = UnifiedForumsBadgesConnection | UnifiedQueryError;
+export declare type UnifiedUForumsGroupsResult = UnifiedForumsGroupsConnection | UnifiedQueryError;
 export declare type UnifiedUForumsResult = UnifiedForums | UnifiedQueryError;
 export declare type UnifiedUForumsSnapshotResult = UnifiedForumsSnapshot | UnifiedQueryError;
-export declare type UnifiedUGamificationBadgeResult = UnifiedGamificationBadge | UnifiedQueryError;
+export declare type UnifiedUGamificationBadgesResult = UnifiedGamificationBadgesConnection | UnifiedQueryError;
 export declare type UnifiedUGamificationResult = UnifiedGamification | UnifiedQueryError;
 export declare type UnifiedULearningCertificationResult = UnifiedLearningCertificationConnection | UnifiedQueryError;
 export declare type UnifiedULearningResult = UnifiedLearning | UnifiedQueryError;
+export declare type UnifiedUProfileBadgesResult = UnifiedProfileBadgesConnection | UnifiedQueryError;
 export declare type UnifiedUProfileResult = UnifiedProfile | UnifiedQueryError;
 export declare type UnifiedURecentCourseResult = UnifiedQueryError | UnifiedRecentCourseConnection;
 export declare type UnlinkExternalSourceInput = {