ogcio · SamSalvatico · Sep 3, 2024 · Jun 3, 2024 · Jun 3, 2024 · Jun 3, 2024
diff --git a/.dockerignore b/.dockerignore
@@ -1,5 +1,5 @@
 # dependencies
-**/node_modules
+node_modules
 
 # testing
 /packages/**/coverage
@@ -34,4 +34,4 @@ dump.rdb
 .github
 .husky
 .parcel-cache
-.vscode
+.vscode
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -188,4 +188,4 @@ jobs:
 
       - name: Check alteration sequence
         working-directory: ./fresh
-        run: node .scripts/check-alterations-sequence.js
+        run: node .scripts/check-alterations-sequence.js
diff --git a/.gitpod.yml b/.gitpod.yml
@@ -38,7 +38,7 @@ ports:
     port: 5432
     visibility: public
     onOpen: ignore
-    # OGCIO - formsie port collision fixed
+  # OGCIO - formsie port collision fixed
   - port: 7001
     onOpen: ignore
   - port: 5002

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -23,9 +23,6 @@
     "typescript",
     "typescriptreact",
   ],
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "explicit"
-  },
   "json.schemas": [
     {
       "fileMatch": [
@@ -56,5 +53,6 @@
     "upsell",
     "withtyped",
     "backchannel"
-  ]
+  ],
+  "eslint.codeActionsOnSave.rules": null
 }
diff --git a/Dockerfile b/Dockerfile
@@ -10,6 +10,7 @@ ENV PUPPETEER_SKIP_DOWNLOAD=true
 ENV PORT=3301
 # OGCIO
 ENV ADMIN_PORT=3302
+
 ### Install toolchain ###
 RUN npm add --location=global pnpm@^9.0.0
 # https://github.com/nodejs/docker-node/blob/main/docs/BestPractices.md#node-gyp-alpine
@@ -49,9 +50,11 @@ ENV PORT=3301
 ENV ADMIN_PORT=3302
 WORKDIR /etc/logto
 COPY --from=builder /etc/logto .
-RUN apk add --no-cache jq
+# OGCIO
 EXPOSE 3301
 # OGCIO
 EXPOSE 3302
+#OGCIO
+RUN apk add --no-cache jq
 # OGCIO
 CMD [ "sh", "-c", "export ENCODED_PASSWORD=$(jq --slurp --raw-input --raw-output @uri <(printf \"%s\" $POSTGRES_PASSWORD)) && export DB_URL=\"postgres://$POSTGRES_USER:$ENCODED_PASSWORD@$POSTGRES_HOST:$POSTGRES_PORT/$POSTGRES_DB_NAME\" && export REDIS_URL=\"redis://$REDIS_HOST:$REDIS_PORT\" && npm run ogcio:start"]
diff --git a/azure_pipelines.yml b/azure_pipelines.yml
@@ -1,3 +1,5 @@
+# OGCIO
+
 trigger:
   - dev
   - uat

diff --git a/packages/connectors/connector-azuread/README.md b/packages/connectors/connector-azuread/README.md
@@ -66,29 +66,6 @@ The `prompts` field is an array of strings that specifies the type of user inter
 
 Logto will concatenate the prompts with a space as the value of `prompt` in the authorization URL.
 
