Merge branch 'master' into dev

7 years ago · 9e994bd8ea
2 changed files with 2 additions and 2 deletions
--- a/docs/en/Tutorials/Angular/Part-I.md
+++ b/docs/en/Tutorials/Angular/Part-I.md
@ -343,7 +343,7 @@ Run `yarn start`, wait Angular to run the application and open `http://localhost
 Open the `app-routing.module.ts` and replace `books` as shown below:

 ```js
-import { ApplicationLayoutComponent } from '@abp/ng.theme.basic';-
+import { ApplicationLayoutComponent } from '@abp/ng.theme.basic';

 //...
 {
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Auth/AuthService.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Auth/AuthService.cs
@ -22,7 +22,7 @@ namespace Volo.Abp.Cli.Auth
        {
            var configuration = new IdentityClientConfiguration(
                CliUrls.AccountAbpIo,
-                "role email abpio abpio_www abpio_commercial", 
+                "role email abpio abpio_www abpio_commercial offline_access", 
                "abp-cli",
                "1q2w3e*",
                OidcConstants.GrantTypes.Password,