@azure/msal-common 14.6.0-alpha.0 → 14.6.1

package/src/authority/AuthorityMetadata.ts

@@ -8,556 +8,53 @@ import { UrlString } from "../url/UrlString";
 import { AuthorityMetadataSource } from "../utils/Constants";
 import { StaticAuthorityOptions } from "./AuthorityOptions";
 import { CloudDiscoveryMetadata } from "./CloudDiscoveryMetadata";
+import { CloudInstanceDiscoveryResponse } from "./CloudInstanceDiscoveryResponse";
+import { OpenIdConfigResponse } from "./OpenIdConfigResponse";
 
-export const rawMetdataJSON = {
+type RawMetadata = {
+    endpointMetadata: { [key: string]: OpenIdConfigResponse };
+    instanceDiscoveryMetadata: CloudInstanceDiscoveryResponse;
+};
+
+export const rawMetdataJSON: RawMetadata = {
     endpointMetadata: {
-        "https://login.microsoftonline.com/common/": {
-            token_endpoint:
-                "https://login.microsoftonline.com/common/oauth2/v2.0/token",
-            token_endpoint_auth_methods_supported: [
-                "client_secret_post",
-                "private_key_jwt",
-                "client_secret_basic",
-            ],
-            jwks_uri:
-                "https://login.microsoftonline.com/common/discovery/v2.0/keys",
-            response_modes_supported: ["query", "fragment", "form_post"],
-            subject_types_supported: ["pairwise"],
-            id_token_signing_alg_values_supported: ["RS256"],
-            response_types_supported: [
-                "code",
-                "id_token",
-                "code id_token",
-                "id_token token",
-            ],
-            scopes_supported: ["openid", "profile", "email", "offline_access"],
-            issuer: "https://login.microsoftonline.com/{tenantid}/v2.0",
-            request_uri_parameter_supported: false,
-            userinfo_endpoint: "https://graph.microsoft.com/oidc/userinfo",
-            authorization_endpoint:
-                "https://login.microsoftonline.com/common/oauth2/v2.0/authorize",
-            device_authorization_endpoint:
-                "https://login.microsoftonline.com/common/oauth2/v2.0/devicecode",
-            http_logout_supported: true,
-            frontchannel_logout_supported: true,
-            end_session_endpoint:
-                "https://login.microsoftonline.com/common/oauth2/v2.0/logout",
-            claims_supported: [
-                "sub",
-                "iss",
-                "cloud_instance_name",
-                "cloud_instance_host_name",
-                "cloud_graph_host_name",
-                "msgraph_host",
-                "aud",
-                "exp",
-                "iat",
-                "auth_time",
-                "acr",
-                "nonce",
-                "preferred_username",
-                "name",
-                "tid",
-                "ver",
-                "at_hash",
-                "c_hash",
-                "email",
-            ],
-            kerberos_endpoint:
-                "https://login.microsoftonline.com/common/kerberos",
-            tenant_region_scope: null,
-            cloud_instance_name: "microsoftonline.com",
-            cloud_graph_host_name: "graph.windows.net",
-            msgraph_host: "graph.microsoft.com",
-            rbac_url: "https://pas.windows.net",
-        },
-        "https://login.chinacloudapi.cn/common/": {
-            token_endpoint:
-                "https://login.chinacloudapi.cn/common/oauth2/v2.0/token",
-            token_endpoint_auth_methods_supported: [
-                "client_secret_post",
-                "private_key_jwt",
-                "client_secret_basic",
-            ],
-            jwks_uri:
-                "https://login.chinacloudapi.cn/common/discovery/v2.0/keys",
-            response_modes_supported: ["query", "fragment", "form_post"],
-            subject_types_supported: ["pairwise"],
-            id_token_signing_alg_values_supported: ["RS256"],
-            response_types_supported: [
-                "code",
-                "id_token",
-                "code id_token",
-                "id_token token",
-            ],
-            scopes_supported: ["openid", "profile", "email", "offline_access"],
-            issuer: "https://login.partner.microsoftonline.cn/{tenantid}/v2.0",
-            request_uri_parameter_supported: false,
-            userinfo_endpoint:
-                "https://microsoftgraph.chinacloudapi.cn/oidc/userinfo",
-            authorization_endpoint:
-                "https://login.chinacloudapi.cn/common/oauth2/v2.0/authorize",
-            device_authorization_endpoint:
-                "https://login.chinacloudapi.cn/common/oauth2/v2.0/devicecode",
-            http_logout_supported: true,
-            frontchannel_logout_supported: true,
-            end_session_endpoint:
-                "https://login.chinacloudapi.cn/common/oauth2/v2.0/logout",
-            claims_supported: [
-                "sub",
-                "iss",
-                "cloud_instance_name",
-                "cloud_instance_host_name",
-                "cloud_graph_host_name",
-                "msgraph_host",
-                "aud",
-                "exp",
-                "iat",
-                "auth_time",
-                "acr",
-                "nonce",
-                "preferred_username",
-                "name",
-                "tid",
-                "ver",
-                "at_hash",
-                "c_hash",
-                "email",
-            ],
-            kerberos_endpoint: "https://login.chinacloudapi.cn/common/kerberos",
-            tenant_region_scope: null,
-            cloud_instance_name: "partner.microsoftonline.cn",
-            cloud_graph_host_name: "graph.chinacloudapi.cn",
-            msgraph_host: "microsoftgraph.chinacloudapi.cn",
-            rbac_url: "https://pas.chinacloudapi.cn",
-        },
-        "https://login.microsoftonline.us/common/": {
-            token_endpoint:
-                "https://login.microsoftonline.us/common/oauth2/v2.0/token",
-            token_endpoint_auth_methods_supported: [
-                "client_secret_post",
-                "private_key_jwt",
-                "client_secret_basic",
-            ],
-            jwks_uri:
-                "https://login.microsoftonline.us/common/discovery/v2.0/keys",
-            response_modes_supported: ["query", "fragment", "form_post"],
-            subject_types_supported: ["pairwise"],
-            id_token_signing_alg_values_supported: ["RS256"],
-            response_types_supported: [
-                "code",
-                "id_token",
-                "code id_token",
-                "id_token token",
-            ],
-            scopes_supported: ["openid", "profile", "email", "offline_access"],
-            issuer: "https://login.microsoftonline.us/{tenantid}/v2.0",
-            request_uri_parameter_supported: false,
-            userinfo_endpoint: "https://graph.microsoft.com/oidc/userinfo",
-            authorization_endpoint:
-                "https://login.microsoftonline.us/common/oauth2/v2.0/authorize",
-            device_authorization_endpoint:
-                "https://login.microsoftonline.us/common/oauth2/v2.0/devicecode",
-            http_logout_supported: true,
-            frontchannel_logout_supported: true,
-            end_session_endpoint:
-                "https://login.microsoftonline.us/common/oauth2/v2.0/logout",
-            claims_supported: [
-                "sub",
-                "iss",
-                "cloud_instance_name",
-                "cloud_instance_host_name",
-                "cloud_graph_host_name",
-                "msgraph_host",
-                "aud",
-                "exp",
-                "iat",
-                "auth_time",
-                "acr",
-                "nonce",
-                "preferred_username",
-                "name",
-                "tid",
-                "ver",
-                "at_hash",
-                "c_hash",
-                "email",
-            ],
-            kerberos_endpoint:
-                "https://login.microsoftonline.us/common/kerberos",
-            tenant_region_scope: null,
-            cloud_instance_name: "microsoftonline.us",
-            cloud_graph_host_name: "graph.windows.net",
-            msgraph_host: "graph.microsoft.com",
-            rbac_url: "https://pasff.usgovcloudapi.net",
-        },
-        "https://login.microsoftonline.com/consumers/": {
-            token_endpoint:
-                "https://login.microsoftonline.com/consumers/oauth2/v2.0/token",
-            token_endpoint_auth_methods_supported: [
-                "client_secret_post",
-                "private_key_jwt",
-                "client_secret_basic",
-            ],
-            jwks_uri:
-                "https://login.microsoftonline.com/consumers/discovery/v2.0/keys",
-            response_modes_supported: ["query", "fragment", "form_post"],
-            subject_types_supported: ["pairwise"],
-            id_token_signing_alg_values_supported: ["RS256"],
-            response_types_supported: [
-                "code",
-                "id_token",
-                "code id_token",
-                "id_token token",
-            ],
-            scopes_supported: ["openid", "profile", "email", "offline_access"],
-            issuer: "https://login.microsoftonline.com/9188040d-6c67-4c5b-b112-36a304b66dad/v2.0",
-            request_uri_parameter_supported: false,
-            userinfo_endpoint: "https://graph.microsoft.com/oidc/userinfo",
-            authorization_endpoint:
-                "https://login.microsoftonline.com/consumers/oauth2/v2.0/authorize",
-            device_authorization_endpoint:
-                "https://login.microsoftonline.com/consumers/oauth2/v2.0/devicecode",
-            http_logout_supported: true,
-            frontchannel_logout_supported: true,
-            end_session_endpoint:
-                "https://login.microsoftonline.com/consumers/oauth2/v2.0/logout",
-            claims_supported: [
-                "sub",
-                "iss",
-                "cloud_instance_name",
-                "cloud_instance_host_name",
-                "cloud_graph_host_name",
-                "msgraph_host",
-                "aud",
-                "exp",
-                "iat",
-                "auth_time",
-                "acr",
-                "nonce",
-                "preferred_username",
-                "name",
-                "tid",
-                "ver",
-                "at_hash",
-                "c_hash",
-                "email",
-            ],
-            kerberos_endpoint:
-                "https://login.microsoftonline.com/consumers/kerberos",
-            tenant_region_scope: null,
-            cloud_instance_name: "microsoftonline.com",
-            cloud_graph_host_name: "graph.windows.net",
-            msgraph_host: "graph.microsoft.com",
-            rbac_url: "https://pas.windows.net",
-        },
-        "https://login.chinacloudapi.cn/consumers/": {
-            token_endpoint:
-                "https://login.chinacloudapi.cn/consumers/oauth2/v2.0/token",
-            token_endpoint_auth_methods_supported: [
-                "client_secret_post",
-                "private_key_jwt",
-                "client_secret_basic",
-            ],
-            jwks_uri:
-                "https://login.chinacloudapi.cn/consumers/discovery/v2.0/keys",
-            response_modes_supported: ["query", "fragment", "form_post"],
-            subject_types_supported: ["pairwise"],
-            id_token_signing_alg_values_supported: ["RS256"],
-            response_types_supported: [
-                "code",
-                "id_token",
-                "code id_token",
-                "id_token token",
-            ],
-            scopes_supported: ["openid", "profile", "email", "offline_access"],
-            issuer: "https://login.partner.microsoftonline.cn/9188040d-6c67-4c5b-b112-36a304b66dad/v2.0",
-            request_uri_parameter_supported: false,
-            userinfo_endpoint:
-                "https://microsoftgraph.chinacloudapi.cn/oidc/userinfo",
-            authorization_endpoint:
-                "https://login.chinacloudapi.cn/consumers/oauth2/v2.0/authorize",
-            device_authorization_endpoint:
-                "https://login.chinacloudapi.cn/consumers/oauth2/v2.0/devicecode",
-            http_logout_supported: true,
-            frontchannel_logout_supported: true,
-            end_session_endpoint:
-                "https://login.chinacloudapi.cn/consumers/oauth2/v2.0/logout",
-            claims_supported: [
-                "sub",
-                "iss",
-                "cloud_instance_name",
-                "cloud_instance_host_name",
-                "cloud_graph_host_name",
-                "msgraph_host",
-                "aud",
-                "exp",
-                "iat",
-                "auth_time",
-                "acr",
-                "nonce",
-                "preferred_username",
-                "name",
-                "tid",
-                "ver",
-                "at_hash",
-                "c_hash",
-                "email",
-            ],
-            kerberos_endpoint:
-                "https://login.chinacloudapi.cn/consumers/kerberos",
-            tenant_region_scope: null,
-            cloud_instance_name: "partner.microsoftonline.cn",
-            cloud_graph_host_name: "graph.chinacloudapi.cn",
-            msgraph_host: "microsoftgraph.chinacloudapi.cn",
-            rbac_url: "https://pas.chinacloudapi.cn",
-        },
-        "https://login.microsoftonline.us/consumers/": {
-            token_endpoint:
-                "https://login.microsoftonline.us/consumers/oauth2/v2.0/token",
-            token_endpoint_auth_methods_supported: [
-                "client_secret_post",
-                "private_key_jwt",
-                "client_secret_basic",
-            ],
-            jwks_uri:
-                "https://login.microsoftonline.us/consumers/discovery/v2.0/keys",
-            response_modes_supported: ["query", "fragment", "form_post"],
-            subject_types_supported: ["pairwise"],
-            id_token_signing_alg_values_supported: ["RS256"],
-            response_types_supported: [
-                "code",
-                "id_token",
-                "code id_token",
-                "id_token token",
-            ],
-            scopes_supported: ["openid", "profile", "email", "offline_access"],
-            issuer: "https://login.microsoftonline.us/9188040d-6c67-4c5b-b112-36a304b66dad/v2.0",
-            request_uri_parameter_supported: false,
-            userinfo_endpoint: "https://graph.microsoft.com/oidc/userinfo",
-            authorization_endpoint:
-                "https://login.microsoftonline.us/consumers/oauth2/v2.0/authorize",
-            device_authorization_endpoint:
-                "https://login.microsoftonline.us/consumers/oauth2/v2.0/devicecode",
-            http_logout_supported: true,
-            frontchannel_logout_supported: true,
-            end_session_endpoint:
-                "https://login.microsoftonline.us/consumers/oauth2/v2.0/logout",
-            claims_supported: [
-                "sub",
-                "iss",
-                "cloud_instance_name",
-                "cloud_instance_host_name",
-                "cloud_graph_host_name",
-                "msgraph_host",
-                "aud",
-                "exp",
-                "iat",
-                "auth_time",
-                "acr",
-                "nonce",
-                "preferred_username",
-                "name",
-                "tid",
-                "ver",
-                "at_hash",
-                "c_hash",
-                "email",
-            ],
-            kerberos_endpoint:
-                "https://login.microsoftonline.us/consumers/kerberos",
-            tenant_region_scope: null,
-            cloud_instance_name: "microsoftonline.us",
-            cloud_graph_host_name: "graph.windows.net",
-            msgraph_host: "graph.microsoft.com",
-            rbac_url: "https://pasff.usgovcloudapi.net",
-        },
-        "https://login.microsoftonline.com/organizations/": {
+        "login.microsoftonline.com": {
             token_endpoint:
-                "https://login.microsoftonline.com/organizations/oauth2/v2.0/token",
-            token_endpoint_auth_methods_supported: [
-                "client_secret_post",
-                "private_key_jwt",
-                "client_secret_basic",
-            ],
+                "https://login.microsoftonline.com/{tenantid}/oauth2/v2.0/token",
             jwks_uri:
-                "https://login.microsoftonline.com/organizations/discovery/v2.0/keys",
-            response_modes_supported: ["query", "fragment", "form_post"],
-            subject_types_supported: ["pairwise"],
-            id_token_signing_alg_values_supported: ["RS256"],
-            response_types_supported: [
-                "code",
-                "id_token",
-                "code id_token",
-                "id_token token",
-            ],
-            scopes_supported: ["openid", "profile", "email", "offline_access"],
+                "https://login.microsoftonline.com/{tenantid}/discovery/v2.0/keys",
             issuer: "https://login.microsoftonline.com/{tenantid}/v2.0",
-            request_uri_parameter_supported: false,
-            userinfo_endpoint: "https://graph.microsoft.com/oidc/userinfo",
             authorization_endpoint:
-                "https://login.microsoftonline.com/organizations/oauth2/v2.0/authorize",
-            device_authorization_endpoint:
-                "https://login.microsoftonline.com/organizations/oauth2/v2.0/devicecode",
-            http_logout_supported: true,
-            frontchannel_logout_supported: true,
+                "https://login.microsoftonline.com/{tenantid}/oauth2/v2.0/authorize",
             end_session_endpoint:
-                "https://login.microsoftonline.com/organizations/oauth2/v2.0/logout",
-            claims_supported: [
-                "sub",
-                "iss",
-                "cloud_instance_name",
-                "cloud_instance_host_name",
-                "cloud_graph_host_name",
-                "msgraph_host",
-                "aud",
-                "exp",
-                "iat",
-                "auth_time",
-                "acr",
-                "nonce",
-                "preferred_username",
-                "name",
-                "tid",
-                "ver",
-                "at_hash",
-                "c_hash",
-                "email",
-            ],
-            kerberos_endpoint:
-                "https://login.microsoftonline.com/organizations/kerberos",
-            tenant_region_scope: null,
-            cloud_instance_name: "microsoftonline.com",
-            cloud_graph_host_name: "graph.windows.net",
-            msgraph_host: "graph.microsoft.com",
-            rbac_url: "https://pas.windows.net",
+                "https://login.microsoftonline.com/{tenantid}/oauth2/v2.0/logout",
         },
-        "https://login.chinacloudapi.cn/organizations/": {
+        "login.chinacloudapi.cn": {
             token_endpoint:
-                "https://login.chinacloudapi.cn/organizations/oauth2/v2.0/token",
-            token_endpoint_auth_methods_supported: [
-                "client_secret_post",
-                "private_key_jwt",
-                "client_secret_basic",
-            ],
+                "https://login.chinacloudapi.cn/{tenantid}/oauth2/v2.0/token",
             jwks_uri:
-                "https://login.chinacloudapi.cn/organizations/discovery/v2.0/keys",
-            response_modes_supported: ["query", "fragment", "form_post"],
-            subject_types_supported: ["pairwise"],
-            id_token_signing_alg_values_supported: ["RS256"],
-            response_types_supported: [
-                "code",
-                "id_token",
-                "code id_token",
-                "id_token token",
-            ],
-            scopes_supported: ["openid", "profile", "email", "offline_access"],
+                "https://login.chinacloudapi.cn/{tenantid}/discovery/v2.0/keys",
             issuer: "https://login.partner.microsoftonline.cn/{tenantid}/v2.0",
-            request_uri_parameter_supported: false,
-            userinfo_endpoint:
-                "https://microsoftgraph.chinacloudapi.cn/oidc/userinfo",
             authorization_endpoint:
-                "https://login.chinacloudapi.cn/organizations/oauth2/v2.0/authorize",
-            device_authorization_endpoint:
-                "https://login.chinacloudapi.cn/organizations/oauth2/v2.0/devicecode",
-            http_logout_supported: true,
-            frontchannel_logout_supported: true,
+                "https://login.chinacloudapi.cn/{tenantid}/oauth2/v2.0/authorize",
             end_session_endpoint:
-                "https://login.chinacloudapi.cn/organizations/oauth2/v2.0/logout",
-            claims_supported: [
-                "sub",
-                "iss",
-                "cloud_instance_name",
-                "cloud_instance_host_name",
-                "cloud_graph_host_name",
-                "msgraph_host",
-                "aud",
-                "exp",
-                "iat",
-                "auth_time",
-                "acr",
-                "nonce",
-                "preferred_username",
-                "name",
-                "tid",
-                "ver",
-                "at_hash",
-                "c_hash",
-                "email",
-            ],
-            kerberos_endpoint:
-                "https://login.chinacloudapi.cn/organizations/kerberos",
-            tenant_region_scope: null,
-            cloud_instance_name: "partner.microsoftonline.cn",
-            cloud_graph_host_name: "graph.chinacloudapi.cn",
-            msgraph_host: "microsoftgraph.chinacloudapi.cn",
-            rbac_url: "https://pas.chinacloudapi.cn",
+                "https://login.chinacloudapi.cn/{tenantid}/oauth2/v2.0/logout",
         },
-        "https://login.microsoftonline.us/organizations/": {
+        "login.microsoftonline.us": {
             token_endpoint:
-                "https://login.microsoftonline.us/organizations/oauth2/v2.0/token",
-            token_endpoint_auth_methods_supported: [
-                "client_secret_post",
-                "private_key_jwt",
-                "client_secret_basic",
-            ],
+                "https://login.microsoftonline.us/{tenantid}/oauth2/v2.0/token",
             jwks_uri:
-                "https://login.microsoftonline.us/organizations/discovery/v2.0/keys",
-            response_modes_supported: ["query", "fragment", "form_post"],
-            subject_types_supported: ["pairwise"],
-            id_token_signing_alg_values_supported: ["RS256"],
-            response_types_supported: [
-                "code",
-                "id_token",
-                "code id_token",
-                "id_token token",
-            ],
-            scopes_supported: ["openid", "profile", "email", "offline_access"],
+                "https://login.microsoftonline.us/{tenantid}/discovery/v2.0/keys",
             issuer: "https://login.microsoftonline.us/{tenantid}/v2.0",
-            request_uri_parameter_supported: false,
-            userinfo_endpoint: "https://graph.microsoft.com/oidc/userinfo",
             authorization_endpoint:
-                "https://login.microsoftonline.us/organizations/oauth2/v2.0/authorize",
-            device_authorization_endpoint:
-                "https://login.microsoftonline.us/organizations/oauth2/v2.0/devicecode",
-            http_logout_supported: true,
-            frontchannel_logout_supported: true,
+                "https://login.microsoftonline.us/{tenantid}/oauth2/v2.0/authorize",
             end_session_endpoint:
-                "https://login.microsoftonline.us/organizations/oauth2/v2.0/logout",
-            claims_supported: [
-                "sub",
-                "iss",
-                "cloud_instance_name",
-                "cloud_instance_host_name",
-                "cloud_graph_host_name",
-                "msgraph_host",
-                "aud",
-                "exp",
-                "iat",
-                "auth_time",
-                "acr",
-                "nonce",
-                "preferred_username",
-                "name",
-                "tid",
-                "ver",
-                "at_hash",
-                "c_hash",
-                "email",
-            ],
-            kerberos_endpoint:
-                "https://login.microsoftonline.us/organizations/kerberos",
-            tenant_region_scope: null,
-            cloud_instance_name: "microsoftonline.us",
-            cloud_graph_host_name: "graph.windows.net",
-            msgraph_host: "graph.microsoft.com",
-            rbac_url: "https://pasff.usgovcloudapi.net",
+                "https://login.microsoftonline.us/{tenantid}/oauth2/v2.0/logout",
         },
     },
     instanceDiscoveryMetadata: {
         tenant_discovery_endpoint:
             "https://{canonicalAuthority}/v2.0/.well-known/openid-configuration",
-        "api-version": "1.1",
         metadata: [
             {
                 preferred_network: "login.microsoftonline.com",

package/src/cache/entities/AppMetadataEntity.ts

@@ -3,89 +3,14 @@
  * Licensed under the MIT License.
  */
 
-import { APP_METADATA, Separators } from "../../utils/Constants";
-
 /**
- * APP_METADATA Cache
- *
- * Key:Value Schema:
- *
- * Key: appmetadata-<environment>-<client_id>
- *
- * Value:
- * {
- *      clientId: client ID of the application
- *      environment: entity that issued the token, represented as a full host
- *      familyId: Family ID identifier, '1' represents Microsoft Family
- * }
+ * App Metadata Cache Type
  */
-export class AppMetadataEntity {
+export type AppMetadataEntity = {
+    /** clientId of the application */
     clientId: string;
+    /** entity that issued the token, represented as a full host */
     environment: string;
+    /** Family identifier, '1' represents Microsoft Family */
     familyId?: string;
-
-    /**
-     * Generate AppMetadata Cache Key as per the schema: appmetadata-<environment>-<client_id>
-     */
-    generateAppMetadataKey(): string {
-        return AppMetadataEntity.generateAppMetadataCacheKey(
-            this.environment,
-            this.clientId
-        );
-    }
-
-    /**
-     * Generate AppMetadata Cache Key
-     */
-    static generateAppMetadataCacheKey(
-        environment: string,
-        clientId: string
-    ): string {
-        const appMetaDataKeyArray: Array<string> = [
-            APP_METADATA,
-            environment,
-            clientId,
-        ];
-        return appMetaDataKeyArray
-            .join(Separators.CACHE_KEY_SEPARATOR)
-            .toLowerCase();
-    }
-
-    /**
-     * Creates AppMetadataEntity
-     * @param clientId
-     * @param environment
-     * @param familyId
-     */
-    static createAppMetadataEntity(
-        clientId: string,
-        environment: string,
-        familyId?: string
-    ): AppMetadataEntity {
-        const appMetadata = new AppMetadataEntity();
-
-        appMetadata.clientId = clientId;
-        appMetadata.environment = environment;
-        if (familyId) {
-            appMetadata.familyId = familyId;
-        }
-
-        return appMetadata;
-    }
-
-    /**
-     * Validates an entity: checks for all expected params
-     * @param entity
-     */
-    static isAppMetadataEntity(key: string, entity: object): boolean {
-        if (!entity) {
-            return false;
-        }
-
-        return (
-            key.indexOf(APP_METADATA) === 0 &&
-            entity.hasOwnProperty("clientId") &&
-            entity.hasOwnProperty("environment")
-        );
-    }
-}
+};