-### Client ID
-
-You may find the **Application (client) ID** in the **Overview** section of your newly created application in the Azure Portal.
-
-### Client Secret
-
-- In your newly created application, click the **Certificates & Secrets** to get a client secret, and click the **New client secret** from the top.
-- Enter a description and an expiration.
-- This will only show your client secret once. Fill the **value** to the Logto connector configuration and save it to a secure location.
-
-### Cloud Instance
-
-Usually, it is `https://login.microsoftonline.com/`. See [Azure AD authentication endpoints](https://learn.microsoft.com/en-us/azure/active-directory/develop/authentication-national-cloud#azure-ad-authentication-endpoints) for more information.
-
-### Tenant ID
-
-Logto will use this field to construct the authorization endpoints. This value is dependent on the **access type** you selected when creating the application in the Azure Portal.
-
-- If you select **Accounts in this organizational directory only** for access type then you need to enter your **{TenantID}**. You can find the tenant ID in the **Overview** section of your Azure Active Directory.
-- If you select **Accounts in any organizational directory** for access type then you need to enter **organizations**.
-- If you select **Accounts in any organizational directory or personal Microsoft accounts** for access type then you need to enter **common**.
-- If you select **Personal Microsoft accounts only** for access type then you need to enter **consumers**.
-
 ## References
 
-- [Web app that signs in users](https://docs.microsoft.com/en-us/azure/active-directory/develop/scenario-web-app-sign-user-overview)
+- [Web app that signs in users](https://docs.microsoft.com/en-us/azure/active-directory/develop/scenario-web-app-sign-user-overview)
diff --git a/packages/console/src/assets/docs/guides/web-java-spring-boot/index.ts b/packages/console/src/assets/docs/guides/web-java-spring-boot/index.ts
@@ -3,14 +3,15 @@ import { ApplicationType } from '@logto/schemas';
 import { type GuideMetadata } from '../types';
 
 const metadata: Readonly<GuideMetadata> = Object.freeze({
-  name: 'Java Spring Boot Web',
+  name: 'Java Spring Boot',
   description:
     'Spring Boot is a web framework for Java that enables developers to build secure, fast, and scalable server applications with the Java programming language.',
   target: ApplicationType.Traditional,
   sample: {
     repo: 'spring-boot-sample',
     path: '',
   },
+  isFeatured: true,
 });
 
 export default metadata;
diff --git a/packages/core/src/libraries/application.ts b/packages/core/src/libraries/application.ts
@@ -303,4 +303,4 @@ export const createApplicationLibrary = (queries: Queries) => {
     validateUserConsentOrganizationMembership,
     validateProtectedApplicationById,
   };
-};
+};
diff --git a/packages/core/src/libraries/ogcio-user.ts b/packages/core/src/libraries/ogcio-user.ts
@@ -20,7 +20,7 @@ import { OGCIO_ORGANIZATION_ROLES, OGCIO_ORGANIZATIONS, OGCIO_ROLES } from './og
 
 const getDefaultOrganizationsForUser = async (organizationQueries: OrganizationQueries) => {
   const organizationNames: string[] = deduplicate(EnvSet.values.userDefaultOrganizationNames);
-  consoleLog.info('DEFUALT ORG NAMES', organizationNames);
+  consoleLog.info('DEFAULT ORG NAMES', organizationNames);
   if (organizationNames.length === 0) {
     return [];
   }

diff --git a/packages/core/src/routes/admin-user/basics.ts b/packages/core/src/routes/admin-user/basics.ts
@@ -11,10 +11,9 @@ import { conditional, pick, yes } from '@silverhand/essentials';
 import { boolean, literal, nativeEnum, object, string } from 'zod';
 
 import RequestError from '#src/errors/RequestError/index.js';
+import { buildManagementApiContext } from '#src/libraries/hook/utils.js';
 // OGCIO
 import { manageDefaultOrganizations } from '#src/libraries/ogcio-user.js';
-
-import { buildManagementApiContext } from '#src/libraries/hook/utils.js';
 import { encryptUserPassword } from '#src/libraries/user.utils.js';
 import koaGuard from '#src/middleware/koa-guard.js';
 import assertThat from '#src/utils/assert-that.js';

diff --git a/packages/core/src/routes/interaction/actions/submit-interaction.test.ts b/packages/core/src/routes/interaction/actions/submit-interaction.test.ts
@@ -462,4 +462,3 @@ describe('submit action', () => {
     });
   });
 });
-/* eslint-enable max-lines */
diff --git a/packages/core/src/routes/interaction/actions/submit-interaction.ts b/packages/core/src/routes/interaction/actions/submit-interaction.ts
@@ -102,6 +102,7 @@ async function handleSubmitRegister(
     organizations,
     // OGCIO
     roles,
+    // OGCIO
     usersRoles,
   } = queries;
 

