npm package diff

Package: @forge/cli

Versions: 12.3.0-next.0-experimental-8a53773 - 12.3.0-next.2

File: package/out/analytics-client/analytics-client.js

Index: package/out/analytics-client/analytics-client.js
===================================================================
--- package/out/analytics-client/analytics-client.js
+++ package/out/analytics-client/analytics-client.js
@@ -1,18 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AnalyticsClientReporter = void 0;
 const tslib_1 = require("tslib");
-const os = tslib_1.__importStar(require("os"));
-const url_1 = require("url");
-const uuid_1 = require("uuid");
 const analytics_node_client_1 = require("@forge/util/packages/analytics-node-client");
+const os = tslib_1.__importStar(require("os"));
 const ari_1 = require("@forge/util/packages/ari");
+const analytics_message_handler_1 = require("./analytics-message-handler");
+const uuid_1 = require("uuid");
 const cli_shared_1 = require("@forge/cli-shared");
-const anon_user_id_1 = require("../command-line/anon-user-id");
-const errors_1 = require("../command-line/errors");
 const unique_machine_id_1 = require("../command-line/unique-machine-id");
-const analytics_message_handler_1 = require("./analytics-message-handler");
+const errors_1 = require("../command-line/errors");
+const url_1 = require("url");
 const Identity = (value) => value;
 function appAidOrUndefined(appAri) {
     try {
         return ari_1.EcosystemAppAri.parse(appAri).appId;
@@ -23,16 +22,14 @@
 }
 class AnalyticsClientReporter {
     storage;
     configService;
-    credentialStore;
-    constructor(storage, configService, credentialStore) {
+    constructor(storage, configService) {
         this.storage = storage;
         this.configService = configService;
-        this.credentialStore = credentialStore;
     }
     source = 'forge/cli';
-    async reportSuccess(cmdName, attributes) {
+    reportSuccess(cmdName, cred, attributes) {
         this.processAnalyticsEvent({
             id: (0, uuid_1.v4)(),
             eventType: analytics_message_handler_1.EventType.TRACK,
             event: {
@@ -40,9 +37,9 @@
                 os: {
                     name: os.platform(),
                     version: os.release()
                 },
-                ...(await this._getUserId()),
+                ...this._getUserId(cred),
                 trackEvent: {
                     source: this.source,
                     action: 'invoked',
                     actionSubject: cmdName,
@@ -51,28 +48,25 @@
                 }
             }
         });
     }
-    async reportFailure(cmdName, attributes, e) {
+    reportFailure(cmdName, cred, attributes, e) {
         attributes = {
             ...attributes,
             ...this._getErrorDetails(e)
         };
-        await this.reportOperationalEvent('invoked', cmdName, attributes);
+        this.reportOperationalEvent('invoked', cmdName, cred, attributes);
     }
-    async reportCommandInvoke(cmdName, attributes) {
-        await this.reportOperationalEvent('cmdInvoked', cmdName, attributes);
+    reportCommandInvoke(cmdName, cred, attributes) {
+        this.reportOperationalEvent('cmdInvoked', cmdName, cred, attributes);
     }
-    async reportInvokeFailure(cmdName, attributes, e) {
+    reportInvokeFailure(cmdName, cred, attributes, e) {
         if (e) {
             attributes = { ...attributes, ...this._getErrorListDetails(e) };
         }
-        await this.reportOperationalEvent('cmdInvokeFailed', cmdName, attributes);
+        this.reportOperationalEvent('cmdInvokeFailed', cmdName, cred, attributes);
     }
-    async reportAppPackaged(attributes) {
-        await this.reportOperationalEvent('packaged', 'app', attributes);
-    }
-    async reportOperationalEvent(action, actionSubject, attributes) {
+    reportOperationalEvent(action, actionSubject, cred, attributes) {
         this.processAnalyticsEvent({
             id: (0, uuid_1.v4)(),
             eventType: analytics_message_handler_1.EventType.OPERATIONAL,
             event: {
@@ -80,9 +74,9 @@
                 os: {
                     name: os.platform(),
                     version: os.release()
                 },
-                ...(await this._getUserId()),
+                ...this._getUserId(cred),
                 operationalEvent: {
                     source: this.source,
                     action,
                     actionSubject,
@@ -99,21 +93,17 @@
             return;
         }
         this.storage.addAnalyticsEvent(analyticsEvent);
     }
-    async _getUserId() {
-        try {
-            const { accountId: userId } = await this.credentialStore.getCredentials();
-            return {
+    _getUserId(cred) {
+        return typeof cred === 'string'
+            ? {
+                anonymousId: cred
+            }
+            : {
                 userIdType: analytics_node_client_1.userTypes.ATLASSIAN_ACCOUNT,
-                userId
+                userId: cred.accountId
             };
-        }
-        catch {
-            return {
-                anonymousId: (0, anon_user_id_1.getAnonId)()
-            };
-        }
     }
     _getErrorDetails(e) {
         if (e instanceof cli_shared_1.GraphQlMutationError) {
             return { error: e.getCode() };