You have done - {{ endorserLimits.doneClaimsThisWeek }} claims out of - {{ endorserLimits.maxClaimsPerWeek }} for this week. Your - claims counter resets at + {{ endorserLimits?.doneClaimsThisWeek || "?" }} claims out of + {{ endorserLimits?.maxClaimsPerWeek || "?" }} for this week. + Your claims counter resets at {{ - readableDate(endorserLimits.nextWeekBeginDateTime) + readableDate(endorserLimits?.nextWeekBeginDateTime) }}
You have done - {{ endorserLimits.doneRegistrationsThisMonth }} registrations - out of {{ endorserLimits.maxRegistrationsPerMonth }} for this - month. - (You cannot register anyone else on your first day.) + {{ + endorserLimits?.doneRegistrationsThisMonth || "?" + }} + registrations + out of + {{ endorserLimits?.maxRegistrationsPerMonth || "?" }} for this + this month. + (You cannot register anyone on your first day.) Your registration counter resets at - {{ readableDate(endorserLimits.nextMonthBeginDateTime) }} + {{ readableDate(endorserLimits?.nextMonthBeginDateTime) }}
-+
You have uploaded - {{ imageLimits?.doneImagesThisWeek }} images out of - {{ imageLimits?.maxImagesPerWeek }} for this week. Your image - counter resets at + {{ imageLimits?.doneImagesThisWeek || "?" }} images out of + {{ imageLimits?.maxImagesPerWeek || "?" }} for this week. Your + image counter resets at {{ readableDate(imageLimits?.nextWeekBeginDateTime) }} @@ -1215,7 +1221,7 @@ export default class AccountViewView extends Vue { } readableDate(timeStr: string) { - return timeStr.substring(0, timeStr.indexOf("T")); + return timeStr ? timeStr.substring(0, timeStr.indexOf("T")) : "?"; } /** @@ -1230,11 +1236,11 @@ export default class AccountViewView extends Vue { this.publicHex = identity.keys[0].publicKeyHex; this.publicBase64 = Buffer.from(this.publicHex, "hex").toString("base64"); this.derivationPath = identity.keys[0].meta?.derivationPath as string; - await this.checkLimitsFor(this.activeDid); + await this.checkLimits(); } else if (account?.publicKeyHex) { this.publicHex = account.publicKeyHex as string; this.publicBase64 = Buffer.from(this.publicHex, "hex").toString("base64"); - await this.checkLimitsFor(this.activeDid); + await this.checkLimits(); } } @@ -1598,11 +1604,13 @@ export default class AccountViewView extends Vue { } /** + * Use "checkLimits" instead. + * * Asynchronously checks rate limits for the given identity. * * Updates component state variables `limits`, `limitsMessage`, and `loadingLimits`. */ - public async checkLimitsFor(did: string) { + private async checkLimitsFor(did: string) { this.loadingLimits = true; this.limitsMessage = ""; @@ -1632,9 +1640,15 @@ export default class AccountViewView extends Vue { ); } } - const imageResp = await fetchImageRateLimits(this.axios, did); - if (imageResp.status === 200) { - this.imageLimits = imageResp.data; + try { + const imageResp = await fetchImageRateLimits(this.axios, did); + if (imageResp.status === 200) { + this.imageLimits = imageResp.data; + } else { + this.limitsMessage = "You don't have access to upload images."; + } + } catch { + this.limitsMessage = "You cannot upload images."; } } } catch (error) { @@ -1739,6 +1753,14 @@ export default class AccountViewView extends Vue { try { const headers = await getHeaders(this.activeDid); this.passkeyExpirationDescription = tokenExpiryTimeDescription(); + if ( + window.location.hostname === "localhost" && + !DEFAULT_IMAGE_API_SERVER.includes("localhost") + ) { + console.log( + "Using shared image API server, so only users on that server can play with images.", + ); + } const response = await this.axios.delete( DEFAULT_IMAGE_API_SERVER + "/image/" + diff --git a/src/views/DiscoverView.vue b/src/views/DiscoverView.vue index 09ef7e3b..6dd9214e 100644 --- a/src/views/DiscoverView.vue +++ b/src/views/DiscoverView.vue @@ -302,7 +302,10 @@ import InfiniteScroll from "../components/InfiniteScroll.vue"; import ProjectIcon from "../components/ProjectIcon.vue"; import OnboardingDialog from "../components/OnboardingDialog.vue"; import TopMessage from "../components/TopMessage.vue"; -import { NotificationIface, DEFAULT_PARTNER_API_SERVER } from "../constants/app"; +import { + NotificationIface, + DEFAULT_PARTNER_API_SERVER, +} from "../constants/app"; import { db, logConsoleAndDb, diff --git a/src/views/GiftedDetailsView.vue b/src/views/GiftedDetailsView.vue index 89e2ed3c..c26693a4 100644 --- a/src/views/GiftedDetailsView.vue +++ b/src/views/GiftedDetailsView.vue @@ -547,6 +547,14 @@ export default class GiftedDetails extends Vue { } try { const headers = await getHeaders(this.activeDid); + if ( + window.location.hostname === "localhost" && + !DEFAULT_IMAGE_API_SERVER.includes("localhost") + ) { + console.log( + "Using shared image API server, so only users on that server can play with images.", + ); + } const response = await this.axios.delete( DEFAULT_IMAGE_API_SERVER + "/image/" + diff --git a/src/views/NewEditProjectView.vue b/src/views/NewEditProjectView.vue index 71bcce54..8725fdc3 100644 --- a/src/views/NewEditProjectView.vue +++ b/src/views/NewEditProjectView.vue @@ -357,6 +357,14 @@ export default class NewEditProjectView extends Vue { } try { const headers = (await getHeaders(this.activeDid)) as AxiosRequestHeaders; + if ( + window.location.hostname === "localhost" && + !DEFAULT_IMAGE_API_SERVER.includes("localhost") + ) { + console.log( + "Using shared image API server, so only users on that server can play with images.", + ); + } const response = await this.axios.delete( DEFAULT_IMAGE_API_SERVER + "/image/" + diff --git a/src/views/SharedPhotoView.vue b/src/views/SharedPhotoView.vue index f70b6730..83f4df1e 100644 --- a/src/views/SharedPhotoView.vue +++ b/src/views/SharedPhotoView.vue @@ -183,6 +183,14 @@ export default class SharedPhotoView extends Vue { ); formData.append("claimType", imageType); + if ( + window.location.hostname === "localhost" && + !DEFAULT_IMAGE_API_SERVER.includes("localhost") + ) { + console.log( + "Using shared image API server, so only users on that server can play with images.", + ); + } const response = await axios.post( DEFAULT_IMAGE_API_SERVER + "/image", formData, diff --git a/test-playwright/35-record-gift-from-image-share.spec.ts b/test-playwright/35-record-gift-from-image-share.spec.ts index 135f9ff7..bdece669 100644 --- a/test-playwright/35-record-gift-from-image-share.spec.ts +++ b/test-playwright/35-record-gift-from-image-share.spec.ts @@ -50,6 +50,14 @@ import path from 'path'; import { test, expect } from '@playwright/test'; import { importUser } from './testUtils'; +/** + * Note: by default, this test uses the test image API server. + * + * If you want to use your own image API server, you can set the + * VITE_DEFAULT_IMAGE_API_SERVER environment variable to your server's URL + * in the playwright.config-local.ts file. + * + */ test('Record item given from image-share', async ({ page }) => { let randomString = Math.random().toString(36).substring(2, 8); diff --git a/test-playwright/40-add-contact.spec.ts b/test-playwright/40-add-contact.spec.ts index 72cb2cbe..7655ea12 100644 --- a/test-playwright/40-add-contact.spec.ts +++ b/test-playwright/40-add-contact.spec.ts @@ -300,7 +300,7 @@ test('Copy contact to clipboard, then import ', async ({ page, context }, testIn return; } - console.log("Running test that copies contact details to clipboard."); + // console.log("Running test that copies contact details to clipboard."); await page.getByTestId('copySelectedContactsButtonTop').click(); const clipboardText = await page.evaluate(async () => { return navigator.clipboard.readText(); diff --git a/vite.config.mjs b/vite.config.mjs index 3ceaa7ca..1005799a 100644 --- a/vite.config.mjs +++ b/vite.config.mjs @@ -33,12 +33,6 @@ export default defineConfig(({ mode }) => { fs: { strict: false }, - proxy: process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test' ? { - '/api': { - target: process.env.VITE_DEFAULT_ENDORSER_API_SERVER || 'http://localhost:3000', - changeOrigin: true, - }, - } : undefined, }, build: { outDir: isElectron ? "dist-electron" : "dist",