diff --git a/packages/experience/package.json b/packages/experience/package.json
@@ -10,7 +10,7 @@
   "scripts": {
     "precommit": "lint-staged",
     "start": "parcel src/index.html",
-    "dev": "cross-env PORT=7001 parcel src/index.html --no-cache --hmr-port 6001",
+    "dev": "echo '# OGCIO' && cross-env PORT=7001 parcel src/index.html --no-cache --hmr-port 6001",
     "check": "tsc --noEmit",
     "build": "pnpm check && rm -rf dist && parcel build src/index.html --no-autoinstall --no-cache --detailed-report",
     "lint": "eslint --ext .ts --ext .tsx src",

diff --git a/packages/experience/src/types/index.ts b/packages/experience/src/types/index.ts
@@ -38,7 +38,10 @@ export type PreviewConfig = {
   isNative: boolean;
 };
 
-export type ArrayElement<ArrayType extends readonly unknown[]> =
-  ArrayType extends ReadonlyArray<infer ElementType> ? ElementType : never;
+export type ArrayElement<ArrayType extends readonly unknown[]> = ArrayType extends ReadonlyArray<
+  infer ElementType
+>
+  ? ElementType
+  : never;
 
 export type WebAuthnOptions = WebAuthnRegistrationOptions | WebAuthnAuthenticationOptions;
diff --git a/packages/integration-tests/src/api/application.ts b/packages/integration-tests/src/api/application.ts
@@ -7,7 +7,6 @@ import {
   type ProtectedAppMetadata,
   type OrganizationWithRoles,
 } from '@logto/schemas';
-import { formUrlEncodedHeaders } from '@logto/shared';
 import { conditional } from '@silverhand/essentials';
 
 import { authedAdminApi, oidcApi } from './api.js';

diff --git a/...ation-tests/src/tests/api/interaction/sign-in-with-password-identifier/happy-path.test.ts b/...ation-tests/src/tests/api/interaction/sign-in-with-password-identifier/happy-path.test.ts
@@ -114,4 +114,4 @@ describe('Sign-in flow using password identifiers', () => {
 
     await deleteUser(user.id);
   });
-});
+});
diff --git a/packages/phrases/src/locales/en/translation/admin-console/applications.ts b/packages/phrases/src/locales/en/translation/admin-console/applications.ts
@@ -53,12 +53,6 @@ const applications = {
   placeholder_title: 'Select an application type to continue',
   placeholder_description:
     'Logto uses an application entity for OIDC to help with tasks such as identifying your apps, managing sign-in, and creating audit logs.',
-  m2m_role_assignment: {
-    title: 'Authorize app with machine-to-machine role for permissions',
-    subtitle: 'Machine-to-machine applications require authorized machine-to-machine role.',
-    role_creation_hint:
-      'Can’t find the right machine-to-machine role? <a>Create a machine-to-machine role</a>',
-  },
 };
 
 export default Object.freeze(applications);
diff --git a/packages/phrases/src/locales/es/translation/admin-console/applications.ts b/packages/phrases/src/locales/es/translation/admin-console/applications.ts
@@ -55,13 +55,6 @@ const applications = {
   placeholder_title: 'Selecciona un tipo de aplicación para continuar',
   placeholder_description:
     'Logto utiliza una entidad de aplicación para OIDC para ayudar con tareas como la identificación de tus aplicaciones, la gestión de inicio de sesión y la creación de registros de auditoría.',
-  m2m_role_assignment: {
-    title: 'Autorizar la aplicación con rol de máquina a máquina para permisos',
-    subtitle:
-      'Las aplicaciones de máquina a máquina requieren un rol de máquina a máquina autorizado.',
-    role_creation_hint:
-      '¿No puede encontrar el rol adecuado de máquina a máquina? <a>Crear un rol de máquina a máquina</a>',
-  },
 };
 
 export default Object.freeze(applications);
diff --git a/packages/phrases/src/locales/it/translation/admin-console/applications.ts b/packages/phrases/src/locales/it/translation/admin-console/applications.ts
@@ -55,13 +55,6 @@ const applications = {
   placeholder_title: 'Seleziona un tipo di applicazione per continuare',
   placeholder_description:
     "Logto utilizza un'entità applicazione per OIDC per aiutarti in compiti come l'identificazione delle tue app, la gestione dell'accesso e la creazione di registri di audit.",
-  m2m_role_assignment: {
-    title: "Autorizza l'applicazione con ruolo da macchina a macchina per le autorizzazioni",
-    subtitle:
-      'Le applicazioni da macchina a macchina richiedono un ruolo da macchina a macchina autorizzato.',
-    role_creation_hint:
-      'Non riesci a trovare il ruolo giusto per macchina a macchina? <a>Crea un ruolo macchina a macchina</a>',
-  },
 };
 
 export default Object.freeze(applications);
