Fix compiler warnings related to nullability in Devices module

AdminUi/src/AdminUi/Extensions/DevicesServiceCollectionExtensions.cs

@@ -15,8 +15,8 @@ public static IServiceCollection AddDevices(this IServiceCollection services,
 
         services.AddDatabase(options =>
         {
-            options.ConnectionString = configuration.Infrastructure.SqlDatabase.ConnectionString;
             options.Provider = configuration.Infrastructure.SqlDatabase.Provider;
+            options.ConnectionString = configuration.Infrastructure.SqlDatabase.ConnectionString;
         });
 
         services.AddSingleton<ISignatureHelper, SignatureHelper>(_ => SignatureHelper.CreateEd25519WithRawKeyFormat());

BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Persistence/Database/IDbContext.cs

@@ -15,8 +15,8 @@ Task RunInTransaction(Func<Task> action, List<int> errorNumbersToRetry,
 
     Task RunInTransaction(Func<Task> action, IsolationLevel isolationLevel);
 
-    Task<T?> RunInTransaction<T>(Func<Task<T?>> action, List<int> errorNumbersToRetry,
+    Task<T> RunInTransaction<T>(Func<Task<T>> action, List<int>? errorNumbersToRetry,
         IsolationLevel isolationLevel = IsolationLevel.ReadCommitted);
 
-    Task<T?> RunInTransaction<T>(Func<Task<T?>> func, IsolationLevel isolationLevel);
+    Task<T> RunInTransaction<T>(Func<Task<T>> func, IsolationLevel isolationLevel);
 }

BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/AbstractDbContextBase.cs

@@ -69,17 +69,18 @@ public async Task RunInTransaction(Func<Task> action, IsolationLevel isolationLe
         await RunInTransaction(action, null, isolationLevel);
     }
 
-    public async Task<T?> RunInTransaction<T>(Func<Task<T?>> action, List<int>? errorNumbersToRetry,
+    public async Task<T> RunInTransaction<T>(Func<Task<T>> action, List<int>? errorNumbersToRetry,
         IsolationLevel isolationLevel = IsolationLevel.ReadCommitted)
     {
-        var response = default(T);
+        // the '!' is safe here because the default value is only returned after the action is executed, which is setting the response
+        var response = default(T)!;
 
-        await RunInTransaction(async () => response = await action(), errorNumbersToRetry, isolationLevel);
+        await RunInTransaction(async () => { response = await action(); }, errorNumbersToRetry, isolationLevel);
 
         return response;
     }
 
-    public async Task<T?> RunInTransaction<T>(Func<Task<T?>> func, IsolationLevel isolationLevel)
+    public async Task<T> RunInTransaction<T>(Func<Task<T>> func, IsolationLevel isolationLevel)
     {
         return await RunInTransaction(func, null, isolationLevel);
     }
@@ -95,24 +96,4 @@ protected override void ConfigureConventions(ModelConfigurationBuilder configura
         configurationBuilder.Properties<DateTime>().HaveConversion<DateTimeValueConverter>();
         configurationBuilder.Properties<DateTime?>().HaveConversion<NullableDateTimeValueConverter>();
     }
-
-    protected void RollBack()
-    {
-        var changedEntries = ChangeTracker.Entries().Where(x => x.State != EntityState.Unchanged).ToList();
-
-        foreach (var entry in changedEntries)
-            switch (entry.State)
-            {
-                case EntityState.Modified:
-                    entry.CurrentValues.SetValues(entry.OriginalValues);
-                    entry.State = EntityState.Unchanged;
-                    break;
-                case EntityState.Added:
-                    entry.State = EntityState.Detached;
-                    break;
-                case EntityState.Deleted:
-                    entry.State = EntityState.Unchanged;
-                    break;
-            }
-    }
 }

ConsumerApi.Tests.Integration/Features/Challenges/POST.feature

@@ -17,24 +17,24 @@ Scenario: Creating a Challenge as an authenticated user
 	And the response contains a Challenge
 	And the Challenge contains information about the creator
 
-@ignore("skipping_due_to_required_backbone_changes")
-Scenario: Creating a Challenge with a JSON sent in the request content
-	When a POST request is sent to the Challenges endpoint with
-		| Key     | Value                              |
-		| Content | {"this": "is some arbitrary json"} |
-	Then the response status code is 415 (Unsupported Media Type)
-
-@ignore("skipping_due_to_required_backbone_changes")
-Scenario: Creating a Challenge with an invalid JSON sent in the request content
-	When a POST request is sent to the Challenges endpoint with
-		| Key     | Value                             |
-		| Content | { "thisJSON": "has an extra }" }} |
-	Then the response status code is 415 (Unsupported Media Type)
-
-@ignore("skipping_due_to_required_backbone_changes")
-Scenario: Creating a Challenge with an unsupported Content-Type header
-	When a POST request is sent to the Challenges endpoint with
-		| Key         | Value                              |
-		| ContentType | application/xml                    |
-		| Content     | <this>is some arbitrary xml</this> |
-	Then the response status code is 415 (Unsupported Media Type)
+#@ignore("skipping_due_to_required_backbone_changes")
+#Scenario: Creating a Challenge with a JSON sent in the request content
+#	When a POST request is sent to the Challenges endpoint with
+#		| Key     | Value                              |
+#		| Content | {"this": "is some arbitrary json"} |
+#	Then the response status code is 415 (Unsupported Media Type)
+#
+#@ignore("skipping_due_to_required_backbone_changes")
+#Scenario: Creating a Challenge with an invalid JSON sent in the request content
+#	When a POST request is sent to the Challenges endpoint with
+#		| Key     | Value                             |
+#		| Content | { "thisJSON": "has an extra }" }} |
+#	Then the response status code is 415 (Unsupported Media Type)
+#
+#@ignore("skipping_due_to_required_backbone_changes")
+#Scenario: Creating a Challenge with an unsupported Content-Type header
+#	When a POST request is sent to the Challenges endpoint with
+#		| Key         | Value                              |
+#		| ContentType | application/xml                    |
+#		| Content     | <this>is some arbitrary xml</this> |
+#	Then the response status code is 415 (Unsupported Media Type)

ConsumerApi.Tests.Integration/Features/Challenges/{id}/GET.feature

@@ -21,23 +21,23 @@ Scenario: Requesting a nonexistent Challenge as an authenticated user
 	When a GET request is sent to the Challenges/{id} endpoint with "CHLthisisnonexisting"
 	Then the response status code is 404 (Not Found)
 
-@ignore("skipping_due_to_required_backbone_changes")
-Scenario: Requesting a Challenge with an unsupported Accept Header as an authenticated user
-	Given the user is authenticated
-	And the Accept header is 'application/xml'
-	When a GET request is sent to the Challenges/{id} endpoint with a valid Id
-	Then the response status code is 406 (Not Acceptable)
-
-@ignore("skipping_due_to_required_backbone_changes")
-Scenario Outline: Requesting a Challenge with an invalid id as an authenticated user
-	Given the user is authenticated
-	When a GET request is sent to the Challenges/{id} endpoint with <id>
-	Then the response status code is 400 (Bad Request)
-	And the response content includes an error with the error code "error.platform.invalidId"
-Examples:
-	| id                          | description                 |
-	| CHLthishastoomanycharacters | More than 20 characters     |
-	| CHLnotenoughchars           | Less than 20 characters     |
-	| !CHLdfhuwnjdfnjnjfnd        | Contains invalid characters |
-	| CHL_frfssd_fdfdsed#_        | Contains invalid characters |
-	| PHLfdjfdjflndjkfndjk        | Does not have CHL prefix    |
+#@ignore("skipping_due_to_required_backbone_changes")
+#Scenario: Requesting a Challenge with an unsupported Accept Header as an authenticated user
+#	Given the user is authenticated
+#	And the Accept header is 'application/xml'
+#	When a GET request is sent to the Challenges/{id} endpoint with a valid Id
+#	Then the response status code is 406 (Not Acceptable)
+#
+#@ignore("skipping_due_to_required_backbone_changes")
+#Scenario Outline: Requesting a Challenge with an invalid id as an authenticated user
+#	Given the user is authenticated
+#	When a GET request is sent to the Challenges/{id} endpoint with <id>
+#	Then the response status code is 400 (Bad Request)
+#	And the response content includes an error with the error code "error.platform.invalidId"
+#Examples:
+#	| id                          | description                 |
+#	| CHLthishastoomanycharacters | More than 20 characters     |
+#	| CHLnotenoughchars           | Less than 20 characters     |
+#	| !CHLdfhuwnjdfnjnjfnd        | Contains invalid characters |
+#	| CHL_frfssd_fdfdsed#_        | Contains invalid characters |
+#	| PHLfdjfdjflndjkfndjk        | Does not have CHL prefix    |

ConsumerApi.Tests.Integration/Features/Tokens/POST.feature

@@ -1,92 +1,92 @@
-@Integration
-Feature: POST Token
-
-User creates a Token
-
-Scenario: Creating a Token as an authenticated user
-	Given the user is authenticated
-	When a POST request is sent to the Tokens endpoint with
-		| Key			| Value                                         |
-		| ContentType	| application/json								|
-		| Content		| {"content": "QQ==","expiresAt": "<tomorrow>"} |
-	Then the response status code is 201 (Created)
-	And the response contains a CreateTokenResponse
-
-Scenario: Creating a Token as an anonymous user
-	Given the user is unauthenticated
-	When a POST request is sent to the Tokens endpoint with
-		| Key			| Value											|
-		| ContentType	| application/json								|
-		| Content		| {"content": "QQ==","expiresAt": "<tomorrow>"} |
-	Then the response status code is 401 (Unauthorized)
-
-@ignore("skipping_due_to_required_backbone_changes")
-Scenario: Creating a Token without the "Content" request content property
-	Given the user is authenticated
-	When a POST request is sent to the Tokens endpoint with
-		| Key     | Value                       |
-		| Content | {"expiresAt": "<tomorrow>"} |
-	Then the response status code is 400 (Bad Request)
-	And the response content includes an error with the error code "error.platform.validation.invalidPropertyValue"
-
-@ignore("skipping_due_to_required_backbone_changes")
-Scenario: Creating a Token with an empty "Content" request content property
-	Given the user is authenticated
-	When a POST request is sent to the Tokens endpoint with
-		| Key     | Value                                     |
-		| Content | {"content": "","expiresAt": "<tomorrow>"} |
-	Then the response status code is 400 (Bad Request)
-	And the response content includes an error with the error code "error.platform.validation.invalidPropertyValue"
-
-@ignore("skipping_due_to_required_backbone_changes")
-Scenario: Creating a Token with an invalid base64 in the "Content" property
-	Given the user is authenticated
-	When a POST request is sent to the Tokens endpoint with
-		| Key     | Value                                                     |
-		| Content | {"content": "<invalid base64>","expiresAt": "<tomorrow>"} |
-	Then the response status code is 400 (Bad Request)
-	And the response content includes an error with the error code "error.platform.validation.invalidPropertyValue"
-
-@ignore("skipping_due_to_required_backbone_changes")
-Scenario: Creating a Token without the "expiresAt" request content property
-	Given the user is authenticated
-	When a POST request is sent to the Tokens endpoint with
-		| Key     | Value               |
-		| Content | {"content": "QQ=="} |
-	Then the response status code is 400 (Bad Request)
-	And the response content includes an error with the error code "error.platform.validation.invalidPropertyValue"
-
-@ignore("skipping_due_to_required_backbone_changes")
-Scenario: Creating a Token with a date in the past in the "expiresAt" request content property
-	Given the user is authenticated
-	When a POST request is sent to the Tokens endpoint with
-		| Key     | Value                                          |
-		| Content | {"content": "QQ==","expiresAt": "<yesterday>"} |
-	Then the response status code is 400 (Bad Request)
-	And the response content includes an error with the error code "error.platform.validation.invalidPropertyValue"
-
-@ignore("skipping_due_to_required_backbone_changes")
-Scenario: Creating a Token without a request content
-	Given the user is authenticated
-	When a POST request is sent to the Tokens endpoint with no request content
-	Then the response status code is 400 (Bad Request)
-	And the response content includes an error with the error code "error.platform.inputCannotBeParsed"
-
-Scenario: Creating a Token with an unsupported Content-Type
-	Given the user is authenticated
-	When a POST request is sent to the Tokens endpoint with
-		| Key         | Value                              |
-		| ContentType | application/xml                    |
-		| Content     | <this>is some arbitrary xml</this> |
-	Then the response status code is 415 (Unsupported Media Type)
-
-@ignore("skipping_due_to_required_backbone_changes")
-Scenario Outline: Creating a Token with an invalid DateTime format in the "expiresAt" request content property
-	Given the user is authenticated
-	When a POST request is sent to the Tokens endpoint with '<Content>', '<ExpiresAt>'
-	Then the response status code is 400 (Bad Request)
-	And the response content includes an error with the error code "error.platform.validation.invalidPropertyValue"
-Examples:
-	| Content | ExpiresAt  |
-	| QQ==    | 31/12/9999 |
-	| QQ==    | 13-2-9999  |
+@Integration
+Feature: POST Token
+
+User creates a Token
+
+Scenario: Creating a Token as an authenticated user
+	Given the user is authenticated
+	When a POST request is sent to the Tokens endpoint with
+		| Key			| Value                                         |
+		| ContentType	| application/json								|
+		| Content		| {"content": "QQ==","expiresAt": "<tomorrow>"} |
+	Then the response status code is 201 (Created)
+	And the response contains a CreateTokenResponse
+
+Scenario: Creating a Token as an anonymous user
+	Given the user is unauthenticated
+	When a POST request is sent to the Tokens endpoint with
+		| Key			| Value											|
+		| ContentType	| application/json								|
+		| Content		| {"content": "QQ==","expiresAt": "<tomorrow>"} |
+	Then the response status code is 401 (Unauthorized)
+
+#@ignore("skipping_due_to_required_backbone_changes")
+#Scenario: Creating a Token without the "Content" request content property
+#	Given the user is authenticated
+#	When a POST request is sent to the Tokens endpoint with
+#		| Key     | Value                       |
+#		| Content | {"expiresAt": "<tomorrow>"} |
+#	Then the response status code is 400 (Bad Request)
+#	And the response content includes an error with the error code "error.platform.validation.invalidPropertyValue"
+#
+#@ignore("skipping_due_to_required_backbone_changes")
+#Scenario: Creating a Token with an empty "Content" request content property
+#	Given the user is authenticated
+#	When a POST request is sent to the Tokens endpoint with
+#		| Key     | Value                                     |
+#		| Content | {"content": "","expiresAt": "<tomorrow>"} |
+#	Then the response status code is 400 (Bad Request)
+#	And the response content includes an error with the error code "error.platform.validation.invalidPropertyValue"
+#
+#@ignore("skipping_due_to_required_backbone_changes")
+#Scenario: Creating a Token with an invalid base64 in the "Content" property
+#	Given the user is authenticated
+#	When a POST request is sent to the Tokens endpoint with
+#		| Key     | Value                                                     |
+#		| Content | {"content": "<invalid base64>","expiresAt": "<tomorrow>"} |
+#	Then the response status code is 400 (Bad Request)
+#	And the response content includes an error with the error code "error.platform.validation.invalidPropertyValue"
+#
+#@ignore("skipping_due_to_required_backbone_changes")
+#Scenario: Creating a Token without the "expiresAt" request content property
+#	Given the user is authenticated
+#	When a POST request is sent to the Tokens endpoint with
+#		| Key     | Value               |
+#		| Content | {"content": "QQ=="} |
+#	Then the response status code is 400 (Bad Request)
+#	And the response content includes an error with the error code "error.platform.validation.invalidPropertyValue"
+#
+#@ignore("skipping_due_to_required_backbone_changes")
+#Scenario: Creating a Token with a date in the past in the "expiresAt" request content property
+#	Given the user is authenticated
+#	When a POST request is sent to the Tokens endpoint with
+#		| Key     | Value                                          |
+#		| Content | {"content": "QQ==","expiresAt": "<yesterday>"} |
+#	Then the response status code is 400 (Bad Request)
+#	And the response content includes an error with the error code "error.platform.validation.invalidPropertyValue"
+#
+#@ignore("skipping_due_to_required_backbone_changes")
+#Scenario: Creating a Token without a request content
+#	Given the user is authenticated
+#	When a POST request is sent to the Tokens endpoint with no request content
+#	Then the response status code is 400 (Bad Request)
+#	And the response content includes an error with the error code "error.platform.inputCannotBeParsed"
+
+Scenario: Creating a Token with an unsupported Content-Type
+	Given the user is authenticated
+	When a POST request is sent to the Tokens endpoint with
+		| Key         | Value                              |
+		| ContentType | application/xml                    |
+		| Content     | <this>is some arbitrary xml</this> |
+	Then the response status code is 415 (Unsupported Media Type)
+
+#@ignore("skipping_due_to_required_backbone_changes")
+#Scenario Outline: Creating a Token with an invalid DateTime format in the "expiresAt" request content property
+#	Given the user is authenticated
+#	When a POST request is sent to the Tokens endpoint with '<Content>', '<ExpiresAt>'
+#	Then the response status code is 400 (Bad Request)
+#	And the response content includes an error with the error code "error.platform.validation.invalidPropertyValue"
+#Examples:
+#	| Content | ExpiresAt  |
+#	| QQ==    | 31/12/9999 |
+#	| QQ==    | 13-2-9999  |