Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/app/api/instance/instance.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,14 @@ describe("POST /api/instance", () => {
vi.mocked(prisma.betterAuthUser.create).mockResolvedValue({
id: "u1-new", name: "a", email: "a@b.com", emailVerified: true,
} as never);
vi.mocked(prisma.betterAuthAccount.create).mockResolvedValue({
id: "acc-1", userId: "u1-new", accountId: "a@b.com",
providerId: "credential", password: "hashed",
} as never);
vi.mocked(prisma.setupToken.create).mockResolvedValue({
id: "st-1", tokenHash: "hash", userId: "u1-new",
organizationId: null, expiresAt: new Date(), usedAt: null, createdAt: new Date(),
} as never);
vi.mocked(prisma.workspace.create).mockResolvedValue({
id: "new-ws", name: "Test", subdomain: "test-ws",
status: "active", plan: "basic", tier: "free", ownerId: "u1",
Expand All @@ -217,6 +225,14 @@ describe("POST /api/instance", () => {
emailVerified: true,
},
});
expect(prisma.betterAuthAccount.create).toHaveBeenCalledWith({
data: {
userId: "u1-new",
accountId: "a@b.com",
providerId: "credential",
password: expect.any(String),
},
});
expect(prisma.betterAuthAccount.create).toHaveBeenCalledOnce();
expect(data.tier).toBe("free");
});
Expand Down
5 changes: 4 additions & 1 deletion src/core/globe/ImageryProviderFactory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export function createOsmProvider() {

function createGoogleProvider(lyrs: string) {
return new UrlTemplateImageryProvider({
url: `https://mt{s}.google.com/vt/lyrs=${lyrs}&x={x}&y={y}&z={z}`,
url: `https://mt{s}.google.com/vt/lyrs=${lyrs}&hl=en&x={x}&y={y}&z={z}`,
subdomains: ["0", "1", "2", "3"]
});
}
Expand Down Expand Up @@ -101,6 +101,7 @@ export async function createImageryProvider(layerId: string) {
return await BingMapsImageryProvider.fromUrl("https://dev.virtualearth.net", {
key: bingKey,
mapStyle: BingMapsStyle.AERIAL,
culture: process.env.NEXT_PUBLIC_BING_MAPS_CULTURE || "en-US",
});
}
return await tieredFallback(2, "s");
Expand All @@ -110,6 +111,7 @@ export async function createImageryProvider(layerId: string) {
return await BingMapsImageryProvider.fromUrl("https://dev.virtualearth.net", {
key: bingKey,
mapStyle: BingMapsStyle.AERIAL_WITH_LABELS,
culture: process.env.NEXT_PUBLIC_BING_MAPS_CULTURE || "en-US",
});
}
return await tieredFallback(3, "y");
Expand All @@ -119,6 +121,7 @@ export async function createImageryProvider(layerId: string) {
return await BingMapsImageryProvider.fromUrl("https://dev.virtualearth.net", {
key: bingKey,
mapStyle: BingMapsStyle.ROAD,
culture: process.env.NEXT_PUBLIC_BING_MAPS_CULTURE || "en-US",
});
}
return await tieredFallback(4, "m");
Expand Down