Merge pull request #15732 from abpframework/auto-merge/rel-7-0/1738

Merge branch rel-7.1 with rel-7.0

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Json/MvcCoreBuilderExtensions.cs

@@ -20,6 +20,8 @@ public static class MvcCoreBuilderExtensions
 
                 options.JsonSerializerOptions.Converters.Add(new AbpStringToEnumFactory());
                 options.JsonSerializerOptions.Converters.Add(new AbpStringToBooleanConverter());
+                options.JsonSerializerOptions.Converters.Add(new AbpStringToGuidConverter());
+                options.JsonSerializerOptions.Converters.Add(new AbpNullableStringToGuidConverter());
                 options.JsonSerializerOptions.Converters.Add(new ObjectToInferredTypesConverter());
 
                 options.JsonSerializerOptions.TypeInfoResolver = new AbpDefaultJsonTypeInfoResolver(serviceProvider

framework/src/Volo.Abp.Json.SystemTextJson/Volo/Abp/Json/SystemTextJson/AbpJsonSystemTextJsonModule.cs

@@ -22,6 +22,8 @@ public class AbpJsonSystemTextJsonModule : AbpModule
 
                 options.JsonSerializerOptions.Converters.Add(new AbpStringToEnumFactory());
                 options.JsonSerializerOptions.Converters.Add(new AbpStringToBooleanConverter());
+                options.JsonSerializerOptions.Converters.Add(new AbpStringToGuidConverter());
+                options.JsonSerializerOptions.Converters.Add(new AbpNullableStringToGuidConverter());
                 options.JsonSerializerOptions.Converters.Add(new ObjectToInferredTypesConverter());
 
                 options.JsonSerializerOptions.TypeInfoResolver = new AbpDefaultJsonTypeInfoResolver(serviceProvider

framework/src/Volo.Abp.Json.SystemTextJson/Volo/Abp/Json/SystemTextJson/JsonConverters/AbpNullableStringToGuidConverter.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Volo.Abp.Json.SystemTextJson.JsonConverters;
+
+public class AbpNullableStringToGuidConverter : JsonConverter<Guid?>
+{
+    private JsonSerializerOptions _writeJsonSerializerOptions;
+
+    public override Guid? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType == JsonTokenType.String)
+        {
+            var guidString = reader.GetString();
+            string[] formats = { "N", "D", "B", "P", "X" };
+            foreach (var format in formats)
+            {
+                if (Guid.TryParseExact(guidString, format, out var guid))
+                {
+                    return guid;
+                }
+            }
+        }
+
+        if (reader.TryGetGuid(out var guid2))
+        {
+            return guid2;
+        }
+
+        return null;
+    }
+
+    public override void Write(Utf8JsonWriter writer, Guid? value, JsonSerializerOptions options)
+    {
+        _writeJsonSerializerOptions ??= JsonSerializerOptionsHelper.Create(options, this);
+        var entityConverter = (JsonConverter<Guid?>)_writeJsonSerializerOptions.GetConverter(typeof(Guid?));
+
+        entityConverter.Write(writer, value, _writeJsonSerializerOptions);
+    }
+}

framework/src/Volo.Abp.Json.SystemTextJson/Volo/Abp/Json/SystemTextJson/JsonConverters/AbpStringToGuidConverter.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Volo.Abp.Json.SystemTextJson.JsonConverters;
+
+public class AbpStringToGuidConverter : JsonConverter<Guid>
+{
+    private JsonSerializerOptions _writeJsonSerializerOptions;
+
+    public override Guid Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType == JsonTokenType.String)
+        {
+            var guidString = reader.GetString();
+            string[] formats = { "N", "D", "B", "P", "X" };
+            foreach (var format in formats)
+            {
+                if (Guid.TryParseExact(guidString, format, out var guid))
+                {
+                    return guid;
+                }
+            }
+        }
+
+        return reader.GetGuid();
+    }
+
+    public override void Write(Utf8JsonWriter writer, Guid value, JsonSerializerOptions options)
+    {
+        _writeJsonSerializerOptions ??= JsonSerializerOptionsHelper.Create(options, this);
+        var entityConverter = (JsonConverter<Guid>)_writeJsonSerializerOptions.GetConverter(typeof(Guid));
+
+        entityConverter.Write(writer, value, _writeJsonSerializerOptions);
+    }
+}

framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ModelBinding/ModelBindingController.cs

@@ -49,6 +49,12 @@ public class ModelBindingController : AbpController
                input.Time3.Value.Kind.ToString().ToLower() + "_" +
                input.InnerModel.Time4.Kind.ToString().ToLower();
     }
+
+    [HttpPost("Guid_Json_Test")]
+    public GuidJsonModel Guid_Json_Test([FromBody] GuidJsonModel input)
+    {
+        return input;
+    }
 }
 
 public class GetDateTimeKindModel
