Skip to content

Commit

Permalink
Spike/try to rebase to v1.18.0 (#122)
Browse files Browse the repository at this point in the history
* chore(schemas): add reserved plan ID for admin tenant (logto-io#5976)

* feat(core): report oidc exceptions to the appInsights (logto-io#5978)

report oidc exceptions to the appInsights

* refactor(console): click console logo should navigate to root page (logto-io#5981)

* fix(console): language switch should work on profile page (logto-io#5980)

* refactor(core): try to fix uncaught exception (logto-io#5982)

* refactor(console): use permanently delete (logto-io#5979)

* refactor(core): optimize redis error handling (logto-io#5965)

* chore(deps): update dependency @testing-library/react to v16 (logto-io#5984)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(connector): improve DingTalk web connector readme (logto-io#5977)

* feat: add dingtalk connector

* refactor(connector): optimize codes

* refactor(connector): optimize the logic of getting user phone

* docs(connector): add English configuration guide for DingTalk

* docs(connector): add table of contents

* docs(connector): optimize format

* chore(connector): update DingTalk web connector readme

* chore(connector): apply suggestions from code review

Co-authored-by: Darcy Ye <darcyye@silverhand.io>
Co-authored-by: Charles Zhao <charleszhao@silverhand.io>

---------

Co-authored-by: aidenlu <aiden_lu@wochacha.com>
Co-authored-by: Darcy Ye <darcyye@silverhand.io>
Co-authored-by: Charles Zhao <charleszhao@silverhand.io>

* chore(deps): update dependency i18next-browser-languagedetector to v8 (logto-io#5850)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore: remove dev flags and add changeset for m2m guide feature (logto-io#5983)

* feat(console): add new feature content for m2m integration guide (logto-io#5947)

* refactor(console): always display role creation hint in role assignment modal (logto-io#5988)

* refactor(core,schemas): add user detail payload to User.Deleted webhook event (logto-io#5986)

* refactor(core,schemas): add user detail payload to User.Deleted DataHook event

add user detail data payload to the User.Deleted DataHook event

* fix(core): fix unit test

fix unit test

* refactor(console,phrases): update role assignment modal phrases (logto-io#5989)

* refactor(core): reorg organization routes

* refactor(core): reorg organization queries

* feat(schemas): init organization email domains table

* feat(core): organization email domains apis

* chore: add api docs

* refactor: fix tests

* feat(core): implement organization jit provisioning

* refactor(core): trigger organization membership updated hook from jit

* refactor: fix tests

* feat(console): implement organization jit ui

* feat(core,console): enable backchannel logout

* chore: add tests and changeset

* chore(console,core): launch organization jit

* feat(core,console): organization mfa requirement

* chore: add tests

* feat: automatic social account linking (logto-io#5881)

* feat: automatic social account linking

* chore: add integration tests

* chore: add changeset

* fix(core): prevent uncaught promise rejection (logto-io#6009)

* fix(core): prevent uncaught promise rejection

prevent uncaught promise rejection crashing the app

* refactor(core): remove inline await

remove inline await statement

* chore(core): update comment

update comment

* refactor(console): allow view and update `user.profile` in settings

* refactor: apply suggestions from code review

Co-authored-by: Charles Zhao <charleszhao@silverhand.io>

* refactor(console): update jit styles

* feat(core,console): organization jit roles

* refactor: add organization jit role api tests

* chore: update changeset

* style(console): update tab item style in readme docs (logto-io#6013)

* refactor(console): imporve custom phrase fetch request error handling (logto-io#6015)

* refactor(console): improve webhook test request error handling (logto-io#6017)

* refactor: rename method

* feat(connector): google one tap

* feat(core): google one tap

* feat(experience): google one tap

* chore: add tests

* chore: add tests

* refactor(console): update spring boot api protection guide (logto-io#6018)

update spring boot api protection guide

* refactor(console,experience,test): decouple isDevFeatureEnabled with isIntegrationTest (logto-io#6012)

* refactor(console,experience,test): decouple isDevFeatureEnabled with isIntegrationTest

decouple isDevFeatureEnabled with isIntegrationTest ENV variables

* chore: update environment variable get method

update environment variable get method

* refactor(console): improve swr error handling that previously omitted (logto-io#6021)

* chore: add comments

* chore: add changeset (logto-io#6004)

* feat: add dev feature disabled test (logto-io#6014)

feat: implement dev feature disabled integration test

implement dev feature desiabled integration test

* chore: update README.md (logto-io#6038)

* refactor(console): show sso status in jit domains (logto-io#6040)

* feat(console): google one tap (logto-io#6034)

* test(core): implement sso related integration tests (logto-io#6041)

* test(core): implement sso related integration tests

implement sso related integration tests

* chore(core): remove unnecessary comments

remove unnecessary comments

* feat(console): add Ruby app guide

* chore(deps): update docker/build-push-action action to v6 (logto-io#6042)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(connector): update outdated links in connector readme (logto-io#6039)

* refactor(console): support non-svg logos

* feat(schemas): add `agree_to_terms_policy` for sie table (logto-io#6036)

* feat(console,phrases): support agree to terms policy configuration (logto-io#6037)

* feat(experience): support agree to terms policies (logto-io#6044)

* chore(console): update guide orders (logto-io#6047)

* feat(core): jit organization roles (logto-io#6049)

* refactor(core): update relation queries

* refactor: fix google one tap issues (logto-io#6054)

* chore(schemas): add legacy-pro tag to reserved plan ID (logto-io#6061)

* feat(core): init organization app apis

* refactor(core): reorg organization users api docs

* chore: skip tests if needed

* style(experience): add margin-bottom for terms checkbox on sign-in page (logto-io#6058)

* chore(test): reorg the sso connector api cleanup logic (logto-io#6053)

reorg the sso connector api cleanup logic

* docs(console): add the troubleshooting section in expo guide (logto-io#6052)

* docs(console): add the troubleshoot section in expo guide

add the troubleshoot section in expo integration guide

* chore: update the words

update the words

* feat(core): organization jit sso apis

* feat(core): init organization app role apis

* chore: rename legacy pro to grandfathered pro (logto-io#6076)

* refactor(console): update subscription plan ID (logto-io#6074)

* feat(core): organization jit sso

* feat(console): update jit config

* refactor: improve code, content, and styles

* chore(deps): update dependency buffer to v6 (logto-io#6060)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(core): add dev feature tag for openapi.json (logto-io#6025)

chore(core): add dev feature tag for openapi.json to indicate operation should not show up in swagger.json

* chore(deps): update ikalnytskyi/action-setup-postgres action to v6 (logto-io#5815)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(experience): apply agree to terms policy for sso (logto-io#6080)

* chore: update changeset (logto-io#6077)

* refactor(core): update naming and fix typos

* refactor(core): reorg organization routes

* fix: fix dev feature disabled integration tests

fix dev feature disabled integration tests

* feat(core): issue subject tokens (logto-io#6045)

* chore: update code owners (logto-io#6081)

* refactor(core): return roles in organization app get api

* feat: organization role types

* chore: fix tests

* feat(core): get application organizations api

* feat(core): update application organization role apis

* fix: change special character to fix root paramter naming issue

feat: add customParameters function for fixing tenantId error on `/api/.well-known/endpoints/{tenantId}`

* fix: update mocks and docstrings

* feat(console): show organization list for m2m apps

* refactor: filter whole supplement document if needed (logto-io#6085)

* refactor: update status code

* feat(console): m2m pages in organizations

* refactor: add changeset and improve code

* refactor(core): fork client credentials grant

* feat: support prompt config for some built-in connectors (logto-io#6023)

* feat: support prompt config for some built-in connectors

* chore: adopt code review suggestions

Co-authored-by: Gao Sun <gao@silverhand.io>

---------

Co-authored-by: Gao Sun <gao@silverhand.io>

* refactor: refactor integration test ci job (logto-io#6095)

* fix: remove dev feature diff check

remove dev feature diff check

* refactor: refactor alteration integration test ci job

refactor alteration integration test ci job

* fix: fix the dev feature disbaled integration tests

fix the dev feature disabled integration tests

* fix: fix alteration-compatibility-test

fix alteration-compatibility-test

* feat(console,phrases): add issuer endpoint to application form (logto-io#6094)

* feat(console,phrases): add issuer endpoint to application form

add issuer endpoint to the application form

* chore: add changeset

add changeset

* fix(schemas): explicitly set search path (logto-io#6101)

* refactor(console): update role-related content and components (logto-io#6091)

* refactor(console): hide backchannel for m2m apps (logto-io#6075)

* refactor: add brief intro in swagger.json (logto-io#6102)

* fix: include `tenantId` and its root param in responses (logto-io#6092)

* fix: include tenantId and its root param in responses

* refactor: use shared object

---------

Co-authored-by: Gao Sun <gao@silverhand.io>

* refactor(experience,phrases): update resend passcode phrases (logto-io#6103)

* feat(core): add hasPassword field to custom JWT user context (logto-io#6096)

* refactor: handle potential errors during ky requests in koa-auth middleware (logto-io#6112)

* feat(core): issue organization token via client credentials (logto-io#6098)

* feat(core): issue organization token via client credentials

* refactor: fix tests

* refactor(console): upgrade mdx packages

* refactor(console): remove unused config

* chore: fix typo (logto-io#6110)

* refactor: update nuxt guide (logto-io#6114)

* refactor: update nuxt guide

* refactor: polish content

* refactor(console): update ruby guide (logto-io#6116)

* refactor(console): update ruby guide

* refactor(console): support further readings

* refactor(console): reorg docs

* refactor(console): update next guide (logto-io#6119)

* refactor(core): update grant comments (logto-io#6120)

* chore: update README.mdx (logto-io#6121)

Added a missing backtick that breaks layout

* refactor(console): update swift guide (logto-io#6123)

* refactor(console): polish ui (logto-io#6122)

* refactor(console): polish ui

* refactor: fix code editor title color

* refactor(console): use correct array for checking enterprise sso (logto-io#6135)

* refactor(console): use correct array for checking enterprise sso

* refactor(console): hide add connector button when no connector available

* refactor(console): fix sso connector check conditions in the organization jit section

* refactor(console): update styles

* refactor(console): update express guide (logto-io#6124)

* refactor(console): polish android guide (logto-io#6131)

* ci: refactor integration tests workflow

* ci: add spaces

* refactor(test): use secure random method in integration test util (logto-io#6139)

* refactor(console): update python and php guide (logto-io#6136)

* refactor(console): update python/php console guide

* refactor(console): improve php guide

* refactor(console): improve python guide

---------

Co-authored-by: Gao Sun <gao@silverhand.io>

* refactor(console): polish guides

* chore(console): remove unmaintained remix guide (logto-io#6137)

* refactor(console): update golang guide (logto-io#6134)

* refactor(console): update golang guide

* refactor: use imported uris for go docs

* refactor(console): fix switch styles (logto-io#6132)

* refactor(console): fix php guide (logto-io#6143)

* feat: demo app dev panel (logto-io#6105)

* docs(console): update the sveltekit guide (logto-io#6130)

* docs(console): update the sveltekit guide

update the sveltekit guide

* chore(console): reorg the display user section in svltekit

reorg the display user section in svltekit

* refactor(console): improve content

---------

Co-authored-by: Gao Sun <gao@silverhand.io>

* chore: launch jit (logto-io#6127)

* chore: launch m2m app for organizations (logto-io#6129)

* chore: launch m2m app for organizations

* chore: add changeset

* chore: normalize Logto DB region role names for DB alteration CI (logto-io#6144)

* docs(console): update the expo SDK integration guide (logto-io#6126)

* docs(console): update the expo SDK integration guide

update the expo SDK integrtion guide

* chore(console): update rn guide section title

update rn guide section title

* refactor(console): improve content

---------

Co-authored-by: Gao Sun <gao@silverhand.io>

* feat(core,schemas): token exchange grant (logto-io#6057)

* docs(console): update flutter intergration guide (logto-io#6125)

improve content

---------

Co-authored-by: Gao Sun <gao@silverhand.io>

* fix(experience): add missing `agreeToTermsPolicy` deps (logto-io#6148)

* docs(console): update the capacitor integration guide (logto-io#6128)

* docs(console): update the capacitor integration guide

update the capacitor integration guide

* fix(console): reorg capacitor guide

reorg capacitor guide

* chore(console): update the section title

update the section title

* refactor(console): improve content

---------

Co-authored-by: Gao Sun <gao@silverhand.io>

* refactor: fix mermaid in production (logto-io#6149)

Use dynamic CDN import to use Mermaid as Parcel has issues on handling the
static import in production.

* ci: rerun integration tests on failure (logto-io#6141)

* docs(console): update the java spring guide (logto-io#6133)

---------

Co-authored-by: Gao Sun <gao@silverhand.io>

* refactor(console): add retry button on error (logto-io#6158)

* refactor(console): update vanilla js integration guide (logto-io#6156)

* refactor(console): update vanilla js integration guide

* refactor(console): improve content

---------

Co-authored-by: Gao Sun <gao@silverhand.io>

* refactor(console): update react integration guide (logto-io#6151)

* refactor(console): update react integration guide

* refactor(console): improve content

---------

Co-authored-by: Gao Sun <gao@silverhand.io>

* refactor(console): update vue integration guide (logto-io#6153)

* refactor(console): update vue integration guide

* refactor(console): improve content

---------

Co-authored-by: Gao Sun <gao@silverhand.io>

* refactor(console): update angular integration guide (logto-io#6157)

* refactor(console): update angular integration guide

* refactor(console): improve content

---------

Co-authored-by: Gao Sun <gao@silverhand.io>

* refactor(console): load mermaid in dev (logto-io#6155)

* feat(core): third-party applications are not allowed for token exchange (logto-io#6100)

* feat(core,schemas): token exchange grant

* feat(core): third-party applications are not allowed for token exchange

* refactor: update compare DB alteration scripts (logto-io#6152)

* refactor: update compare DB alteration scripts

* chore: add comments

* refactor: upgrade logto sdks (logto-io#6160)

* fix(console): fix broken api resource guides (logto-io#6161)

* feat(core): organization token for token exchange flow (logto-io#6106)

* feat(core,schemas): token exchange grant

* feat(core): third-party applications are not allowed for token exchange

* feat(core,schemas): token exchange grant

* feat(core): organization token for token exchange flow

* refactor(console): optimize api resource guides (logto-io#6162)

* fix(console): fix custom element swap in mdx (logto-io#6166)

* refactor(console): add aggregated npm installation component (logto-io#6159)

* refactor: update ci and package (logto-io#6167)

* refactor: update ci and package

* chore: fix tests

* fix(console): hide error toast for non-existed application in audit logs (logto-io#6168)

* fix(console): hide error toast for non-existed application in audit logs

* chore: add changeset

* feat: add `operationId` to HTTP methods on paths (logto-io#6108)

* feat: add operationId to HTTP methods on paths

* refactor(core): strictly handle routes for building operation id

* chore: add changeset

* refactor: reorg code

* refactor: use get as verb for singular items

---------

Co-authored-by: Gao Sun <gao@silverhand.io>

* feat(schemas): custom ui assets db update (logto-io#6010)

* fix(core): issue `organization_id` claim for client credentials (logto-io#6170)

* feat(core): handle oidc scopes for token exchange (logto-io#6147)

* feat(core,schemas): token exchange grant

* feat(core): third-party applications are not allowed for token exchange

* feat(core,schemas): token exchange grant

* feat(core): organization token for token exchange flow

* feat(core): handle oidc scopes for token exchange

* chore(deps): update dependency @rollup/plugin-commonjs to v26 (logto-io#5994)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* refactor(experience): rename `SingleSignOnContext` to `UserInteractionContext` (logto-io#6163)

* chore(deps): update logto-io/actions-run-logto-integration-tests action to v4 (logto-io#6176)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update logto-io/actions-package-logto-artifact action to v3 (logto-io#6175)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update silverhand-io/actions-node-pnpm-run-steps action to v5 (logto-io#6174)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* refactor(console): improve dotnet guides

* fix(console): fix page issues (logto-io#6181)

* refactor(console): check mermaid by integration test env (logto-io#6183)

* feat(core): implement new experience API routes (logto-io#5992)

* feat(core): implement new interaction-session management flow

implement a new interaction-session management flow for experience api use

* feat(core): implement password sign-in flow

implement password sign-in flow

* test(core,schemas): add sign-in password tests

add sign-in password tests

* chore(core): update comments

update comments

* refactor(core): rename the password input value key

rename the password input value key

* refactor(core,schemas): refactor the experience API

refactor the exerpience API structure

* chore(test): add devFeature test

add devFeature test

* refactor(core): rename the path

rename the path

* refactor(core,schemas): refactor using the latest API design

refactor using the latest API design

* chore(test): replace using devFeature test statement

replace using devFeature test statement

* fix(core): fix lint error

fix lint error

* refactor(core): refactor experience API implementations

refactor experience API implementations

* refactor(core): replace with switch

replace object map with switch

* refactor: apply suggestions from code review

* refactor(core): refactor the interaction class
 refactor the interaction class

* refactor(core): update the user identification logic

update the user identification logic

---------

Co-authored-by: Gao Sun <gao@silverhand.io>

* feat(core): implement verification code verification API (logto-io#6001)

* feat(core,schemas): implement the verification code flow

implement the verification code flow

* chore(core): fix rebase issue

fix rebase issue

* refactor(console): add chrome extension guide (logto-io#6178)

* feat(core,schemas): implement social verification experience API endpoints (logto-io#6150)

feat(core,schemas): implement the social verification flow

implement the social verificaiton flow

* release: version packages (logto-io#5987)

* feat(cli): added ogcio folder

* chore(cli): added ref to ogcio command

* feat(core): added env sample

* chore(cli): added port collision fix

* chore(core): updated docker compose

* chore(cli): fixed dockerfile

* chore(cli): added makefile

* chore(core): updated package json

* chore(core): updated run logto remote

* chore(core): updated pr request template

* chore(cli): ogcio connectors

* chore(phrases): updated errors

* chore(core): added lot of stuffs

* fix(cli): fixed port

* workflow main

* dockerignore

* readme

* basics

* basics

* basics

* basics

* eof

* eof

* eof

* chore(core): synced

---------

Co-authored-by: Darcy Ye <darcyye@silverhand.io>
Co-authored-by: simeng-li <simeng@silverhand.io>
Co-authored-by: Charles Zhao <charleszhao@silverhand.io>
Co-authored-by: Gao Sun <gao@silverhand.io>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: aiden <allaher@icloud.com>
Co-authored-by: aidenlu <aiden_lu@wochacha.com>
Co-authored-by: Xiao Yijun <xiaoyijun@silverhand.io>
Co-authored-by: wangsijie <wangsijie@silverhand.io>
Co-authored-by: Mostafa Moradian <mstfmoradian@gmail.com>
Co-authored-by: ScreenCom User <admin@screencom.eu>
Co-authored-by: silverhand-bot <107667382+silverhand-bot@users.noreply.github.com>
  • Loading branch information
13 people authored Sep 3, 2024
1 parent 3049271 commit a33ebc5
Show file tree
Hide file tree
Showing 37 changed files with 393 additions and 555 deletions.
4 changes: 2 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# dependencies
**/node_modules
node_modules

# testing
/packages/**/coverage
Expand Down Expand Up @@ -34,4 +34,4 @@ dump.rdb
.github
.husky
.parcel-cache
.vscode
.vscode
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
"typescript",
"typescriptreact",
],
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"json.schemas": [
{
"fileMatch": [
Expand Down Expand Up @@ -56,5 +53,6 @@
"upsell",
"withtyped",
"backchannel"
]
],
"eslint.codeActionsOnSave.rules": null
}
5 changes: 4 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"]
2 changes: 2 additions & 0 deletions azure_pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# OGCIO

trigger:
- dev
- uat
Expand Down
25 changes: 1 addition & 24 deletions packages/connectors/connector-azuread/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Original file line number Diff line number Diff line change
Expand Up @@ -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;
2 changes: 1 addition & 1 deletion packages/core/src/libraries/application.ts
Original file line number Diff line number Diff line change
Expand Up @@ -303,4 +303,4 @@ export const createApplicationLibrary = (queries: Queries) => {
validateUserConsentOrganizationMembership,
validateProtectedApplicationById,
};
};
};
2 changes: 1 addition & 1 deletion packages/core/src/libraries/ogcio-user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 [];
}
Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/routes/admin-user/basics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -462,4 +462,3 @@ describe('submit action', () => {
});
});
});
/* eslint-enable max-lines */
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ async function handleSubmitRegister(
organizations,
// OGCIO
roles,
// OGCIO
usersRoles,
} = queries;

Expand Down
2 changes: 1 addition & 1 deletion packages/experience/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 5 additions & 2 deletions packages/experience/src/types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
1 change: 0 additions & 1 deletion packages/integration-tests/src/api/application.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,4 @@ describe('Sign-in flow using password identifiers', () => {

await deleteUser(user.id);
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -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);
7 changes: 0 additions & 7 deletions packages/schemas/src/consts/subscriptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions pipeline-templates/build_service.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# OGCIO

parameters:
- name: serviceName
default: ""
Expand Down
2 changes: 2 additions & 0 deletions pipeline-templates/deploy_ecs.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# OGCIO

parameters:
- name: serviceName
- name: awsRegion
Expand Down
2 changes: 2 additions & 0 deletions pipeline-templates/push_image.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# OGCIO

parameters:
- name: serviceName
- name: awsRegion
Expand Down
2 changes: 2 additions & 0 deletions pipeline-variables/dev.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# OGCIO

variables:
awsServiceConnection: life-events-dev-ecr
awsRegion: eu-west-1
Expand Down
2 changes: 2 additions & 0 deletions pipeline-variables/sta.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# OGCIO

variables:
awsServiceConnection: life-events-sta-ecr
awsRegion: eu-west-1
Expand Down
2 changes: 2 additions & 0 deletions pipeline-variables/uat.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# OGCIO

variables:
awsServiceConnection: life-events-uat-ecr
awsRegion: eu-west-1
Expand Down
Loading

0 comments on commit a33ebc5

Please sign in to comment.