Merge branch 'master' into dev

abpframework · Jan 24, 2020 · 9e994bd · 9e994bd
2 parents 673cb6a + c3cefb5
commit 9e994bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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';
 
 //...
 {

diff --git 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 @@ public async Task LoginAsync(string userName, string password, string organizati
         {
             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,
-Original file line number
+Diff line change
@@ Expand Up @@
     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';
     //...
     {
@@ Expand Down @@