@@ -68,3 +74,20 @@ public class GetDateTimeKindModel
         public DateTime Time4 { get; set; }
     }
 }
+
+public class GuidJsonModel
+{
+    public Guid UserId { get; set; }
+
+    public Guid UserId2 { get; set; }
+
+    public Guid UserId3 { get; set; }
+
+    public Guid UserId4 { get; set; }
+
+    public Guid UserId5 { get; set; }
+
+    public Guid? TenantId { get; set; }
+
+    public Guid? TenantId2 { get; set; }
+}

framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ModelBinding/ModelBindingController_Tests.cs

@@ -106,6 +106,18 @@ public abstract class ModelBindingController_Tests : AspNetCoreMvcTestBase
         var resultAsString = await response.Content.ReadAsStringAsync();
         resultAsString.ShouldBe($"local_{Kind.ToString().ToLower()}_{Kind.ToString().ToLower()}_local");
     }
+
+    [Fact]
+    public async Task Guid_Json_Test()
+    {
+        var guid = Guid.NewGuid();
+        var json = $"{{\"UserId\":\"{guid:B}\",\"UserId2\":\"{guid:N}\",\"UserId3\":\"{guid:D}\",\"UserId4\":\"{guid:P}\",\"UserId5\":\"{guid:x}\",\"TenantId\":null,\"TenantId2\":\"\"}}";
+        var response = await Client.PostAsync("/api/model-Binding-test/Guid_Json_Test", new StringContent(json, Encoding.UTF8, MimeTypes.Application.Json));
+
+        response.StatusCode.ShouldBe(HttpStatusCode.OK);
+        var resultAsString = await response.Content.ReadAsStringAsync();
+        resultAsString.ShouldBe($"{{\"userId\":\"{guid:D}\",\"userId2\":\"{guid:D}\",\"userId3\":\"{guid:D}\",\"userId4\":\"{guid:D}\",\"userId5\":\"{guid:D}\",\"tenantId\":null,\"tenantId2\":null}}");
+    }
 }
 
 public class ModelBindingController_Utc_Tests : ModelBindingController_Tests

framework/test/Volo.Abp.Json.Tests/Volo/Abp/Json/AbpStringToGuid_Tests.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Text.Json;
+using Shouldly;
+using Volo.Abp.Json.SystemTextJson.JsonConverters;
+using Xunit;
+
+namespace Volo.Abp.Json;
+
+public class AbpStringToGuid_Tests
+{
+    [Fact]
+    public void Test_Read()
+    {
+        var options = new JsonSerializerOptions()
+        {
+            Converters =
+            {
+                new AbpStringToGuidConverter(),
+                new AbpNullableStringToGuidConverter()
+            }
+        };
+
+        var guid = Guid.Parse("762DDB84-5225-4853-A566-FF0B3AF57585");
+        var testClass = JsonSerializer.Deserialize<TestClass>("{" +
+                                                              $"\"Id\": \"{guid:N}\", " +
+                                                              $"\"NullableId\": \"{guid:D}\", " +
+                                                              $"\"NullableId2\": \"{guid:B}\", " +
+                                                              $"\"NullableId3\": \"{guid:P}\", " +
+                                                              $"\"NullableId4\": \"{guid:X}\", " +
+                                                              "\"NullableId5\": \"\", " +
+                                                              "\"NullableId6\": null}", options);
+        testClass.ShouldNotBeNull();
+        testClass.Id.ShouldBe(guid);
+        testClass.NullableId.ShouldBe(guid);
+        testClass.NullableId2.ShouldBe(guid);
+        testClass.NullableId3.ShouldBe(guid);
+        testClass.NullableId4.ShouldBe(guid);
+        testClass.NullableId5.ShouldBeNull();
+        testClass.NullableId6.ShouldBeNull();
+    }
+
+    [Fact]
+    public void Test_Write()
+    {
+        var options = new JsonSerializerOptions()
+        {
+            Converters =
+            {
+                new AbpStringToGuidConverter(),
+                new AbpNullableStringToGuidConverter()
+            }
+        };
+
+        var guid = Guid.Parse("762DDB84-5225-4853-A566-FF0B3AF57585");
+        var json = JsonSerializer.Serialize(new TestClass()
+        {
+            Id = guid,
+            NullableId = null,
+            NullableId2 = guid,
+            NullableId3 = null,
+            NullableId4 = guid,
+            NullableId5 = null,
+            NullableId6 = guid
+        }, options);
+
+        json.ShouldBe($"{{\"Id\":\"{guid:D}\",\"NullableId\":null,\"NullableId2\":\"{guid:D}\",\"NullableId3\":null,\"NullableId4\":\"{guid:D}\",\"NullableId5\":null,\"NullableId6\":\"{guid:D}\"}}");
+    }
+
+    class TestClass
+    {
+        public Guid Id { get; set; }
+
+        public Guid? NullableId { get; set; }
+
+        public Guid? NullableId2 { get; set; }
+
+        public Guid? NullableId3 { get; set; }
+
+        public Guid? NullableId4 { get; set; }
+
+        public Guid? NullableId5 { get; set; }
+
+        public Guid? NullableId6 { get; set; }
+    }
+}

