Browse Source

Merge pull request #7391 from abpframework/issue-volo-4907

resolves volosoft/volo#4907
pull/7470/head
Yunus Emre Kalkan 6 years ago
committed by GitHub
parent
commit
0d4ab74b61
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Auth/AuthService.cs
  2. 6
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs

3
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( var configuration = new IdentityClientConfiguration(
CliUrls.AccountAbpIo, CliUrls.AccountAbpIo,
"role email abpio abpio_www abpio_commercial offline_access", "role email abpio abpio_www abpio_commercial offline_access",
"abp-cli", "abp-cli",
"1q2w3e*", "1q2w3e*",
OidcConstants.GrantTypes.Password, OidcConstants.GrantTypes.Password,
@ -43,6 +43,7 @@ namespace Volo.Abp.Cli.Auth
public Task LogoutAsync() public Task LogoutAsync()
{ {
FileHelper.DeleteIfExists(CliPaths.AccessToken); FileHelper.DeleteIfExists(CliPaths.AccessToken);
FileHelper.DeleteIfExists(CliPaths.Lic);
return Task.CompletedTask; return Task.CompletedTask;
} }

6
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs

@ -1,5 +1,6 @@
using System; using System;
using System.IO; using System.IO;
using System.Text;
namespace Volo.Abp.Cli namespace Volo.Abp.Cli
{ {
@ -10,7 +11,8 @@ namespace Volo.Abp.Cli
public static string Root => Path.Combine(AbpRootPath, "cli"); public static string Root => Path.Combine(AbpRootPath, "cli");
public static string AccessToken => Path.Combine(AbpRootPath, "cli", "access-token.bin"); public static string AccessToken => Path.Combine(AbpRootPath, "cli", "access-token.bin");
public static string Build => Path.Combine(AbpRootPath, "build"); public static string Build => Path.Combine(AbpRootPath, "build");
public static string Lic => Path.Combine(Path.GetTempPath(), Encoding.ASCII.GetString(new byte[] { 65, 98, 112, 76, 105, 99, 101, 110, 115, 101, 46, 98, 105, 110 }));
private static readonly string AbpRootPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".abp"); private static readonly string AbpRootPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".abp");
} }
} }

Loading…
Cancel
Save