From 31c3420808ff3b4365bc19a76c479ee119cb3c1c Mon Sep 17 00:00:00 2001 From: taofeeko Date: Wed, 18 Feb 2026 17:59:43 -0800 Subject: [PATCH] Work to fix wrong json formatting --- .../beta/1.1.0-preview/types.json | 16 ++++++++-------- .../v1.0/1.1.0-preview/types.json | 14 +++++++------- msgraph-metadata | 2 +- src/generator/src/cmd/generate.ts | 6 +++--- .../microsoftgraph-beta-1.1.0-preview.json | 2 +- .../microsoftgraph-v1.0-1.1.0-preview.json | 16 ++++++++++++++++ 6 files changed, 36 insertions(+), 20 deletions(-) diff --git a/generated/microsoftgraph/microsoft.graph/beta/1.1.0-preview/types.json b/generated/microsoftgraph/microsoft.graph/beta/1.1.0-preview/types.json index 28a1677..0f7e049 100644 --- a/generated/microsoftgraph/microsoft.graph/beta/1.1.0-preview/types.json +++ b/generated/microsoftgraph/microsoft.graph/beta/1.1.0-preview/types.json @@ -1,4 +1,4 @@ -./[ +[ { "$type": "StringType" }, @@ -653,7 +653,7 @@ "$ref": "#/40" }, "flags": 0, - "description": "Also known as App ID URI, this value is set when an application is used as a resource app. The identifierUris acts as the prefix for the scopes you reference in your API's code, and it must be globally unique. You can use the default value provided, which is in the form api:/, or specify a more readable URI like https:/contoso.com/api. For more information on valid identifierUris patterns and best practices, see Microsoft Entra application registration security best practices. Not nullable." + "description": "Also known as App ID URI, this value is set when an application is used as a resource app. The identifierUris acts as the prefix for the scopes you reference in your API's code, and it must be globally unique. You can use the default value provided, which is in the form api://, or specify a more readable URI like https://contoso.com/api. For more information on valid identifierUris patterns and best practices, see Microsoft Entra application registration security best practices. Not nullable." }, "info": { "type": { @@ -1166,28 +1166,28 @@ "$ref": "#/0" }, "flags": 0, - "description": "Link to the application's marketing page. For example, https:/www.contoso.com/app/marketing." + "description": "Link to the application's marketing page. For example, https://www.contoso.com/app/marketing." }, "privacyStatementUrl": { "type": { "$ref": "#/0" }, "flags": 0, - "description": "Link to the application's privacy statement. For example, https:/www.contoso.com/app/privacy." + "description": "Link to the application's privacy statement. For example, https://www.contoso.com/app/privacy." }, "supportUrl": { "type": { "$ref": "#/0" }, "flags": 0, - "description": "Link to the application's support page. For example, https:/www.contoso.com/app/support." + "description": "Link to the application's support page. For example, https://www.contoso.com/app/support." }, "termsOfServiceUrl": { "type": { "$ref": "#/0" }, "flags": 0, - "description": "Link to the application's terms of service statement. For example, https:/www.contoso.com/app/termsofservice." + "description": "Link to the application's terms of service statement. For example, https://www.contoso.com/app/termsofservice." } } }, @@ -1455,7 +1455,7 @@ "$ref": "#/58" }, "flags": 0, - "description": "Specifies the URLs where user tokens are sent for sign-in, or the redirect URIs where OAuth 2.0 authorization codes and access tokens are sent. For iOS and macOS apps, specify the value following the syntax msauth.{BUNDLEID}:/auth, replacing '{BUNDLEID}'. For example, if the bundle ID is com.microsoft.identitysample.MSALiOS, the URI is msauth.com.microsoft.identitysample.MSALiOS:/auth." + "description": "Specifies the URLs where user tokens are sent for sign-in, or the redirect URIs where OAuth 2.0 authorization codes and access tokens are sent. For iOS and macOS apps, specify the value following the syntax msauth.{BUNDLEID}://auth, replacing '{BUNDLEID}'. For example, if the bundle ID is com.microsoft.identitysample.MSALiOS, the URI is msauth.com.microsoft.identitysample.MSALiOS://auth." } } }, @@ -2239,7 +2239,7 @@ "$ref": "#/100" }, "flags": 1, - "description": "The audience that can appear in the external token. This field is mandatory and should be set to api:/AzureADTokenExchange for Microsoft Entra ID. It says what Microsoft identity platform should accept in the aud claim in the incoming token. This value represents Microsoft Entra ID in your external identity provider and has no fixed value across identity providers - you may need to create a new application registration in your identity provider to serve as the audience of this token. This field can only accept a single value and has a limit of 600 characters. Required." + "description": "The audience that can appear in the external token. This field is mandatory and should be set to api://AzureADTokenExchange for Microsoft Entra ID. It says what Microsoft identity platform should accept in the aud claim in the incoming token. This value represents Microsoft Entra ID in your external identity provider and has no fixed value across identity providers - you may need to create a new application registration in your identity provider to serve as the audience of this token. This field can only accept a single value and has a limit of 600 characters. Required." }, "claimsMatchingExpression": { "type": { diff --git a/generated/microsoftgraph/microsoft.graph/v1.0/1.1.0-preview/types.json b/generated/microsoftgraph/microsoft.graph/v1.0/1.1.0-preview/types.json index 43050db..f83fb4a 100644 --- a/generated/microsoftgraph/microsoft.graph/v1.0/1.1.0-preview/types.json +++ b/generated/microsoftgraph/microsoft.graph/v1.0/1.1.0-preview/types.json @@ -1,4 +1,4 @@ -./[ +[ { "$type": "StringType" }, @@ -1166,28 +1166,28 @@ "$ref": "#/0" }, "flags": 0, - "description": "Link to the application's marketing page. For example, https:/www.contoso.com/app/marketing." + "description": "Link to the application's marketing page. For example, https://www.contoso.com/app/marketing." }, "privacyStatementUrl": { "type": { "$ref": "#/0" }, "flags": 0, - "description": "Link to the application's privacy statement. For example, https:/www.contoso.com/app/privacy." + "description": "Link to the application's privacy statement. For example, https://www.contoso.com/app/privacy." }, "supportUrl": { "type": { "$ref": "#/0" }, "flags": 0, - "description": "Link to the application's support page. For example, https:/www.contoso.com/app/support." + "description": "Link to the application's support page. For example, https://www.contoso.com/app/support." }, "termsOfServiceUrl": { "type": { "$ref": "#/0" }, "flags": 0, - "description": "Link to the application's terms of service statement. For example, https:/www.contoso.com/app/termsofservice." + "description": "Link to the application's terms of service statement. For example, https://www.contoso.com/app/termsofservice." } } }, @@ -1455,7 +1455,7 @@ "$ref": "#/57" }, "flags": 0, - "description": "Specifies the URLs where user tokens are sent for sign-in, or the redirect URIs where OAuth 2.0 authorization codes and access tokens are sent. For iOS and macOS apps, specify the value following the syntax msauth.{BUNDLEID}:/auth, replacing '{BUNDLEID}'. For example, if the bundle ID is com.microsoft.identitysample.MSALiOS, the URI is msauth.com.microsoft.identitysample.MSALiOS:/auth." + "description": "Specifies the URLs where user tokens are sent for sign-in, or the redirect URIs where OAuth 2.0 authorization codes and access tokens are sent. For iOS and macOS apps, specify the value following the syntax msauth.{BUNDLEID}://auth, replacing '{BUNDLEID}'. For example, if the bundle ID is com.microsoft.identitysample.MSALiOS, the URI is msauth.com.microsoft.identitysample.MSALiOS://auth." } } }, @@ -2194,7 +2194,7 @@ "$ref": "#/97" }, "flags": 1, - "description": "The audience that can appear in the external token. This field is mandatory and should be set to api:/AzureADTokenExchange for Microsoft Entra ID. It says what Microsoft identity platform should accept in the aud claim in the incoming token. This value represents Microsoft Entra ID in your external identity provider and has no fixed value across identity providers - you might need to create a new application registration in your identity provider to serve as the audience of this token. This field can only accept a single value and has a limit of 600 characters. Required." + "description": "The audience that can appear in the external token. This field is mandatory and should be set to api://AzureADTokenExchange for Microsoft Entra ID. It says what Microsoft identity platform should accept in the aud claim in the incoming token. This value represents Microsoft Entra ID in your external identity provider and has no fixed value across identity providers - you might need to create a new application registration in your identity provider to serve as the audience of this token. This field can only accept a single value and has a limit of 600 characters. Required." }, "description": { "type": { diff --git a/msgraph-metadata b/msgraph-metadata index f4daac2..7caa317 160000 --- a/msgraph-metadata +++ b/msgraph-metadata @@ -1 +1 @@ -Subproject commit f4daac2b1c1b7e80ab32ca6912468c5522ba229c +Subproject commit 7caa317572b1f9287f78c1f98f2eb253841cd75f diff --git a/src/generator/src/cmd/generate.ts b/src/generator/src/cmd/generate.ts index e7358d9..3805ac0 100644 --- a/src/generator/src/cmd/generate.ts +++ b/src/generator/src/cmd/generate.ts @@ -344,9 +344,9 @@ async function buildTypeIndex(logger: ILogger, baseDir: string, apiVersion: ApiV }; const indexContent = await buildIndex(typeFiles, (log) => logOut(logger, log), typeSettings); - await writeFile(`${extensionBaseDir}/types.json`, normalizeJsonPath(writeTypesJson(contentJson))); - await writeFile(`${extensionBaseDir}/index.json`, normalizeJsonPath(writeIndexJson(indexContent))); - await writeFile(`${extensionBaseDir}/index.md`, normalizeJsonPath(writeIndexMarkdown(indexContent))); + await writeFile(`${extensionBaseDir}/types.json`, writeTypesJson(contentJson)); + await writeFile(`${extensionBaseDir}/index.json`, writeIndexJson(indexContent)); + await writeFile(`${extensionBaseDir}/index.md`, writeIndexMarkdown(indexContent)); } function shouldIncludeFilePath(filePath: string) { diff --git a/src/swagger-generation/output/microsoftgraph-beta-1.1.0-preview.json b/src/swagger-generation/output/microsoftgraph-beta-1.1.0-preview.json index ea52a32..966237d 100644 --- a/src/swagger-generation/output/microsoftgraph-beta-1.1.0-preview.json +++ b/src/swagger-generation/output/microsoftgraph-beta-1.1.0-preview.json @@ -367,7 +367,7 @@ }, "welcomeMessageEnabled": { "type": "boolean", - "description": "", + "description": "Indicates whether a welcome message is sent to new members when they are added to the group. The default value is true. Supported only on the Get group API (GET /groups/{ID}).", "readOnly": false }, "writebackConfiguration": { diff --git a/src/swagger-generation/output/microsoftgraph-v1.0-1.1.0-preview.json b/src/swagger-generation/output/microsoftgraph-v1.0-1.1.0-preview.json index 1d58f15..ec58b8a 100644 --- a/src/swagger-generation/output/microsoftgraph-v1.0-1.1.0-preview.json +++ b/src/swagger-generation/output/microsoftgraph-v1.0-1.1.0-preview.json @@ -286,6 +286,22 @@ "description": "Timestamp of when the group was last renewed. This value can't be modified directly and is only updated via the renew service action. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC. For example, midnight UTC on January 1, 2014 is 2014-01-01T00:00:00Z. Read-only.", "readOnly": true }, + "resourceBehaviorOptions": { + "type": "array", + "items": { + "type": "string" + }, + "description": "Specifies the group behaviors that can be set for a Microsoft 365 group during creation. This property can be set only as part of creation (POST). For the list of possible values, see Microsoft 365 group behaviors and provisioning options.", + "readOnly": false + }, + "resourceProvisioningOptions": { + "type": "array", + "items": { + "type": "string" + }, + "description": "Specifies the group resources that are associated with the Microsoft 365 group. The possible value is Team. For more information, see Microsoft 365 group behaviors and provisioning options.", + "readOnly": false + }, "securityEnabled": { "type": "boolean", "description": "Specifies whether the group is a security group. Required.",