Skip to content

Commit

Permalink
Merge pull request #69 from autodesk-platform-services/main
Browse files Browse the repository at this point in the history
Keep dev branch updated with main
  • Loading branch information
sajith-subramanian authored Jul 29, 2024
2 parents 9634602 + 34aec12 commit 4033e71
Show file tree
Hide file tree
Showing 15 changed files with 52 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/AutoChangeLog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Auto Update Changelog
on:
push:
branches:
- 'development'
- 'main'
paths-ignore:
- 'CHANGELOG.md'
jobs:
Expand Down
12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,14 @@ The Developer Portal has everything APS:

## Nuget Packages

- [Data Management]()
- [OSS]()
- [Model Derivative]()
- [Webhooks]()
- [Authentication](https://www.nuget.org/packages/Autodesk.Authentication)
- [Construction Account Admin](https://www.nuget.org/packages/Autodesk.Construction.AccountAdmin/1.0.0-beta1)
- [Construction Issues](https://www.nuget.org/packages/Autodesk.Construction.Issues)
- [Data Management](https://www.nuget.org/packages/Autodesk.DataManagement)
- [Model Derivative](https://www.nuget.org/packages/Autodesk.ModelDerivative)
- [OSS](https://www.nuget.org/packages/Autodesk.Oss)
- [SDK Manager](https://www.nuget.org/packages/Autodesk.SDKManager)
- [Webhooks](https://www.nuget.org/packages/Autodesk.Webhooks)

#### Looking for Design Automation v3?

Expand Down
5 changes: 3 additions & 2 deletions authentication/source/Autodesk.Authentication.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Authors>Autodesk Platform Services SDK Team</Authors>
<PackageDescription>Client SDK for Authentication API</PackageDescription>
<Copyright>Autodesk Inc.</Copyright>
<PackageId>Autodesk.Authentication</PackageId>
<PackageVersion>1.0.0</PackageVersion>
<PackageVersion>2.0.0-beta</PackageVersion>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<RepositoryUrl>https://github.com/autodesk-platform-services/aps-sdk-net.git</RepositoryUrl>
</PropertyGroup>
<ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions authentication/source/Http/TokenApi.gen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public interface ITokenApi
/// </remarks>
/// <exception cref="HttpRequestException">Thrown when fails to make API call</exception>
/// <param name="authorization">
///Must be `Bearer <BASE64_ENCODED_STRING>` where `<BASE64_ENCODED_STRING>` is the Base64 encoding of the concatenated string `<CLIENT_ID>:<CLIENT_SECRET>`.'
///Must be `Bearer &lt;BASE64_ENCODED_STRING&gt;` where `&lt;BASE64_ENCODED_STRING&gt;` is the Base64 encoding of the concatenated string `&lt;CLIENT_ID&gt;:&lt;CLIENT_SECRET&gt;`.'
///
///**Note** This header is required only for Traditional Web Apps and Server-to-Server Apps. It is not required for Desktop, Mobile, and Single-Page Apps. (optional)
/// </param>
Expand Down Expand Up @@ -190,7 +190,7 @@ public interface ITokenApi
/// </remarks>
/// <exception cref="HttpRequestException">Thrown when fails to make API call</exception>
/// <param name="authorization">
///Must be `Bearer <BASE64_ENCODED_STRING>` where `<BASE64_ENCODED_STRING>` is the Base64 encoding of the concatenated string `<CLIENT_ID>:<CLIENT_SECRET>`.'
///Must be `Bearer &lt;BASE64_ENCODED_STRING&gt;` where `&lt;BASE64_ENCODED_STRING&gt;` is the Base64 encoding of the concatenated string `&lt;CLIENT_ID&gt;:&lt;CLIENT_SECRET&gt;`.'
///
///**Note** This header is required only for Traditional Web Apps and Server-to-Server Apps. It is not required for Desktop, Mobile, and Single-Page Apps. (optional)
/// </param>
Expand Down Expand Up @@ -238,7 +238,7 @@ public interface ITokenApi
///
/// </param>
/// <param name="authorization">
///Must be `Bearer <BASE64_ENCODED_STRING>` where `<BASE64_ENCODED_STRING>` is the Base64 encoding of the concatenated string `<CLIENT_ID>:<CLIENT_SECRET>`.'
///Must be `Bearer &lt;BASE64_ENCODED_STRING&gt;` where `&lt;BASE64_ENCODED_STRING&gt;` is the Base64 encoding of the concatenated string `&lt;CLIENT_ID&gt;:&lt;CLIENT_SECRET&gt;`.'
///
///**Note** This header is required only for Traditional Web Apps and Server-to-Server Apps. It is not required for Desktop, Mobile, and Single-Page Apps. (optional)
/// </param>
Expand Down Expand Up @@ -383,7 +383,7 @@ private void SetHeader(string baseName, object value, HttpRequestMessage req)
///
///The string can only contain alphanumeric characters, commas, periods, underscores, and hyphens. (optional)
/// </param>
/// <param name="scope">
/// <param name="scopes">
///A URL-encoded space-delimited list of requested scopes. See the [Developer's Guide documentation on scopes](/en/docs/oauth/v2/developers_guide/scopes/) for a list of valid values you can provide.
///
///The string you specify for this parameter must not exceed 2000 characters and it cannot contain more than 50 scopes. (optional)
Expand Down Expand Up @@ -463,7 +463,7 @@ private void SetHeader(string baseName, object value, HttpRequestMessage req)
/// </remarks>
/// <exception cref="HttpRequestException">Thrown when fails to make API call</exception>
/// <param name="authorization">
///Must be `Bearer <BASE64_ENCODED_STRING>` where `<BASE64_ENCODED_STRING>` is the Base64 encoding of the concatenated string `<CLIENT_ID>:<CLIENT_SECRET>`.'
///Must be `Bearer &lt;BASE64_ENCODED_STRING&gt;` where `&lt;BASE64_ENCODED_STRING&gt;` is the Base64 encoding of the concatenated string `&lt;CLIENT_ID&gt;:&lt;CLIENT_SECRET&gt;`.'
///
///**Note** This header is required only for Traditional Web Apps and Server-to-Server Apps. It is not required for Desktop, Mobile, and Single-Page Apps. (optional)
/// </param>
Expand Down Expand Up @@ -674,7 +674,7 @@ public async System.Threading.Tasks.Task<ApiResponse<OidcSpec>> GetOidcSpecAsync
/// </remarks>
/// <exception cref="HttpRequestException">Thrown when fails to make API call</exception>
/// <param name="authorization">
///Must be `Bearer <BASE64_ENCODED_STRING>` where `<BASE64_ENCODED_STRING>` is the Base64 encoding of the concatenated string `<CLIENT_ID>:<CLIENT_SECRET>`.'
///Must be `Bearer &lt;BASE64_ENCODED_STRING&gt;` where `&lt;BASE64_ENCODED_STRING&gt;` is the Base64 encoding of the concatenated string `&lt;CLIENT_ID&gt;:&lt;CLIENT_SECRET&gt;`.'
///
///**Note** This header is required only for Traditional Web Apps and Server-to-Server Apps. It is not required for Desktop, Mobile, and Single-Page Apps. (optional)
/// </param>
Expand Down Expand Up @@ -798,7 +798,7 @@ public async System.Threading.Tasks.Task<ApiResponse<OidcSpec>> GetOidcSpecAsync
///
/// </param>
/// <param name="authorization">
///Must be `Bearer <BASE64_ENCODED_STRING>` where `<BASE64_ENCODED_STRING>` is the Base64 encoding of the concatenated string `<CLIENT_ID>:<CLIENT_SECRET>`.'
///Must be `Bearer &lt;BASE64_ENCODED_STRING&gt;` where `&lt;BASE64_ENCODED_STRING&gt;` is the Base64 encoding of the concatenated string `&lt;CLIENT_ID&gt;:&lt;CLIENT_SECRET&gt;`.'
///
///**Note** This header is required only for Traditional Web Apps and Server-to-Server Apps. It is not required for Desktop, Mobile, and Single-Page Apps. (optional)
/// </param>
Expand Down
4 changes: 3 additions & 1 deletion authentication/source/Http/UsersApi.gen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ public partial class UsersApi : IUsersApi
{
ILogger logger;

// Manually added because UsersApi has a different base address.
/// <summary>
/// Manually added because UsersApi has a different base address.
/// </summary>
public Uri BaseAddress { get; set; }

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion authentication/source/Model/ThreeLeggedToken.gen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public int? ExpiresIn

/// <summary>
/// Time the access token will expire at, in Unix seconds.
////// </summary>
/// </summary>
/// <value>
///Time the access token will expire at, in Unix seconds.
/// </value>
Expand Down
2 changes: 1 addition & 1 deletion authentication/source/custom-code/AuthenticationClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ public async System.Threading.Tasks.Task<TwoLeggedToken> GetTwoLeggedTokenAsync(
///The Client secret of the calling application, as registered with APS.
///**Note** The clientSecret is required only for Traditional Web Apps and Server-to-Server Apps. It is not required for Desktop, Mobile, and Single-Page Apps. (optional)
/// </param>
/// <param name="refresh_token">
/// <param name="refreshToken">
///The refresh token used to acquire a new access token and a refresh token.
/// </param>
/// <param name="scopes">
Expand Down
2 changes: 1 addition & 1 deletion authentication/test/TestAuthentication.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public async Task Test3LeggedTokenAsync()
[TestMethod]
public async Task TestRefreshTokenAsync()
{
RefreshToken newToken = await _authClient.GetRefreshTokenAsync(client_id, client_secret, "refreshToken");
ThreeLeggedToken newToken = await _authClient.RefreshTokenAsync(client_id, client_secret, "refreshToken");
Assert.IsNotNull(newToken.AccessToken);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@
<TargetFramework>netstandard2.0</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Authors></Authors>
<Company>Autodesk</Company>
<Product>Autodesk SDK</Product>
<Description>Client sdk for Construction Account Admin API</Description>
<Authors>Autodesk Platform Services SDK Team</Authors>
<PackageDescription>Client SDK for Construction Account Admin API</PackageDescription>
<Copyright>Autodesk Inc.</Copyright>
<PackageId>Autodesk.Construction.AccountAdmin</PackageId>
<Version>1.0.0</Version>
<Authors>Autodesk SDK team</Authors>
<owners>Autodesk SDK team</owners>
<Company>Autodesk</Company>
<PackageVersion>1.0.0-beta1</PackageVersion>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<RepositoryUrl>https://github.com/autodesk-platform-services/aps-sdk-net.git</RepositoryUrl>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Autodesk.SDKManager" Version="1.0.0" />
Expand All @@ -24,6 +22,8 @@
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<None Include="../../LICENSE.txt" Pack="true" PackagePath=""/>
<None Include="../../README.md" Pack="true" PackagePath=""/>
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Authors>Autodesk Platform Services SDK Team</Authors>
<PackageDescription>Client SDK for Construction Issues API</PackageDescription>
<Copyright>Autodesk Inc.</Copyright>
<PackageId>Autodesk.Construction.Issues</PackageId>
<PackageVersion>1.0.0-beta1</PackageVersion>
<PackageVersion>1.1.0</PackageVersion>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<RepositoryUrl>https://github.com/autodesk-platform-services/aps-sdk-net.git</RepositoryUrl>
Expand All @@ -21,8 +22,8 @@
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Autodesk.SDKManager" Version="1.0.0" />
<None Include="../../LICENSE.txt" Pack="true" PackagePath=""/>
<None Include="../../README.md" Pack="true" PackagePath=""/>
<None Include="../../../LICENSE.txt" Pack="true" PackagePath=""/>
<None Include="../../../README.md" Pack="true" PackagePath=""/>
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions datamanagement/source/Autodesk.DataManagement.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Authors>Autodesk Platform Services SDK Team</Authors>
<PackageDescription>Client SDK for DataManagement API</PackageDescription>
<Copyright>Autodesk Inc.</Copyright>
Expand Down
3 changes: 2 additions & 1 deletion modelderivative/source/Autodesk.ModelDerivative.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Authors>Autodesk Platform Services SDK Team</Authors>
<PackageDescription>Client SDK for Model Derivative API</PackageDescription>
<Copyright>Autodesk Inc.</Copyright>
<PackageId>Autodesk.ModelDerivative</PackageId>
<PackageVersion>1.0.0</PackageVersion>
<PackageVersion>2.0.0-beta</PackageVersion>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<RepositoryUrl>https://github.com/autodesk-platform-services/aps-sdk-net.git</RepositoryUrl>
Expand Down
3 changes: 2 additions & 1 deletion oss/source/Autodesk.Oss.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Authors>Autodesk Platform Services SDK Team</Authors>
<PackageDescription>Client SDK for Data Management OSS API</PackageDescription>
<Copyright>Autodesk Inc.</Copyright>
<PackageId>Autodesk.Oss</PackageId>
<PackageVersion>1.0.0</PackageVersion>
<PackageVersion>1.1.0</PackageVersion>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<RepositoryUrl>https://github.com/autodesk-platform-services/aps-sdk-net.git</RepositoryUrl>
Expand Down
19 changes: 8 additions & 11 deletions oss/source/custom-code/OssClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public class OssClient
public OssClient(SDKManager.SDKManager sdkManager)
{
this.bucketsApi = new BucketsApi(sdkManager);
this.objectsApi = new ObjectsApi(sdkManager);
this.oSSFileTransfer = new OSSFileTransfer(new FileTransferConfigurations(3), null);

}
Expand Down Expand Up @@ -65,14 +66,10 @@ public async System.Threading.Tasks.Task<ObjectDetails> Upload(string bucketKey,
public async System.Threading.Tasks.Task<ObjectDetails> Upload(string bucketKey, string objectKey, string sourceToUpload, string accessToken, CancellationToken cancellationToken, string projectScope = "", string requestIdPrefix = "", IProgress<int> progress = null)
{

using (FileStream SourceStream = File.Open(sourceToUpload, FileMode.Open))
{
var result = new byte[SourceStream.Length];
await SourceStream.ReadAsync(result, 0, (int)SourceStream.Length);
var response = await this.oSSFileTransfer.Upload(bucketKey, objectKey, new MemoryStream(result), accessToken, cancellationToken, projectScope, requestIdPrefix, progress);
FileStream fileStream = File.OpenRead(sourceToUpload);
var response = await this.oSSFileTransfer.Upload(bucketKey, objectKey, fileStream, accessToken, cancellationToken, projectScope, requestIdPrefix, progress);
var apiResponse = new ApiResponse<ObjectDetails>(response, await LocalMarshalling.DeserializeAsync<ObjectDetails>(response.Content));
return apiResponse.Content;
}
return apiResponse.Content;
}

/// <summary>
Expand Down Expand Up @@ -126,7 +123,7 @@ public async System.Threading.Tasks.Task Download(string bucketKey, string objec
/// </param>
/// <returns>Task of &lt;BatchcompleteuploadResponse&gt;</returns>

public async System.Threading.Tasks.Task<BatchcompleteuploadResponse> BatchCompleteUploadAsync(string accessToken, string bucketKey, BatchcompleteuploadObject requests = default(BatchcompleteuploadObject), bool throwOnError = true)
public async System.Threading.Tasks.Task<BatchcompleteuploadResponse> BatchCompleteUploadAsync(string accessToken, string bucketKey, BatchcompleteuploadObject requests, bool throwOnError = true)
{
var response = await this.objectsApi.BatchCompleteUploadAsync(bucketKey, requests, accessToken, throwOnError);
return response.Content;
Expand Down Expand Up @@ -286,7 +283,7 @@ public async System.Threading.Tasks.Task Download(string bucketKey, string objec
///**Note:** Do not use this operation to create buckets for BIM360 Document Management. Use [POST projects/{project_id}/storage](/en/docs/data/v2/reference/http/projects-project_id-storage-POST>) instead. For details, see [Upload Files to BIM 360 Document Management](/en/docs/bim360/v1/tutorials/document-management/upload-document).
/// </remarks>
/// <exception cref="OssApiException">Thrown when fails to make API call</exception>
/// <param name="policyKey">
/// <param name="bucketsPayload">
///
/// </param>
/// <param name="xAdsRegion">
Expand All @@ -298,9 +295,9 @@ public async System.Threading.Tasks.Task Download(string bucketKey, string objec
/// </param>
/// <returns>Task of &lt;Bucket&gt;</returns>

public async System.Threading.Tasks.Task<Bucket> CreateBucketAsync(string accessToken, Region xAdsRegion, CreateBucketsPayload policyKey, bool throwOnError = true)
public async System.Threading.Tasks.Task<Bucket> CreateBucketAsync(string accessToken, Region xAdsRegion, CreateBucketsPayload bucketsPayload, bool throwOnError = true)
{
var response = await this.bucketsApi.CreateBucketAsync(policyKey, xAdsRegion, accessToken, throwOnError);
var response = await this.bucketsApi.CreateBucketAsync(bucketsPayload, xAdsRegion, accessToken, throwOnError);
return response.Content;
}
/// <summary>
Expand Down
3 changes: 2 additions & 1 deletion webhooks/source/Autodesk.Webhooks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Authors>Autodesk Platform Services SDK Team</Authors>
<PackageDescription>Client SDK for WebHooks API</PackageDescription>
<Copyright>Autodesk Inc.</Copyright>
<PackageId>Autodesk.Webhooks</PackageId>
<PackageVersion>1.0.0</PackageVersion>
<PackageVersion>2.0.0-beta</PackageVersion>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<RepositoryUrl>https://github.com/autodesk-platform-services/aps-sdk-net.git</RepositoryUrl>
Expand Down

0 comments on commit 4033e71

Please sign in to comment.