npm/ng-packs/packages/core/src/lib/models/auth.ts

@@ -12,6 +12,8 @@ export type PipeToLoginFn = (
   params: Pick<LoginParams, 'redirectUrl' | 'rememberMe'>,
   injector: Injector,
 ) => UnaryFunction<any, any>;
-
+/**
-export type SetTokenResponseToStorageFn<T = any> = (injector: Injector, tokenRes: T) => void;
+ * @deprecated The interface should not be used anymore. 
+ */
+export type SetTokenResponseToStorageFn<T = any> = (tokenRes: T) => void;
 export type CheckAuthenticationStateFn = (injector: Injector) => void;

npm/ng-packs/packages/core/src/lib/tokens/set-token-response-to-storage.token.ts

@@ -1,6 +1,9 @@
 import { InjectionToken } from '@angular/core';
 import { SetTokenResponseToStorageFn } from '../models';
 
+/**
+ * @deprecated The token should not be used anymore. 
+ */
 export const SET_TOKEN_RESPONSE_TO_STORAGE_FN_KEY = new InjectionToken<SetTokenResponseToStorageFn>(
   'SET_TOKEN_RESPONSE_TO_STORAGE_FN_KEY',
 );

npm/ng-packs/packages/oauth/src/lib/oauth.module.ts

@@ -1,4 +1,4 @@
-import { APP_INITIALIZER, Injector, ModuleWithProviders, NgModule } from '@angular/core';
+import { APP_INITIALIZER, ModuleWithProviders, NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { OAuthModule, OAuthStorage } from 'angular-oauth2-oidc';
 import {
@@ -7,8 +7,7 @@ import {
   AuthService,
   CHECK_AUTHENTICATION_STATE_FN_KEY,
   noop,
-  PIPE_TO_LOGIN_FN_KEY,
+  PIPE_TO_LOGIN_FN_KEY
-  SET_TOKEN_RESPONSE_TO_STORAGE_FN_KEY,
 } from '@abp/ng.core';
 import { storageFactory } from './utils/storage.factory';
 import { AbpOAuthService } from './services';
@@ -17,7 +16,7 @@ import { HTTP_INTERCEPTORS } from '@angular/common/http';
 import { OAuthApiInterceptor } from './interceptors/api.interceptor';
 import { AbpOAuthGuard } from './guards/oauth.guard';
 import { NavigateToManageProfileProvider } from './providers';
-import { checkAccessToken, pipeToLogin, setTokenResponseToStorage } from './utils';
+import { checkAccessToken, pipeToLogin } from './utils';
 
 @NgModule({
   imports: [CommonModule, OAuthModule],
@@ -43,10 +42,6 @@ export class AbpOAuthModule {
           provide: PIPE_TO_LOGIN_FN_KEY,
           useValue: pipeToLogin,
         },
-        {
-          provide: SET_TOKEN_RESPONSE_TO_STORAGE_FN_KEY,
-          useValue: setTokenResponseToStorage,
-        },
         {
           provide: CHECK_AUTHENTICATION_STATE_FN_KEY,
           useValue: checkAccessToken,

npm/ng-packs/packages/oauth/src/lib/utils/auth-utils.ts

@@ -1,4 +1,4 @@
-import { Injector } from '@angular/core';
+import { inject, Injector } from '@angular/core';
 import { Router } from '@angular/router';
 import { OAuthStorage, TokenResponse } from 'angular-oauth2-oidc';
 import { pipe } from 'rxjs';
@@ -29,29 +29,6 @@ export const pipeToLogin: PipeToLoginFn = function (
   );
 };
 
-export const setTokenResponseToStorage: SetTokenResponseToStorageFn<TokenResponse> = function (
-  injector: Injector,
-  tokenRes: TokenResponse,
-) {
-  const { access_token, refresh_token, scope: grantedScopes, expires_in } = tokenRes;
-  const storage = injector.get(OAuthStorage);
-
-  storage.setItem('access_token', access_token);
-  storage.setItem('refresh_token', refresh_token);
-  storage.setItem('access_token_stored_at', '' + Date.now());
-
-  if (grantedScopes) {
-    storage.setItem('granted_scopes', JSON.stringify(grantedScopes.split(' ')));
-  }
-
-  if (expires_in) {
-    const expiresInMilliSeconds = expires_in * 1000;
-    const now = new Date();
-    const expiresAt = now.getTime() + expiresInMilliSeconds;
-    storage.setItem('expires_at', '' + expiresAt);
-  }
-};
-
 export function setRememberMe(remember: boolean) {
   removeRememberMe();
   localStorage.setItem(storageKey, 'true');