From a6cb092ff63f7f2689c5ec7fb2f9cfa419de878a Mon Sep 17 00:00:00 2001 From: Gao Sun Date: Mon, 20 Mar 2023 17:29:20 +0800 Subject: [PATCH 1/2] refactor: fix initial sie config for cloud --- packages/schemas/src/seeds/sign-in-experience.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/schemas/src/seeds/sign-in-experience.ts b/packages/schemas/src/seeds/sign-in-experience.ts index cda19c568..dcf4ac99d 100644 --- a/packages/schemas/src/seeds/sign-in-experience.ts +++ b/packages/schemas/src/seeds/sign-in-experience.ts @@ -1,6 +1,6 @@ import { generateDarkColor } from '@logto/core-kit'; -import type { SignInExperience } from '../db-entries/index.js'; +import type { CreateSignInExperience } from '../db-entries/index.js'; import { SignInMode } from '../db-entries/index.js'; import { SignInIdentifier } from '../foundations/index.js'; import { adminTenantId, defaultTenantId } from './tenant.js'; @@ -10,7 +10,7 @@ const defaultPrimaryColor = '#6139F6'; export const createDefaultSignInExperience = ( forTenantId: string, isCloud: boolean -): Readonly => +): Readonly => Object.freeze({ tenantId: forTenantId, id: 'default', @@ -20,8 +20,8 @@ export const createDefaultSignInExperience = ( darkPrimaryColor: generateDarkColor(defaultPrimaryColor), }, branding: { - logoUrl: isCloud ? '' : 'https://logto.io/logo.svg', - darkLogoUrl: isCloud ? '' : 'https://logto.io/logo-dark.svg', + logoUrl: isCloud ? undefined : 'https://logto.io/logo.svg', + darkLogoUrl: isCloud ? undefined : 'https://logto.io/logo-dark.svg', }, languageInfo: { autoDetect: true, @@ -53,7 +53,7 @@ export const createDefaultSignInExperience = ( /** @deprecated Use `createDefaultSignInExperience()` instead. */ export const defaultSignInExperience = createDefaultSignInExperience(defaultTenantId, false); -export const createAdminTenantSignInExperience = (): Readonly => +export const createAdminTenantSignInExperience = (): Readonly => Object.freeze({ ...defaultSignInExperience, tenantId: adminTenantId, From aa4bc35e70aa6d3f24de7bc1e7ef97b87fb4555b Mon Sep 17 00:00:00 2001 From: Gao Sun Date: Mon, 20 Mar 2023 17:43:30 +0800 Subject: [PATCH 2/2] ci: fix app insights connection string --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ff658b6e7..8248c5d0d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -134,7 +134,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} build-args: | admin_endpoint=https://auth.logto.${{ inputs.target == 'prod' && 'io' || 'dev' }}/ - applicationinsights_connection_string=${{ secrets.APPLICATIONINSIGHTS_CONNECTION_STRING }} + applicationinsights_connection_string=${{ (inputs.target || 'dev') == 'dev' && secrets.APPLICATIONINSIGHTS_CONNECTION_STRING || secrets.APPLICATIONINSIGHTS_CONNECTION_STRING_PROD }} deploy-core: runs-on: ubuntu-latest