diff --git a/packages/phrases/src/locales/ja/translation/admin-console/applications.ts b/packages/phrases/src/locales/ja/translation/admin-console/applications.ts
@@ -54,11 +54,6 @@ const applications = {
   placeholder_title: '続行するにはアプリケーションタイプを選択してください',
   placeholder_description:
     'LogtoはOIDCのためにアプリケーションエンティティを使用して、アプリケーションの識別、サインインの管理、監査ログの作成などのタスクをサポートします。',
-  m2m_role_assignment: {
-    title: 'アプリを権限付きのマシン間ロールで認可する',
-    subtitle: 'マシン間アプリケーションには承認されたマシン間ロールが必要です。',
-    role_creation_hint: '適切なマシン間ロールが見つかりませんか？ <a>マシン間ロールを作成する</a>',
-  },
 };
 
 export default Object.freeze(applications);
diff --git a/packages/phrases/src/locales/pl-pl/translation/admin-console/applications.ts b/packages/phrases/src/locales/pl-pl/translation/admin-console/applications.ts
@@ -55,12 +55,6 @@ const applications = {
   placeholder_title: 'Wybierz typ aplikacji, aby kontynuować',
   placeholder_description:
     'Logto używa jednostki aplikacji dla OIDC, aby pomóc w takich zadaniach jak identyfikowanie Twoich aplikacji, zarządzanie logowaniem i tworzenie dzienników audytu.',
-  m2m_role_assignment: {
-    title: 'Autoryzuj aplikację z rolą maszyny do maszyny dla uprawnień',
-    subtitle: 'Aplikacje maszyna-do-maszyna wymagają autoryzowanej roli maszyna-do-maszyna.',
-    role_creation_hint:
-      'Nie możesz znaleźć odpowiedniej roli maszyna-maszyna? <a>Utwórz rolę maszyna-maszyna</a>',
-  },
 };
 
 export default Object.freeze(applications);
diff --git a/packages/phrases/src/locales/pt-br/translation/admin-console/applications.ts b/packages/phrases/src/locales/pt-br/translation/admin-console/applications.ts
@@ -55,13 +55,6 @@ const applications = {
   placeholder_title: 'Selecione um tipo de aplicativo para continuar',
   placeholder_description:
     'O Logto usa uma entidade de aplicativo para OIDC para ajudar nas tarefas, como identificar seus aplicativos, gerenciar o login e criar logs de auditoria.',
-  m2m_role_assignment: {
-    title: 'Autorizar aplicativo com função de máquina para máquina para permissões',
-    subtitle:
-      'Aplicativos de máquina para máquina requerem uma função de máquina para máquina autorizada.',
-    role_creation_hint:
-      'Não consegue encontrar o papel correto de máquina para máquina? <a>Crie um papel de máquina para máquina</a>',
-  },
 };
 
 export default Object.freeze(applications);
diff --git a/packages/phrases/src/locales/pt-pt/translation/admin-console/applications.ts b/packages/phrases/src/locales/pt-pt/translation/admin-console/applications.ts
@@ -54,13 +54,6 @@ const applications = {
   placeholder_title: 'Selecione um tipo de aplicação para continuar',
   placeholder_description:
     'O Logto usa uma entidade de aplicativo para OIDC para ajudar em tarefas como identificar seus aplicativos, gerenciar o registro e criar registros de auditoria.',
-  m2m_role_assignment: {
-    title: 'Autorizar aplicação com papel de máquina para máquina para permissões',
-    subtitle:
-      'Aplicações de máquina para máquina requerem uma função de máquina para máquina autorizada.',
-    role_creation_hint:
-      'Não consegue encontrar o papel correto de máquina para máquina? <a>Crie um papel de máquina para máquina</a>',
-  },
 };
 
 export default Object.freeze(applications);
diff --git a/packages/phrases/src/locales/ru/translation/admin-console/applications.ts b/packages/phrases/src/locales/ru/translation/admin-console/applications.ts
@@ -55,12 +55,6 @@ const applications = {
   placeholder_title: 'Выберите тип приложения, чтобы продолжить',
   placeholder_description:
     'Logto использует сущность приложения для OIDC для выполнения задач, таких как идентификация ваших приложений, управление входом в систему и создание журналов аудита.',
-  m2m_role_assignment: {
-    title: 'Авторизовать приложение с ролью от машины к машине для разрешений',
-    subtitle: 'Приложения от машины к машине требуют авторизованной роли от машины к машине.',
-    role_creation_hint:
-      'Не можете найти подходящую роль машина-машина? <a>Создайте роль машина-машина</a>',
-  },
 };
 
 export default Object.freeze(applications);
