@gitkraken/core-gitlens 0.10.1 → 0.10.3

package/dist/plus/integrations/models/gitHostIntegration.js

@@ -76,8 +76,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	}
 	async getAccountForEmail(repo, email, options) {
 		const scope = getScopedLogger();
-		if (!(this.maybeConnected ?? await this.isConnected())) return void 0;
-		await this.refreshSessionIfExpired(scope);
+		if (await this.prepareSessionLookup() != null) return void 0;
 		try {
 			const author = await this.getProviderAccountForEmail(this._session, repo, email, options);
 			this.resetRequestExceptionCount("getAccountForEmail");
@@ -94,8 +93,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	*/
 	async getSshSigningKeysForEmails(repo, emails) {
 		const scope = getScopedLogger();
-		if (!(this.maybeConnected ?? await this.isConnected())) return /* @__PURE__ */ new Map();
-		await this.refreshSessionIfExpired(scope);
+		if (await this.prepareSessionLookup() != null) return /* @__PURE__ */ new Map();
 		try {
 			const keys = await this.getProviderSshSigningKeysForEmails(this._session, repo, emails);
 			this.resetRequestExceptionCount("getSshSigningKeysForEmails");
@@ -111,8 +109,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	}
 	async getAccountForCommit(repo, rev, options) {
 		const scope = getScopedLogger();
-		if (!(this.maybeConnected ?? await this.isConnected())) return void 0;
-		await this.refreshSessionIfExpired(scope);
+		if (await this.prepareSessionLookup() != null) return void 0;
 		try {
 			const author = await this.getProviderAccountForCommit(this._session, repo, rev, options);
 			this.resetRequestExceptionCount("getAccountForCommit");
@@ -124,8 +121,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	}
 	async getDefaultBranch(repo, options) {
 		const scope = getScopedLogger();
-		if (!(this.maybeConnected ?? await this.isConnected())) return void 0;
-		await this.refreshSessionIfExpired(scope);
+		if (await this.prepareSessionLookup() != null) return void 0;
 		return this.ctx.cache.getRepositoryDefaultBranch(repo, this, () => ({ value: (async () => {
 			try {
 				const result = await this.getProviderDefaultBranch(this._session, repo, options?.cancellation);
@@ -158,8 +154,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	}
 	async getRepositoryMetadata(repo, options) {
 		const scope = getScopedLogger();
-		if (!(this.maybeConnected ?? await this.isConnected())) return void 0;
-		await this.refreshSessionIfExpired(scope);
+		if (await this.prepareSessionLookup() != null) return void 0;
 		return this.ctx.cache.getRepositoryMetadata(repo, this, () => ({ value: (async () => {
 			try {
 				const result = await this.getProviderRepositoryMetadata(this._session, repo, options?.cancellation);
@@ -362,8 +357,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	}
 	async mergePullRequest(pr, options, cancellation) {
 		const scope = getScopedLogger();
-		if (!(this.maybeConnected ?? await this.isConnected())) return false;
-		await this.refreshSessionIfExpired(scope);
+		if (await this.prepareSessionLookup() != null) return false;
 		try {
 			const result = await this.mergeProviderPullRequest(this._session, pr, options, cancellation);
 			this.resetRequestExceptionCount("mergePullRequest");
@@ -378,9 +372,13 @@ var GitHostIntegration = class extends IntegrationBase {
 	}
 	async getPullRequestForBranch(repo, branch, options) {
 		const scope = getScopedLogger();
-		if (!(this.maybeConnected ?? await this.isConnected())) return void 0;
-		await this.refreshSessionIfExpired(scope);
+		const refreshFailure = await this.prepareSessionLookup();
+		if (refreshFailure === "unconnected") return void 0;
 		const { expiryOverride, throwOnError, ...opts } = options ?? {};
+		if (refreshFailure != null) {
+			if (throwOnError) throw refreshFailure;
+			return;
+		}
 		return this.ctx.cache.getPullRequestForBranch(branch, repo, this, (cacheable) => ({ value: (async () => {
 			try {
 				const result = await this.getProviderPullRequestForBranch(this._session, repo, branch, opts);
@@ -396,9 +394,13 @@ var GitHostIntegration = class extends IntegrationBase {
 	}
 	async getPullRequestForCommit(repo, rev, options) {
 		const scope = getScopedLogger();
-		if (!(this.maybeConnected ?? await this.isConnected())) return void 0;
-		await this.refreshSessionIfExpired(scope);
+		const refreshFailure = await this.prepareSessionLookup();
+		if (refreshFailure === "unconnected") return void 0;
 		const { throwOnError, ...cacheOptions } = options ?? {};
+		if (refreshFailure != null) {
+			if (throwOnError) throw refreshFailure;
+			return;
+		}
 		return this.ctx.cache.getPullRequestForSha(rev, repo, this, (cacheable) => ({ value: (async () => {
 			try {
 				const result = await this.getProviderPullRequestForCommit(this._session, repo, rev);