@redocly/openapi-core 1.0.0-beta.128 → 1.0.0-beta.129

package/lib/config/config-resolvers.js

@@ -268,7 +268,7 @@ function groupStyleguideAssertionRules({ rules, plugins, }) {
                     registerCustomAssertions(plugins, context);
                 }
             }
-            assertions.push(Object.assign(Object.assign({}, assertion), { assertionId: ruleKey.replace(/rule\/|assert\//, '') }));
+            assertions.push(Object.assign(Object.assign({}, assertion), { assertionId: ruleKey }));
         }
         else {
             // If it's not an assertion, keep it as is

package/lib/config/config.d.ts

@@ -1,7 +1,7 @@
 import { NormalizedProblem } from '../walk';
 import { OasVersion, OasMajorVersion, Oas2RuleSet, Oas3RuleSet } from '../oas-types';
 import type { NodeType } from '../types';
-import type { DecoratorConfig, Plugin, PreprocessorConfig, Region, ResolveConfig, ResolvedApi, ResolvedConfig, ResolvedStyleguideConfig, RuleConfig, RuleSettings, ThemeRawConfig } from './types';
+import type { DecoratorConfig, Plugin, PreprocessorConfig, Region, ResolveConfig, ResolvedApi, ResolvedConfig, ResolvedStyleguideConfig, RuleConfig, RuleSettings, Telemetry, ThemeRawConfig } from './types';
 export declare const IGNORE_FILE = ".redocly.lint-ignore.yaml";
 export declare const DEFAULT_REGION = "us";
 export declare const DOMAINS: {
@@ -53,5 +53,6 @@ export declare class Config {
     theme: ThemeRawConfig;
     organization?: string;
     files: string[];
+    telemetry?: Telemetry;
     constructor(rawConfig: ResolvedConfig, configFile?: string | undefined);
 }

package/lib/config/config.js

@@ -254,6 +254,7 @@ class Config {
         this.region = rawConfig.region;
         this.organization = rawConfig.organization;
         this.files = rawConfig.files || [];
+        this.telemetry = rawConfig.telemetry;
     }
 }
 exports.Config = Config;

package/lib/config/types.d.ts

@@ -97,6 +97,7 @@ export declare type ResolveConfig = {
     http: HttpResolveConfig;
 };
 export declare type Region = 'us' | 'eu';
+export declare type Telemetry = 'on' | 'off';
 export declare type AccessTokens = {
     [region in Region]?: string;
 };
@@ -125,6 +126,7 @@ export declare type RawConfig = {
     region?: Region;
     organization?: string;
     files?: string[];
+    telemetry?: Telemetry;
 } & ThemeConfig;
 export declare type FlatApi = Omit<Api, 'styleguide'> & Omit<ApiStyleguideRawConfig, 'doNotResolveExamples'>;
 export declare type FlatRawConfig = Omit<RawConfig, 'styleguide' | 'resolve' | 'apis'> & Omit<StyleguideRawConfig, 'doNotResolveExamples'> & {
@@ -147,4 +149,14 @@ export declare type ThemeRawConfig = {
     mockServer?: Record<string, any>;
 };
 export declare type RulesFields = 'rules' | 'oas2Rules' | 'oas3_0Rules' | 'oas3_1Rules' | 'preprocessors' | 'oas2Preprocessors' | 'oas3_0Preprocessors' | 'oas3_1Preprocessors' | 'decorators' | 'oas2Decorators' | 'oas3_0Decorators' | 'oas3_1Decorators';
+export declare enum AuthProviderType {
+    OIDC = "OIDC",
+    SAML2 = "SAML2",
+    BASIC = "BASIC"
+}
+export declare enum ApigeeDevOnboardingIntegrationAuthType {
+    SERVICE_ACCOUNT = "SERVICE_ACCOUNT",
+    OAUTH2 = "OAUTH2"
+}
+export declare const DEFAULT_TEAM_CLAIM_NAME = "https://redocly.com/sso/teams";
 export {};

package/lib/config/types.js

@@ -1,2 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_TEAM_CLAIM_NAME = exports.ApigeeDevOnboardingIntegrationAuthType = exports.AuthProviderType = void 0;
+var AuthProviderType;
+(function (AuthProviderType) {
+    AuthProviderType["OIDC"] = "OIDC";
+    AuthProviderType["SAML2"] = "SAML2";
+    AuthProviderType["BASIC"] = "BASIC";
+})(AuthProviderType = exports.AuthProviderType || (exports.AuthProviderType = {}));
+var ApigeeDevOnboardingIntegrationAuthType;
+(function (ApigeeDevOnboardingIntegrationAuthType) {
+    ApigeeDevOnboardingIntegrationAuthType["SERVICE_ACCOUNT"] = "SERVICE_ACCOUNT";
+    ApigeeDevOnboardingIntegrationAuthType["OAUTH2"] = "OAUTH2";
+})(ApigeeDevOnboardingIntegrationAuthType = exports.ApigeeDevOnboardingIntegrationAuthType || (exports.ApigeeDevOnboardingIntegrationAuthType = {}));
+exports.DEFAULT_TEAM_CLAIM_NAME = 'https://redocly.com/sso/teams';

package/lib/rules/common/assertions/index.js

@@ -11,12 +11,11 @@ const Assertions = (opts) => {
     // that is why we need to iterate through 'opts' values;
     // before - filter only object 'opts' values
     const assertions = Object.values(opts).filter((opt) => typeof opt === 'object' && opt !== null);
-    for (const [index, assertion] of assertions.entries()) {
-        const assertId = (assertion.assertionId && `${assertion.assertionId} assertion`) || `assertion #${index + 1}`;
+    for (const [_, assertion] of assertions.entries()) {
         if (!utils_2.isString(assertion.subject.type)) {
-            throw new Error(`${assertId}: 'type' (String) is required`);
+            throw new Error(`${assertion.assertionId}: 'type' (String) is required`);
         }
-        const subjectVisitor = utils_1.buildSubjectVisitor(assertId, assertion);
+        const subjectVisitor = utils_1.buildSubjectVisitor(assertion.assertionId, assertion);
         const visitorObject = utils_1.buildVisitorObject(assertion, subjectVisitor);
         visitors.push(visitorObject);
     }