diff --git a/packages/phrases/src/locales/tr-tr/translation/admin-console/applications.ts b/packages/phrases/src/locales/tr-tr/translation/admin-console/applications.ts
@@ -55,12 +55,6 @@ const applications = {
   placeholder_title: 'Devam etmek için bir uygulama tipi seçin',
   placeholder_description:
     'Logto, uygulamanızı tanımlamaya, oturum açmayı yönetmeye ve denetim kayıtları oluşturmaya yardımcı olmak için OIDC için bir uygulama varlığı kullanır.',
-  m2m_role_assignment: {
-    title: 'İzinler için makineye özel rolle uygulamayı yetkilendir',
-    subtitle: 'Makine-makine uygulamaları yetkilendirilmiş bir makine-makine rolü gerektirir.',
-    role_creation_hint:
-      'Doğru makineden makineye rolünü bulamıyor musunuz? <a>Makineden makineye rol oluşturun</a>',
-  },
 };
 
 export default Object.freeze(applications);
diff --git a/packages/phrases/src/locales/zh-cn/translation/admin-console/applications.ts b/packages/phrases/src/locales/zh-cn/translation/admin-console/applications.ts
@@ -52,11 +52,6 @@ const applications = {
   placeholder_title: '选择应用程序类型以继续',
   placeholder_description:
     'Logto 使用 OIDC 的应用程序实体来帮助识别你的应用程序、管理登录和创建审计日志等任务。',
-  m2m_role_assignment: {
-    title: '使用机器到机器角色授权应用程序以获取权限',
-    subtitle: '机器对机器应用程序需要经过授权的机器对机器角色。',
-    role_creation_hint: '找不到合适的机器对机器角色？<a>创建一个机器对机器角色</a>',
-  },
 };
 
 export default Object.freeze(applications);
diff --git a/packages/schemas/src/consts/subscriptions.ts b/packages/schemas/src/consts/subscriptions.ts
@@ -17,13 +17,6 @@ export enum ReservedPlanId {
    * - LOG-8339: Migrate legacy Stripe data
    */
   Hobby = 'hobby',
-  /**
-   * @deprecated
-   * Now this `pro` ID is not used anymore, we use `hobby` as the `pro` plan ID.
-   * Only use this `pro` value when displaying the plan ID to the user.
-   *
-   * Todo @darcyYe see `Hobby` todo
-   */
   Pro = 'pro',
   /**
    * @deprecated

diff --git a/pipeline-templates/build_service.yml b/pipeline-templates/build_service.yml
@@ -1,3 +1,5 @@
+# OGCIO
+
 parameters:
   - name: serviceName
     default: ""

diff --git a/pipeline-templates/deploy_ecs.yml b/pipeline-templates/deploy_ecs.yml
@@ -1,3 +1,5 @@
+# OGCIO
+
 parameters:
   - name: serviceName
   - name: awsRegion

diff --git a/pipeline-templates/push_image.yml b/pipeline-templates/push_image.yml
@@ -1,3 +1,5 @@
+# OGCIO
+
 parameters:
   - name: serviceName
   - name: awsRegion

diff --git a/pipeline-variables/dev.yml b/pipeline-variables/dev.yml
@@ -1,3 +1,5 @@
+# OGCIO
+
 variables:
   awsServiceConnection: life-events-dev-ecr
   awsRegion: eu-west-1

diff --git a/pipeline-variables/sta.yml b/pipeline-variables/sta.yml
@@ -1,3 +1,5 @@
+# OGCIO
+
 variables:
   awsServiceConnection: life-events-sta-ecr
   awsRegion: eu-west-1

diff --git a/pipeline-variables/uat.yml b/pipeline-variables/uat.yml
@@ -1,3 +1,5 @@
+# OGCIO
+
 variables:
   awsServiceConnection: life-events-uat-ecr
   awsRegion: eu-west-1