Skip to content

Commit

Permalink
[DX-1437] catalogue --> catalog (PR 1) (#5046)
Browse files Browse the repository at this point in the history
  • Loading branch information
Roeegg2 authored Jul 10, 2024
1 parent f319677 commit b9b11f1
Show file tree
Hide file tree
Showing 39 changed files with 126 additions and 126 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ For details on the API-level cache you should refer to the [API-level cache]({{<
When your API has more than one endpoint the upstream data could have different degrees of freshness, for example the data returned by one endpoint might refresh only once every five minutes (and so should be suitably cached) whilst another might give real-time data and so should not be cached. The endpoint cache allows you to optimize the caching of each endpoint to meet your requirements.

#### Request based caching
If you have an API that's providing search capability (for example into a catalogue of products) and want to optimize the performance for the most frequently requested search terms, you could use the endpoint cache's [request-selective](#request-selective-cache-control) capability to cache only a subset of all requests to an endpoint.
If you have an API that's providing search capability (for example into a catalog of products) and want to optimize the performance for the most frequently requested search terms, you could use the endpoint cache's [request-selective](#request-selective-cache-control) capability to cache only a subset of all requests to an endpoint.

## How the endpoint cache works
If caching is enabled then, by default, Tyk will create separate cache entries for every endpoint (path) of your API. This may be unnecessary for your particular API, so Tyk provides a facility to cache only specific endpoint(s).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ $ curl -k \
Instead of manually creating keys, we can expose the Above API via the Developer Portal, where developers can add their own certs to use to access APIs.

1. Create a policy for the API we set up above
2. Create a catalogue entry for this policy
2. Create a catalog entry for this policy
3. As a developer on the Portal, request a key for this API. This will take us to this screen:

{{< img src="/img/dashboard/system-management/portal_cert_request.png" alt="portal_cert_request" >}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Tyk offers the following features to support improper inventory management:
- [Versioning]({{< ref "getting-started/key-concepts/versioning" >}}) allows newer versions of APIs to coexist with the older versions, facilitating deprecation and sunsetting.
- [Sunsetting]({{< ref "getting-started/key-concepts/versioning#sunsetting-api-versions" >}}) allows versions to be configured with an Expiry Time, ensuring that a version is not accessible after the expiry date.
- [Key expiry]({{< ref "basic-config-and-security/control-limit-traffic/key-expiry" >}}) ensures that access to an API is short lived, with a per key configurable Time to Live (TTL) for which a token remains valid before it expires. The implementation of key expiry, with a configurable Time To Live (TTL), mitigates the impact of compromised tokens by narrowing the window of vulnerability. Setting a TTL reduces the time frame during which a compromised token could be exploited, enhancing overall security.
- Tyk Developer Portal catalogues APIs and facilitates granting access to them. Integrated with a CMDB it can help keep documentation updated.
- Tyk Developer Portal catalogs APIs and facilitates granting access to them. Integrated with a CMDB it can help keep documentation updated.
- [Tyk Analytics]({{< ref "tyk-dashboard-analytics" >}}) can help identify the stagnant APIs and used stale APIs.
- [Tyk Pump]({{< ref "tyk-pump" >}}) can ship metrics needed for analytics into Tyk Dashboard and other systems.
- Third-party [Secret Storage]({{< ref "tyk-configuration-reference/kv-store" >}}) can be used to centralise and protect sensitive configuration data such as passwords, rather than exposing them as plain text in Tyk configuration files.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,6 @@ A developer already has a key that gives access to Policy A and now requires acc
**Note**

For v2.4 and 1.4 multiple policies are only supported only via the Add Key section and via the API.
Support oAuth, and Portal API Catalogues are planned for subsequent releases.
Support oAuth, and Portal API Catalogs are planned for subsequent releases.
Support of multiple policies for JWT and OIDC is done through the API definition when using scopes.
{{< /note >}}
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ How you configure your PostgreSQL installation depends on whether you are instal

## Migrating from an existing MongoDB instance

For v4.0 we have provided a migration command that will help you migrate all data from the main storage layer (APIs, Policies, Users, UserGroups, Webhooks, Certificates, Portal Settings, Portal Catalogues, Portal Pages, Portal CSS etc.).
For v4.0 we have provided a migration command that will help you migrate all data from the main storage layer (APIs, Policies, Users, UserGroups, Webhooks, Certificates, Portal Settings, Portal Catalogs, Portal Pages, Portal CSS etc.).

{{< note success >}}
**Note**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ We have updated the Dashboard **Apply Policies** section of the **Add Key** sect

{{< img src="/img/release-notes/apply_policy.png" alt="apply-policy" >}}

For this release multiple policies are only supported only via the Add Key section and via the API. Support for OIDC, oAuth, and Portal API Catalogues are planned for subsequent releases.
For this release multiple policies are only supported only via the Add Key section and via the API. Support for OIDC, oAuth, and Portal API Catalogs are planned for subsequent releases.

[Docs]({{< ref "basic-config-and-security/security/security-policies/partitioned-policies" >}})

Expand Down Expand Up @@ -239,7 +239,7 @@ The country code in the log browser has been changed to a link to the geographic

#### Redirect user to the login page if session is timed out.

#### When creating a portal API catalogue, you can now attach documentation without saving the catalogue first.
#### When creating a portal API catalog, you can now attach documentation without saving the catalog first.

#### Fixed the` proxy.preserve_host_header` field when saved via the UI.
Previously, the field was available in the API definition, but got removed if the API was saved via the UI.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -346,11 +346,11 @@ admin-auth: 12345
}
```

#### Set Catalogue settings for each individual API
#### Set Catalog settings for each individual API

Now you can override the global catalogue settings and specify settings per catalogue.
The Catalogue object now has `config` field, with exactly same structure as Portal Config, except new `override` boolean field.
If set, Catalogue settings will override global ones.
Now you can override the global catalog settings and specify settings per catalog.
The Catalog object now has `config` field, with exactly same structure as Portal Config, except new `override` boolean field.
If set, Catalog settings will override global ones.

At the moment the following options can be overriden: `Key request fields`, `Require key approval` and `Redirect on key request` (with `Redirect to` option as well).

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ Additionally you can now mix policies defined for the same API but having differ

#### Developer Portal Updates

Developers now can have multiple API keys, and subscribe to multiple catalogues with a single key. Go to the Portal settings and set `Enable subscribing to multiple APIs with single key` option to enable this new flow. When enabled, developers will see the new API generation user interface, which allows users to request access to multiple Catalogues of the **same type** with a single key.
Developers now can have multiple API keys, and subscribe to multiple catalogues with a single key. Go to the Portal settings and set `Enable subscribing to multiple APIs with single key` option to enable this new flow. When enabled, developers will see the new API generation user interface, which allows users to request access to multiple Catalogs of the **same type** with a single key.

From an implementation point of view, Developer objects now have a `Keys` attribute, which is the map where the key is a `key` and the value is an array of policy IDs. The `Subscriptions` field can be considered as deprecated, with retained backwards compatibility. We have added new set of Developer APIs to manage the keys, similar to the deprecated subscriptions APIs.

Other changes:

- Added two new Portal templates, which are used by a new key request flow `portal/templates/request_multi_key.html`, `portal/templates/request_multi_key_success.html`
- The Portal Catalogue list page has been updated to show the Catalogue authentication mode
- The API dashboard screen now show keys instead of subscriptions, and if subscribed to multiple policies, it will show the allowance rules for all catalogues.
- The Portal Catalog list page has been updated to show the Catalog authentication mode
- The API dashboard screen now show keys instead of subscriptions, and if subscribed to multiple policies, it will show the allowance rules for all catalogs.
- The Key request API has been updated to accept an `apply_policies` array instead of `for_plan`

### JWT and OpenID scope support
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ See how to [Choose a MongoDB driver]({{< ref "planning-for-production/database-s
#### Changelog {#Changelog-v5.0.2}

##### Fixed
- Fixed a bug on migration of a portal catalogue with deleted policy to SQL
- Fixed a bug on migration of a portal catalog with deleted policy to SQL
- Fixed: Redirect unregistered user to new page when SSOOnlyForRegisteredUsers is set to true

---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
title: "Create API Consumer organisations and catalogues"
title: "Create API Consumer organisations and catalogs"
date: 2022-02-10
tags: ["Tyk Developer Portal","Enterprise Portal","Catalogue","Audience","Developers","Organisations"]
description: "Segment your developer audience with catalogues and organisations"
tags: ["Tyk Developer Portal","Enterprise Portal","Catalog","Audience","Developers","Organisations"]
description: "Segment your developer audience with catalogs and organisations"
menu:
main:
parent: "Manage API Users"
Expand All @@ -18,7 +18,7 @@ If you are interested in getting access, contact us at [[email protected]](<mailto:

## Introduction

In the Tyk Enterprise Developer Portal, Organisations and Catalogues are used to segment the user base and make different APIs available to different user audiences according to the business model.
In the Tyk Enterprise Developer Portal, Organisations and Catalogs are used to segment the user base and make different APIs available to different user audiences according to the business model.
For example, assume the following scenario:

- Account Management API is available only to trusted partners
Expand All @@ -29,11 +29,11 @@ Subsequently, two catalogs can be created for these two APIs.
In the below example, an API Provider offers two API Products (the Accounts API and Payment API) with two plans (the Free plan and Enterprise plan) to their customers.
Customers subscribed to the enterprise plan can use both APIs, offering a higher user limit. Conversely, customers subscribed to the Free plan (individual developers or hobbyists) only have visibility of the Payment API.

To achieve that, the API Provider uses two catalogues to implement their business model so that they can offer different experiences for different customer audiences. This section explains how to achieve that using the Tyk Enterprise Developer Portal.
To achieve that, the API Provider uses two catalogs to implement their business model so that they can offer different experiences for different customer audiences. This section explains how to achieve that using the Tyk Enterprise Developer Portal.
{{< img src="/img/dashboard/portal-management/enterprise-portal/org-catalogue-product-relation.png" alt="Relationship between catalogues, API Products, plans, teams, and organisations" >}}

## Create organisation and teams
The Tyk Enterprise Developer Portal uses Organisation and Catalogues to segment access to APIs and plans. Therefore, the first thing is to create an organisation for your customers. If you don't want to provision organisations manually, you can leverage the [Admin APIs]({{< ref "/product-stack/tyk-enterprise-developer-portal/api-documentation/tyk-edp-api.md" >}}) or enable the [self-service organisation registration]({{< ref "/tyk-stack/tyk-developer-portal/enterprise-developer-portal/managing-access/manage-api-consumer-organisations.md" >}}).
The Tyk Enterprise Developer Portal uses Organisation and Catalogs to segment access to APIs and plans. Therefore, the first thing is to create an organisation for your customers. If you don't want to provision organisations manually, you can leverage the [Admin APIs]({{< ref "/product-stack/tyk-enterprise-developer-portal/api-documentation/tyk-edp-api.md" >}}) or enable the [self-service organisation registration]({{< ref "/tyk-stack/tyk-developer-portal/enterprise-developer-portal/managing-access/manage-api-consumer-organisations.md" >}}).
In this guide, we will create the **B2B customer** organisation to fulfill the above business model:
1. To create an organisation for the **B2B customer**, navigate to the **Organisations** menu and click on the **Add new organisation** button.
{{< img src="/img/dashboard/portal-management/enterprise-portal/navigate-to-organisations.png" alt="Navigate to the Organisations menu" >}}
Expand All @@ -48,38 +48,38 @@ You can edit the default team name by navigating to **Teams** and opening up the

{{< /note >}}

## Create catalogues
1. To create catalogues, navigate to the catalogues menu in the Tyk Enterprise Developer Portal.
## Create catalogs
1. To create catalogs, navigate to the catalogs menu in the Tyk Enterprise Developer Portal.

The default catalogues that are featured when the portal is [bootstrapped]({{< ref "/product-stack/tyk-enterprise-developer-portal/deploy/bootstrapping-portal.md" >}}) are:
- **Public** catalogues are available to all developers.
- **Private** catalogues are available only to logged in developers who have been assigned with access.
The default catalogs that are featured when the portal is [bootstrapped]({{< ref "/product-stack/tyk-enterprise-developer-portal/deploy/bootstrapping-portal.md" >}}) are:
- **Public** catalogs are available to all developers.
- **Private** catalogs are available only to logged in developers who have been assigned with access.

You can create new catalogues by clicking on the **Add new catalogue** button or use the default catalogues.
You can create new catalogs by clicking on the **Add new catalog** button or use the default catalogs.

{{< img src="/img/dashboard/portal-management/enterprise-portal/navigate-to-catalogues.png" alt="Navigate the to catalogues menu" >}}

2. To add a new catalog, click on the **Add new catalogue** button. Then specify the name of the catalog and select its type: **Private** or **Public**.
Since the public catalogue already exists, in this guide you need to create only an additional private catalogue called **Enterprise catalogue** for the **B2B customer** who will have extended access rights compared to other developers.
2. To add a new catalog, click on the **Add new catalog** button. Then specify the name of the catalog and select its type: **Private** or **Public**.
Since the public catalog already exists, in this guide you need to create only an additional private catalog called **Enterprise catalog** for the **B2B customer** who will have extended access rights compared to other developers.
{{< img src="/img/dashboard/portal-management/enterprise-portal/specify-name-of-catalogue.png" alt="Create a catalogue" >}}

{{< note >}}
**Note**

While it is possible to create multiple public catalogues, we do not advise doing so. This is because multiple public catalogues will share the same level of access.
While it is possible to create multiple public catalogs, we do not advise doing so. This is because multiple public catalogs will share the same level of access.
{{< /note >}}

3. Once the catalogue is created, add a developer audience to it by clicking on the **Add Team** button and selecting an appropriate developer team (**B2B customer All users** in this example).
Finally, add plans and API Products to the created catalogue so that the selected developer teams can view them.
3. Once the catalog is created, add a developer audience to it by clicking on the **Add Team** button and selecting an appropriate developer team (**B2B customer All users** in this example).
Finally, add plans and API Products to the created catalog so that the selected developer teams can view them.
{{< img src="/img/dashboard/portal-management/enterprise-portal/add-team-products-and-plans.png" alt="Add teams, products, and plans to the catalogue" >}}

You can achieve the same result by navigating to the **API Products** menu. Adding an API Product to a catalogue through the **Catalogues** and the **API Products** menus will produce the same result.
You can achieve the same result by navigating to the **API Products** menu. Adding an API Product to a catalogue through the **Catalogs** and the **API Products** menus will produce the same result.
{{< img src="/img/dashboard/portal-management/enterprise-portal/publish-products-to-catalogues.png" alt="Adding a product to a catalogue through the API Products menu" >}}

{{< note >}}
**Congratulations**

You have successfully added a catalogue and associated a team with it. Furthermore, you have allocated plans and API products to this catalogue.
You have successfully added a catalog and associated a team with it. Furthermore, you have allocated plans and API products to this catalog.
{{< /note >}}

Visit [Customise the sign-up form]({{< ref "/product-stack/tyk-enterprise-developer-portal/getting-started/customize-sign-up-form" >}}) for the user sign-up form customisation guide.
Loading

0 comments on commit b9b11f1

Please sign in to comment.