Merge pull request #15297 from abpframework/auto-merge/rel-7-0/1632

Merge branch dev with rel-7.0

docs/en/Tutorials/Part-3.md

@@ -789,7 +789,7 @@ Open `/src/app/book/book.component.html` and replace `<ng-template #abpBody> </n
       <label for="book-type">Type</label><span> * </span>
       <select class="form-control" id="book-type" formControlName="type">
         <option [ngValue]="null">Select a book type</option>
-        <option [ngValue]="type.value" *ngFor="let type of bookTypes"> {%{{{ type.key }}}%}</option>
+        <option [ngValue]="type.value" *ngFor="let type of bookTypes"> {%{{{ '::Enum:BookType.' + type.value | abpLocalization }}}%}</option>
       </select>
     </div>
 

docs/en/UI/Angular/OAuth-Module.md

@@ -7,8 +7,15 @@ Those abstractions can be found in the @abp/ng-core packages.
 - `AuthService` (the class that implements the IAuthService interface).
 - `NAVIGATE_TO_MANAGE_PROFILE` Inject token.
 - `AuthGuard` (the class that implements the IAuthGuard interface).
+- `ApiInterceptor` (the class that implements the IApiInterceptor interface).
+
+Those base classes are overridden by the "AbpOAuthModule" for oAuth. There are also three functions provided with AbpOAuthModule.
+
+- `PIPE_TO_LOGIN_FN_KEY` a provide that calls a function when the user is not authenticated. The function should be PipeToLoginFn type.
+- `SET_TOKEN_RESPONSE_TO_STORAGE_FN_KEY` a provide that calls a function when the user is authenticated. The function should be  SetTokenResponseToStorageFn type.
+- `CHECK_AUTHENTICATION_STATE_FN_KEY` a provide that calls a function when the user is authenticated and stores the auth state. The function should be CheckAuthenticationStateFn type.
+The tokens and interfaces are in the `@abp/ng.core` package but the implementation of these interfaces is in the `@abp/ng.oauth` package.
 
-Those base classes are overridden by the "AbpOAuthModule" for oAuth.
 If you want to make your own authentication system, you must also change these 'abstract' classes.
 
-ApiInterceptor is provided by @abp/ng.oauth. The ApiInterceptor adds the token, accepted-language, and tenant id to the header of the HTTP request.
+ApiInterceptor is provided by `@abp/ng.core` but overridden with `@abp/ng.oauth`. The ApiInterceptor adds the token, accepted-language, and tenant id to the header of the HTTP request. It also calls the http-wait service.

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs

@@ -265,7 +265,7 @@ public class AbpSelectTagHelperService : AbpTagHelperService<AbpSelectTagHelper>
 
         var containerLocalizer = _tagHelperLocalizer.GetLocalizerOrNull(explorer.Container.ModelType.Assembly);
 
-        foreach (var enumValue in enumType.GetEnumValues())
+        foreach (var enumValue in enumType.GetEnumValuesAsUnderlyingType())
         {
             var localizedMemberName = _abpEnumLocalizer.GetString(enumType, enumValue,
                 new[]