For #1 for client initialization and authentification

CenterDevice.Rest/CenterDevice.Rest.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net48</TargetFrameworks>
@@ -57,4 +57,4 @@
     <PackageReference Include="Ninject" Version="3.3.4.0" />
     <PackageReference Include="RestSharp" Version="106.12.0" />
   </ItemGroup>
-</Project>
+</Project>

CenterDevice.Rest/IO/CenterDeviceIOClient.cs

@@ -5,6 +5,10 @@ namespace CenterDevice.IO
 {
     public class CenterDeviceIOClient : IOClientBase
     {
+        public CenterDeviceIOClient(CenterDevice.Rest.Clients.CenterDeviceClient centerDeviceClient) : this(centerDeviceClient, centerDeviceClient.Token.UserId)
+        {
+        }
+
         public CenterDeviceIOClient(CenterDevice.Rest.Clients.CenterDeviceClient centerDeviceClient, string userID) : base(centerDeviceClient, userID)
         {
             this.centerDeviceClient = centerDeviceClient;

CenterDevice.Rest/Rest/Clients/CenterDeviceClient.cs

@@ -15,13 +15,85 @@ namespace CenterDevice.Rest.Clients
     /// </summary>
     public class CenterDeviceClient : CenterDeviceClientBase
     {
-        public CenterDeviceClient(IOAuthInfoProvider oAuthInfoProvider, IRestClientConfiguration configuration, IRestClientErrorHandler errorHandler) : base(oAuthInfoProvider, configuration, errorHandler, "v2/")
+        public CenterDeviceClient() : this(null, CenterDevice.Rest.Clients.CenterDeviceConfiguration.Default)
         {
         }
 
-        public Rest.Clients.HealthCheck.HealthCheckRestClient HealthCheck => new Rest.Clients.HealthCheck.HealthCheckRestClient(configuration, errorHandler);
+        public CenterDeviceClient(IOAuthInfoProvider oAuthInfoProvider, CenterDevice.Rest.Clients.CenterDeviceConfiguration configuration) : this(oAuthInfoProvider, configuration.OAuthConfiguration())
+        {
+            this.Config = configuration;
+        }
+
+        private CenterDeviceClient(IOAuthInfoProvider oAuthInfoProvider, IRestClientConfiguration configuration) : this(oAuthInfoProvider, configuration, new CenterDevice.Rest.Clients.CenterDeviceErrorHandler(null, oAuthInfoProvider))
+        {
+        }
+
+        private CenterDeviceClient(IOAuthInfoProvider oAuthInfoProvider, IRestClientConfiguration configuration, IRestClientErrorHandler errorHandler) : base(oAuthInfoProvider, configuration, errorHandler, "v2/")
+        {
+        }
+
+        public CenterDevice.Rest.Clients.HealthCheck.HealthCheckRestClient HealthCheck => new CenterDevice.Rest.Clients.HealthCheck.HealthCheckRestClient(configuration, errorHandler);
+
+        protected override string UploadLinkBaseUrl => this.Config.UploadLinkBaseUrl;
+
+        /// <summary>
+        /// Configuration for accessing CenterDevice API
+        /// </summary>
+        public CenterDevice.Rest.Clients.CenterDeviceConfiguration Config { get; set; }
+
+        /// <summary>
+        /// Client token for accessing CenterDevice API
+        /// </summary>
+        public CenterDevice.Rest.Clients.OAuth.OAuthInfo Token { get; set; }
 
-        protected override string UploadLinkBaseUrl => "https://upload.centerdevice.de/";
+        /// <summary>
+        /// Authorize user with username, customer number, organisation name and password as set up in configuration
+        /// </summary>
+        public void AuthorizeWithToken(CenterDevice.Rest.Clients.OAuth.OAuthInfo token)
+        {
+            this.Token = token;
+        }
+
+        /// <summary>
+        /// Authorize user with username, customer number, organisation name and password as set up in configuration
+        /// </summary>
+        public void AuthorizeWithUserCredentials()
+        {
+            //this.Token = this.AuthorizationApi.TokenWithHttpInfo("password", this.Config.ClientNumber, null, null, this.Config.Username, null, this.Config.OrganisationName, this.Config.Password, null, null, null, null).Data;
+            //this.Token = this.AuthorizationApi.TokenWithHttpInfo("password", null, null, null, this.Config.Username, null, null, this.Config.Password, null, null, null, null).Data;
+        }
+
+        /// <summary>
+        /// Update configuration and authorize user
+        /// </summary>
+        /// <param name="username"></param>
+        /// <param name="customerNo"></param>
+        /// <param name="password"></param>
+        public void AuthorizeWithUserCredentials(string username, string password)
+        //public void AuthorizeWithUserCredentials(string username, string customerNo, string password)
+        {
+            this.Config.Username = username;
+            //this.Config.ClientNumber = customerNo;
+            this.Config.Password = password;
+            this.AuthorizeWithUserCredentials();
+        }
+
+        /// <summary>
+        /// Update configuration and authorize user
+        /// </summary>
+        /// <param name="username"></param>
+        /// <param name="customerNo"></param>
+        /// <param name="organisationName"></param>
+        /// <param name="password"></param>
+        public void AuthorizeWithUserCredentials(string username, string organisationName, string password)
+        //public void AuthorizeWithUserCredentials(string username, string customerNo, string organisationName, string password)
+        {
+            this.Config.Username = username;
+            //this.Config.ClientNumber = customerNo;
+            //this.Config.OrganisationName = organisationName;
+            this.Config.Password = password;
+            this.AuthorizeWithUserCredentials();
+        }
     }
 }
 #pragma warning restore CS1591 // Fehledes XML-Kommentar f�r �ffentlich sichtbaren Typ oder Element

CenterDevice.Rest/Rest/Clients/CenterDeviceClientBase.cs

@@ -50,26 +50,26 @@ public virtual IStreamWrapper DefaultStreamWrapper()
 
         protected abstract string UploadLinkBaseUrl { get; }
 
-        public Rest.Clients.Folders.FolderRestClient Folder => new Rest.Clients.Folders.FolderRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
-        public Rest.Clients.Folders.FoldersRestClient Folders => new Rest.Clients.Folders.FoldersRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
-        public Rest.Clients.Collections.CollectionRestClient Collection => new Rest.Clients.Collections.CollectionRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
-        public Rest.Clients.Collections.CollectionsRestClient Collections => new Rest.Clients.Collections.CollectionsRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
-        public Rest.Clients.Documents.DocumentsRestClient Documents => new Rest.Clients.Documents.DocumentsRestClient(oAuthInfoProvider, configuration, errorHandler, this.DefaultStreamWrapper(), apiVersionPrefix);
-        public Rest.Clients.Documents.DocumentRestClient Document => new Rest.Clients.Documents.DocumentRestClient(oAuthInfoProvider, configuration, errorHandler, this.DefaultStreamWrapper(), apiVersionPrefix);
-        public Rest.Clients.Groups.GroupRestClient Group => new Rest.Clients.Groups.GroupRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
-        public Rest.Clients.Groups.GroupsRestClient Groups => new Rest.Clients.Groups.GroupsRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
-        public Rest.Clients.Link.LinkRestClient Link => new Rest.Clients.Link.LinkRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
-        public Rest.Clients.Link.LinksRestClient Links => new Rest.Clients.Link.LinksRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
-        public Rest.Clients.Link.UploadLinkRestClient UploadLink => new Rest.Clients.Link.UploadLinkRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix, UploadLinkBaseUrl);
-        public Rest.Clients.Link.UploadLinksRestClient UploadLinks => new Rest.Clients.Link.UploadLinksRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix, UploadLinkBaseUrl);
-        public Rest.Clients.User.UserRestClient User => new Rest.Clients.User.UserRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
-        public Rest.Clients.User.UsersRestClient Users => new Rest.Clients.User.UsersRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
-        public Rest.Clients.User.UserSettingsRestClient UserSettings => new Rest.Clients.User.UserSettingsRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
-        public Rest.Clients.Timeline.TimelineRestClient Timeline => new Rest.Clients.Timeline.TimelineRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
-        public Rest.Clients.Tenant.TenantFeaturesRestClient TenantFeatures => new Rest.Clients.Tenant.TenantFeaturesRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
-        public Rest.Clients.Tenant.TenantRestClient Tenant => new Rest.Clients.Tenant.TenantRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
-        public Rest.Clients.Tenant.TenantSettingsRestClient TenantSettings => new Rest.Clients.Tenant.TenantSettingsRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
-        public Rest.Clients.Tenant.TenantsRestClient Tenants => new Rest.Clients.Tenant.TenantsRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
+        public CenterDevice.Rest.Clients.Folders.FolderRestClient Folder => new CenterDevice.Rest.Clients.Folders.FolderRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
+        public CenterDevice.Rest.Clients.Folders.FoldersRestClient Folders => new CenterDevice.Rest.Clients.Folders.FoldersRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
+        public CenterDevice.Rest.Clients.Collections.CollectionRestClient Collection => new CenterDevice.Rest.Clients.Collections.CollectionRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
+        public CenterDevice.Rest.Clients.Collections.CollectionsRestClient Collections => new CenterDevice.Rest.Clients.Collections.CollectionsRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
+        public CenterDevice.Rest.Clients.Documents.DocumentsRestClient Documents => new CenterDevice.Rest.Clients.Documents.DocumentsRestClient(oAuthInfoProvider, configuration, errorHandler, this.DefaultStreamWrapper(), apiVersionPrefix);
+        public CenterDevice.Rest.Clients.Documents.DocumentRestClient Document => new CenterDevice.Rest.Clients.Documents.DocumentRestClient(oAuthInfoProvider, configuration, errorHandler, this.DefaultStreamWrapper(), apiVersionPrefix);
+        public CenterDevice.Rest.Clients.Groups.GroupRestClient Group => new CenterDevice.Rest.Clients.Groups.GroupRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
+        public CenterDevice.Rest.Clients.Groups.GroupsRestClient Groups => new CenterDevice.Rest.Clients.Groups.GroupsRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
+        public CenterDevice.Rest.Clients.Link.LinkRestClient Link => new CenterDevice.Rest.Clients.Link.LinkRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
+        public CenterDevice.Rest.Clients.Link.LinksRestClient Links => new CenterDevice.Rest.Clients.Link.LinksRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
+        public CenterDevice.Rest.Clients.Link.UploadLinkRestClient UploadLink => new CenterDevice.Rest.Clients.Link.UploadLinkRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix, UploadLinkBaseUrl);
+        public CenterDevice.Rest.Clients.Link.UploadLinksRestClient UploadLinks => new CenterDevice.Rest.Clients.Link.UploadLinksRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix, UploadLinkBaseUrl);
+        public CenterDevice.Rest.Clients.User.UserRestClient User => new CenterDevice.Rest.Clients.User.UserRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
+        public CenterDevice.Rest.Clients.User.UsersRestClient Users => new CenterDevice.Rest.Clients.User.UsersRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
+        public CenterDevice.Rest.Clients.User.UserSettingsRestClient UserSettings => new CenterDevice.Rest.Clients.User.UserSettingsRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
+        public CenterDevice.Rest.Clients.Timeline.TimelineRestClient Timeline => new CenterDevice.Rest.Clients.Timeline.TimelineRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
+        public CenterDevice.Rest.Clients.Tenant.TenantFeaturesRestClient TenantFeatures => new CenterDevice.Rest.Clients.Tenant.TenantFeaturesRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
+        public CenterDevice.Rest.Clients.Tenant.TenantRestClient Tenant => new CenterDevice.Rest.Clients.Tenant.TenantRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
+        public CenterDevice.Rest.Clients.Tenant.TenantSettingsRestClient TenantSettings => new CenterDevice.Rest.Clients.Tenant.TenantSettingsRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
+        public CenterDevice.Rest.Clients.Tenant.TenantsRestClient Tenants => new CenterDevice.Rest.Clients.Tenant.TenantsRestClient(oAuthInfoProvider, configuration, errorHandler, apiVersionPrefix);
     }
 }
 #pragma warning restore CS1591 // Fehledes XML-Kommentar f�r �ffentlich sichtbaren Typ oder Element