diff --git a/aspnet-core/Directory.Build.props b/aspnet-core/Directory.Build.props index fb739e65..2bea56c1 100644 --- a/aspnet-core/Directory.Build.props +++ b/aspnet-core/Directory.Build.props @@ -1,7 +1,7 @@  - 5.2.0 + 5.2.1 6.0.0 6.0.0 6.0.0-preview.4.21253.7 diff --git a/aspnet-core/global.json b/aspnet-core/global.json index ebe3ab71..1deca079 100644 --- a/aspnet-core/global.json +++ b/aspnet-core/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.201", + "version": "6.0.202", "rollForward": "latestFeature" } } diff --git a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs index 0ac7cea8..c0f19e29 100644 --- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs +++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs @@ -43,6 +43,7 @@ using Volo.Abp.Modularity; using Microsoft.AspNetCore.Mvc; using Magicodes.ExporterAndImporter.Core; using Magicodes.ExporterAndImporter.Excel; +using Microsoft.AspNetCore.Identity; using Volo.Abp.AspNetCore.ExceptionHandling; namespace Lion.AbpPro @@ -83,6 +84,7 @@ namespace Lion.AbpPro ConfigurationMiniProfiler(context); ConfigureMagicodes(context); ConfigureAbpExceptions(context); + ConfigureIdentity(context); } public override void OnApplicationInitialization(ApplicationInitializationContext context) @@ -127,6 +129,7 @@ namespace Lion.AbpPro app.UseConsul(); } } + /// /// 异常处理 /// @@ -135,15 +138,10 @@ namespace Lion.AbpPro { //开启后通过ErrorCode抛本地化异常，message不会显示本地化词条 var SendExceptionsDetails = context.Services.GetHostingEnvironment().IsDevelopment(); - context.Services.Configure(options => - { - options.SendExceptionsDetailsToClients = SendExceptionsDetails; - }); - context.Services.AddMvc(options => - { - options.Filters.Add(typeof(ResultExceptionFilter)); - }); + context.Services.Configure(options => { options.SendExceptionsDetailsToClients = SendExceptionsDetails; }); + context.Services.AddMvc(options => { options.Filters.Add(typeof(ResultExceptionFilter)); }); } + /// /// 配置Magicodes.IE /// Excel导入导出 @@ -299,8 +297,30 @@ namespace Lion.AbpPro new Uri(context.Services.GetConfiguration().GetSection("HttpClient:Sts:Url") .Value); }); + context.Services.AddHttpClient(context.Services.GetConfiguration().GetSection("HttpClient:Github:Name").Value, + options => + { + options.BaseAddress = + new Uri(context.Services.GetConfiguration().GetSection("HttpClient:Github:Url") + .Value); + }); + context.Services.AddHttpClient(context.Services.GetConfiguration().GetSection("HttpClient:GithubApi:Name").Value, + options => + { + options.BaseAddress = + new Uri(context.Services.GetConfiguration().GetSection("HttpClient:GithubApi:Url") + .Value); + }); + } + /// + /// 配置Identity + /// + private void ConfigureIdentity(ServiceConfigurationContext context) + { + context.Services.Configure(options => { options.Lockout = new LockoutOptions() { AllowedForNewUsers = false }; }); + } private void ConfigureConventionalControllers() { Configure(options => diff --git a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.json b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.json index 358439d0..e8367f87 100644 --- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.json +++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.json @@ -64,6 +64,17 @@ "Sts": { "Name": "Sts", "Url": "http://localhost:44354" + }, + "Github": { + "Name": "Github", + "Url": "https://github.com", + "ClientId": "127fc528f611879fba03", + "ClientSecret": "fd0914e9e8e28b51dd5efe381121429279e43973" + }, + "GithubApi": { + "Name": "GithubApi", + "Url": "https://api.github.com", + "ClientName": "AbpPro" } }, "Consul": { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Users/Dtos/GithubAccessTokenResponse.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Users/Dtos/GithubAccessTokenResponse.cs new file mode 100644 index 00000000..626dc875 --- /dev/null +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Users/Dtos/GithubAccessTokenResponse.cs @@ -0,0 +1,24 @@ +using Newtonsoft.Json; + +namespace Lion.AbpPro.Users.Dtos; + +public class GithubAccessTokenResponse +{ + /// + /// access_token + /// + [JsonProperty("access_token")] + public string Access_token { get; set; } + + /// + /// scope + /// + [JsonProperty("scope")] + public string Scope { get; set; } + + /// + /// token_type + /// + [JsonProperty("token_type")] + public string TokenType { get; set; } +} \ No newline at end of file diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Users/Dtos/LoginGithubResponse.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Users/Dtos/LoginGithubResponse.cs new file mode 100644 index 00000000..0248b1d3 --- /dev/null +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Users/Dtos/LoginGithubResponse.cs @@ -0,0 +1,99 @@ +namespace Lion.AbpPro.Users.Dtos; + +public class LoginGithubResponse +{ + public string login { get; set; } + + + public int id { get; set; } + + + public string node_id { get; set; } + + + public string avatar_url { get; set; } + + + public string gravatar_id { get; set; } + + + public string url { get; set; } + + + public string html_url { get; set; } + + + public string followers_url { get; set; } + + + public string following_url { get; set; } + + + public string gists_url { get; set; } + + + public string starred_url { get; set; } + + + public string subscriptions_url { get; set; } + + + public string organizations_url { get; set; } + + + public string repos_url { get; set; } + + + public string events_url { get; set; } + + + public string received_events_url { get; set; } + + + public string type { get; set; } + + + public string site_admin { get; set; } + + + public string name { get; set; } + + + public string company { get; set; } + + + public string blog { get; set; } + + + public string location { get; set; } + + + public string email { get; set; } + + + public string hireable { get; set; } + + + public string bio { get; set; } + + + public string twitter_username { get; set; } + + + public int public_repos { get; set; } + + + public int public_gists { get; set; } + + + public int followers { get; set; } + + + public int following { get; set; } + + + public string created_at { get; set; } + + + public string updated_at { get; set; } +} \ No newline at end of file diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Users/Dtos/LoginStsOutput.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Users/Dtos/LoginStsResponse.cs similarity index 93% rename from aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Users/Dtos/LoginStsOutput.cs rename to aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Users/Dtos/LoginStsResponse.cs index c3022869..898153f9 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Users/Dtos/LoginStsOutput.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Users/Dtos/LoginStsResponse.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; namespace Lion.AbpPro.Users.Dtos { - public class LoginStsOutput + public class LoginStsResponse { public string name { get; set; } diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Users/IAccountAppService.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Users/IAccountAppService.cs index 6cf7498e..0e21049f 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Users/IAccountAppService.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Users/IAccountAppService.cs @@ -9,9 +9,25 @@ namespace Lion.AbpPro.Users { public interface IAccountAppService: IApplicationService { + /// + /// 用户名密码登录 + /// + /// + /// Task LoginAsync(LoginInput input); + + /// + /// identityServer4第三方登录 + /// + /// + Task Id4LoginAsync(string accessToken); + + /// + /// github第三方登录 + /// + /// 授权码 + /// + Task GithubLoginAsync(string code); - Task StsLoginAsync(string accessToken); - } } diff --git a/aspnet-core/services/src/Lion.AbpPro.Application/HttpClientNameConsts.cs b/aspnet-core/services/src/Lion.AbpPro.Application/HttpClientNameConsts.cs index ffee2893..0a3f9d11 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application/HttpClientNameConsts.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application/HttpClientNameConsts.cs @@ -9,5 +9,11 @@ namespace Lion.AbpPro /// 身份验证中心 /// public static string Sts = "Sts"; + /// + /// Github + /// + public static string Github = "Github"; + + public static string GithubApi = "GithubApi"; } } diff --git a/aspnet-core/services/src/Lion.AbpPro.Application/Users/AccountAppService.cs b/aspnet-core/services/src/Lion.AbpPro.Application/Users/AccountAppService.cs index 023b3c23..abf57bb5 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application/Users/AccountAppService.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application/Users/AccountAppService.cs @@ -9,44 +9,41 @@ using System.Threading.Tasks; using Lion.AbpPro.ConfigurationOptions; using Lion.AbpPro.Users.Dtos; using IdentityModel; -using Lion.AbpPro.Extension.Customs.Dtos; using Lion.AbpPro.Extension.Customs.Http; -using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Options; using Microsoft.IdentityModel.Tokens; using Volo.Abp; using Volo.Abp.Identity; -using Volo.Abp.MultiTenancy; using Volo.Abp.Security.Claims; + namespace Lion.AbpPro.Users { public class AccountAppService : AbpProAppService, IAccountAppService { private readonly IdentityUserManager _userManager; private readonly JwtOptions _jwtOptions; - - private readonly Microsoft.AspNetCore.Identity.SignInManager - _signInManager; - + private readonly Microsoft.AspNetCore.Identity.SignInManager _signInManager; private readonly IHttpClientFactory _httpClientFactory; - private readonly ICurrentTenant _currentTenant; - private readonly IHttpContextAccessor _contextAccessor; + private readonly IConfiguration _configuretion; + private readonly Volo.Abp.Domain.Repositories.IRepository _identityRoleRepository; public AccountAppService( IdentityUserManager userManager, IOptionsSnapshot jwtOptions, Microsoft.AspNetCore.Identity.SignInManager signInManager, - IHttpClientFactory httpClientFactory, ICurrentTenant currentTenant, - IHttpContextAccessor contextAccessor) + IHttpClientFactory httpClientFactory, + IConfiguration configuretion, + Volo.Abp.Domain.Repositories.IRepository identityRoleRepository) { _userManager = userManager; _jwtOptions = jwtOptions.Value; _signInManager = signInManager; _httpClientFactory = httpClientFactory; - _currentTenant = currentTenant; - _contextAccessor = contextAccessor; + _configuretion = configuretion; + _identityRoleRepository = identityRoleRepository; } @@ -62,28 +59,83 @@ namespace Lion.AbpPro.Users { throw new UserFriendlyException("用户名或者密码错误"); } - + var user = await _userManager.FindByNameAsync(input.Name); return await BuildResult(user); } - - public async Task StsLoginAsync(string accessToken) + /// + /// identityServer4第三方登录 + /// + /// + public async Task Id4LoginAsync(string accessToken) { // 通过access token 获取用户信息 Dictionary headers = new Dictionary { { "Authorization", $"Bearer {accessToken}" } }; - var response = - await _httpClientFactory.GetAsync(HttpClientNameConsts.Sts, - "connect/userinfo", headers); + var response = await _httpClientFactory.GetAsync(HttpClientNameConsts.Sts, "connect/userinfo", headers); var user = await _userManager.FindByNameAsync(response.name); if (!user.IsActive) { throw new UserFriendlyException("当前用户已锁定"); } + return await BuildResult(user); } + /// + /// github第三方登录 + /// + /// 授权码 + /// + public async Task GithubLoginAsync(string code) + { + var headers = new Dictionary { { "Accept", $"application/json" } }; + // 通过code获取access token + var accessTokenUrl = + $"login/oauth/access_token?client_id={_configuretion.GetValue("HttpClient:Github:ClientId")}&client_secret={_configuretion.GetValue("HttpClient:Github:ClientSecret")}&code={code}"; + var accessTokenResponse = await _httpClientFactory.GetAsync(HttpClientNameConsts.Github, accessTokenUrl, headers); + + // 获取github用户信息 + headers.Add("Authorization", $"token {accessTokenResponse.Access_token}"); + headers.Add("User-Agent", _configuretion.GetValue("HttpClient:GithubApi:ClientName")); + var userResponse = await _httpClientFactory.GetAsync(HttpClientNameConsts.GithubApi, "/user", headers); + + var user = await _userManager.FindByEmailAsync(userResponse.email); + if (user != null) return await BuildResult(user); + return await RegisterAsync(userResponse.name, userResponse.email); + } + + #region 私有方法 + + /// + /// 注册用户 + /// + /// + private async Task RegisterAsync(string userName, string email, string password = "1q2w3E*") + { + var result = new LoginOutput(); + var roles = await _identityRoleRepository.GetListAsync(e => e.IsDefault); + if (roles == null || roles.Count == 0) throw new UserFriendlyException("系统未配置默认角色"); + var userId = GuidGenerator.Create(); + + var user = new IdentityUser(userId, userName, email) + { + Name = userName + }; + + roles.ForEach(e => { user.AddRole(e.Id); }); + user.SetIsActive(true); + await _userManager.CreateAsync(user, password); + result.Token = GenerateJwt(user.Id, user.UserName, user.Name, user.Email, + user.TenantId.ToString(), roles.Select(e => e.Name).ToList()); + result.Id = user.Id; + result.UserName = userName; + result.Name = userName; + result.Roles = roles.Select(e => e.Name).ToList(); + return result; + } + private async Task BuildResult(IdentityUser user) { @@ -136,5 +188,7 @@ namespace Lion.AbpPro.Users var token = handler.CreateToken(tokenDescriptor); return handler.WriteToken(token); } + + #endregion } } \ No newline at end of file diff --git a/aspnet-core/services/src/Lion.AbpPro.HttpApi/Controllers/Systems/AccountController.cs b/aspnet-core/services/src/Lion.AbpPro.HttpApi/Controllers/Systems/AccountController.cs index 096f64d1..24d15fba 100644 --- a/aspnet-core/services/src/Lion.AbpPro.HttpApi/Controllers/Systems/AccountController.cs +++ b/aspnet-core/services/src/Lion.AbpPro.HttpApi/Controllers/Systems/AccountController.cs @@ -23,10 +23,17 @@ namespace Lion.AbpPro.Controllers.Systems } [SwaggerOperation(summary: "登录", Tags = new[] {"Account"})] - [HttpPost("/api/app/account/login/Sts")] - public Task StsLoginAsync(string accessToken) + [HttpPost("/api/app/account/login/id4")] + public Task Id4LoginAsync(string accessToken) { - return _accountAppService.StsLoginAsync(accessToken); + return _accountAppService.Id4LoginAsync(accessToken); + } + + [SwaggerOperation(summary: "登录", Tags = new[] {"Account"})] + [HttpPost("/api/app/account/login/github")] + public Task GithubLoginAsync(string code) + { + return _accountAppService.GithubLoginAsync(code); } } } \ No newline at end of file diff --git a/vben271/src/api/sys/user.ts b/vben271/src/api/sys/user.ts index d62afb25..34f2334f 100644 --- a/vben271/src/api/sys/user.ts +++ b/vben271/src/api/sys/user.ts @@ -36,13 +36,20 @@ export function login(input: LoginInput): Promise { * @param token * @returns */ -export function stsLogin(token: string): Promise { +export function id4(token: string): Promise { const _accountServiceProxy = new AccountServiceProxy(); - return _accountServiceProxy.sts(token); + return _accountServiceProxy.id4(token); } -export function stsLogout() { + +/** + * sts登录 + * @param token + * @returns + */ +export function github(code: string): Promise { + debugger; const _accountServiceProxy = new AccountServiceProxy(); - return _accountServiceProxy.logout(); + return _accountServiceProxy.github(code); } /** diff --git a/vben271/src/router/routes/mainOut.ts b/vben271/src/router/routes/mainOut.ts index bcd9661c..559656b8 100644 --- a/vben271/src/router/routes/mainOut.ts +++ b/vben271/src/router/routes/mainOut.ts @@ -26,6 +26,15 @@ export const mainOutRoutes: AppRouteModule[] = [ ignoreAuth: true, }, }, + { + path: '/githubSignIn', + name: 'GithubOidcSign', + component: () => import('/@/views/sys/login/GithubOidcSignIn.vue'), + meta: { + title: 'GithubOidcSign', + ignoreAuth: true, + }, + }, ]; export const mainOutRouteNames = mainOutRoutes.map((item) => item.name); diff --git a/vben271/src/services/ServiceProxies.ts b/vben271/src/services/ServiceProxies.ts index 9a79c523..d65062fe 100644 --- a/vben271/src/services/ServiceProxies.ts +++ b/vben271/src/services/ServiceProxies.ts @@ -2,7 +2,7 @@ /* eslint-disable */ //---------------------- // -// Generated using the NSwag toolchain v13.15.9.0 (NJsonSchema v10.6.8.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.15.5.0 (NJsonSchema v10.6.6.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org) // //---------------------- // ReSharper disable InconsistentNaming @@ -120,7 +120,7 @@ export class AbpApiDefinitionServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } } @@ -227,7 +227,7 @@ export class AbpApplicationConfigurationServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } } @@ -340,7 +340,7 @@ export class AccountServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -348,8 +348,8 @@ export class AccountServiceProxy extends ServiceProxyBase { * @param accessToken (optional) * @return Success */ - sts(accessToken: string | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/api/app/account/login/Sts?"; + id4(accessToken: string | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/api/app/account/login/id4?"; if (accessToken === null) throw new Error("The parameter 'accessToken' cannot be null."); else if (accessToken !== undefined) @@ -374,11 +374,11 @@ export class AccountServiceProxy extends ServiceProxyBase { throw _error; } }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processSts(_response)); + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processId4(_response)); }); } - protected processSts(response: AxiosResponse): Promise { + protected processId4(response: AxiosResponse): Promise { const status = response.status; let _headers: any = {}; if (response.headers && typeof response.headers === "object") { @@ -441,7 +441,108 @@ export class AccountServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); + } + + /** + * 登录 + * @param code (optional) + * @return Success + */ + github(code: string | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/api/app/account/login/github?"; + if (code === null) + throw new Error("The parameter 'code' cannot be null."); + else if (code !== undefined) + url_ += "code=" + encodeURIComponent("" + code) + "&"; + url_ = url_.replace(/[?&]$/, ""); + + let options_ = { + method: "POST", + url: url_, + headers: { + "Accept": "text/plain" + }, + cancelToken + }; + + return this.transformOptions(options_).then(transformedOptions_ => { + return this.instance.request(transformedOptions_); + }).catch((_error: any) => { + if (isAxiosError(_error) && _error.response) { + return _error.response; + } else { + throw _error; + } + }).then((_response: AxiosResponse) => { + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processGithub(_response)); + }); + } + + protected processGithub(response: AxiosResponse): Promise { + const status = response.status; + let _headers: any = {}; + if (response.headers && typeof response.headers === "object") { + for (let k in response.headers) { + if (response.headers.hasOwnProperty(k)) { + _headers[k] = response.headers[k]; + } + } + } + if (status === 200) { + const _responseText = response.data; + let result200: any = null; + let resultData200 = _responseText; + result200 = LoginOutput.fromJS(resultData200); + return Promise.resolve(result200); + + } else if (status === 403) { + const _responseText = response.data; + let result403: any = null; + let resultData403 = _responseText; + result403 = RemoteServiceErrorResponse.fromJS(resultData403); + return throwException("Forbidden", status, _responseText, _headers, result403); + + } else if (status === 401) { + const _responseText = response.data; + let result401: any = null; + let resultData401 = _responseText; + result401 = RemoteServiceErrorResponse.fromJS(resultData401); + return throwException("Unauthorized", status, _responseText, _headers, result401); + + } else if (status === 400) { + const _responseText = response.data; + let result400: any = null; + let resultData400 = _responseText; + result400 = RemoteServiceErrorResponse.fromJS(resultData400); + return throwException("Bad Request", status, _responseText, _headers, result400); + + } else if (status === 404) { + const _responseText = response.data; + let result404: any = null; + let resultData404 = _responseText; + result404 = RemoteServiceErrorResponse.fromJS(resultData404); + return throwException("Not Found", status, _responseText, _headers, result404); + + } else if (status === 501) { + const _responseText = response.data; + let result501: any = null; + let resultData501 = _responseText; + result501 = RemoteServiceErrorResponse.fromJS(resultData501); + return throwException("Server Error", status, _responseText, _headers, result501); + + } else if (status === 500) { + const _responseText = response.data; + let result500: any = null; + let resultData500 = _responseText; + result500 = RemoteServiceErrorResponse.fromJS(resultData500); + return throwException("Server Error", status, _responseText, _headers, result500); + + } else if (status !== 200 && status !== 204) { + const _responseText = response.data; + return throwException("An unexpected server error occurred.", status, _responseText, _headers); + } + return Promise.resolve(null); } } @@ -554,7 +655,7 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -657,7 +758,7 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -706,7 +807,7 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -754,7 +855,7 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -803,7 +904,7 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -851,7 +952,7 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -900,7 +1001,7 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -948,7 +1049,7 @@ export class ApiResourceServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } } @@ -1061,7 +1162,7 @@ export class ApiScopeServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -1110,7 +1211,7 @@ export class ApiScopeServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -1158,7 +1259,7 @@ export class ApiScopeServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -1207,7 +1308,7 @@ export class ApiScopeServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -1255,7 +1356,7 @@ export class ApiScopeServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -1304,7 +1405,7 @@ export class ApiScopeServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -1352,7 +1453,7 @@ export class ApiScopeServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -1455,7 +1556,7 @@ export class ApiScopeServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } } @@ -1568,7 +1669,7 @@ export class AuditLogsServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } } @@ -1681,7 +1782,7 @@ export class ClientServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -1730,7 +1831,7 @@ export class ClientServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -1778,7 +1879,7 @@ export class ClientServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -1827,7 +1928,7 @@ export class ClientServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -1875,7 +1976,7 @@ export class ClientServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -1924,7 +2025,7 @@ export class ClientServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -1972,7 +2073,7 @@ export class ClientServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -2021,7 +2122,7 @@ export class ClientServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -2069,7 +2170,7 @@ export class ClientServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -2118,7 +2219,7 @@ export class ClientServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -2166,7 +2267,7 @@ export class ClientServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -2215,7 +2316,7 @@ export class ClientServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -2263,7 +2364,7 @@ export class ClientServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -2312,7 +2413,7 @@ export class ClientServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -2360,7 +2461,7 @@ export class ClientServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -2409,7 +2510,7 @@ export class ClientServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -2457,7 +2558,7 @@ export class ClientServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -2506,7 +2607,7 @@ export class ClientServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -2554,7 +2655,7 @@ export class ClientServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -2603,7 +2704,7 @@ export class ClientServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -2651,7 +2752,7 @@ export class ClientServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -2700,7 +2801,7 @@ export class ClientServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -2748,7 +2849,7 @@ export class ClientServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } } @@ -2861,7 +2962,7 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -2962,7 +3063,7 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -3011,7 +3112,7 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -3059,7 +3160,7 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -3108,7 +3209,7 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -3156,7 +3257,7 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -3205,7 +3306,7 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -3253,7 +3354,7 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -3302,7 +3403,7 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -3350,7 +3451,7 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -3399,7 +3500,7 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -3447,7 +3548,7 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -3496,7 +3597,7 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -3544,7 +3645,7 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -3593,7 +3694,7 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -3641,7 +3742,7 @@ export class DataDictionaryServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } } @@ -3749,7 +3850,7 @@ export class FilesServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -3798,7 +3899,7 @@ export class FilesServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -3846,7 +3947,7 @@ export class FilesServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -3947,7 +4048,7 @@ export class FilesServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } } @@ -4002,13 +4103,13 @@ export class FileConfigurationServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status !== 200 && status !== 204) { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -4056,13 +4157,13 @@ export class FileConfigurationServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status !== 200 && status !== 204) { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } } @@ -4175,7 +4276,7 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -4278,7 +4379,7 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -4327,7 +4428,7 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -4375,7 +4476,7 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -4424,7 +4525,7 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -4472,7 +4573,7 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -4521,7 +4622,7 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -4569,7 +4670,7 @@ export class IdentityResourceServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } } @@ -4682,7 +4783,7 @@ export class EsLogServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } } @@ -4795,7 +4896,7 @@ export class NotificationServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -4896,7 +4997,7 @@ export class NotificationServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -4945,7 +5046,7 @@ export class NotificationServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -4993,7 +5094,7 @@ export class NotificationServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -5042,7 +5143,7 @@ export class NotificationServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -5090,7 +5191,7 @@ export class NotificationServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -5154,7 +5255,7 @@ export class NotificationServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -5202,7 +5303,7 @@ export class NotificationServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } } @@ -5260,13 +5361,13 @@ export class OutputCacheServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status !== 200 && status !== 204) { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } } @@ -5379,7 +5480,7 @@ export class PermissionsServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -5428,7 +5529,7 @@ export class PermissionsServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -5476,7 +5577,7 @@ export class PermissionsServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } } @@ -5584,7 +5685,7 @@ export class RolesServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -5685,7 +5786,7 @@ export class RolesServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -5786,7 +5887,7 @@ export class RolesServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -5887,7 +5988,7 @@ export class RolesServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -5936,7 +6037,7 @@ export class RolesServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -5984,7 +6085,7 @@ export class RolesServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } } @@ -6091,7 +6192,7 @@ export class SampleServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -6186,7 +6287,7 @@ export class SampleServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } } @@ -6301,7 +6402,7 @@ export class SettingsServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -6350,7 +6451,7 @@ export class SettingsServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -6398,7 +6499,7 @@ export class SettingsServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } } @@ -6511,7 +6612,7 @@ export class TenantsServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -6612,7 +6713,7 @@ export class TenantsServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -6713,7 +6814,7 @@ export class TenantsServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -6814,7 +6915,7 @@ export class TenantsServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -6863,7 +6964,7 @@ export class TenantsServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -6911,7 +7012,7 @@ export class TenantsServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -7013,7 +7114,7 @@ export class TenantsServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -7062,7 +7163,7 @@ export class TenantsServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -7110,7 +7211,7 @@ export class TenantsServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -7159,7 +7260,7 @@ export class TenantsServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -7207,7 +7308,7 @@ export class TenantsServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } } @@ -7320,7 +7421,7 @@ export class UsersServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -7373,7 +7474,7 @@ export class UsersServiceProxy extends ServiceProxyBase { const contentDisposition = response.headers ? response.headers["content-disposition"] : undefined; const fileNameMatch = contentDisposition ? /filename="?([^"]*?)"?(;|$)/g.exec(contentDisposition) : undefined; const fileName = fileNameMatch && fileNameMatch.length > 1 ? fileNameMatch[1] : undefined; - return Promise.resolve({ fileName: fileName, status: status, data: new Blob([response.data], { type: response.headers["content-type"] }), headers: _headers }); + return Promise.resolve({ fileName: fileName, status: status, data: new Blob([response.data]), headers: _headers }); } else if (status === 403) { const _responseText = response.data; let result403: any = null; @@ -7420,7 +7521,7 @@ export class UsersServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -7521,7 +7622,7 @@ export class UsersServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -7622,7 +7723,7 @@ export class UsersServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -7671,7 +7772,7 @@ export class UsersServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -7719,7 +7820,7 @@ export class UsersServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -7820,7 +7921,7 @@ export class UsersServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -7922,7 +8023,7 @@ export class UsersServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } /** @@ -7971,7 +8072,7 @@ export class UsersServiceProxy extends ServiceProxyBase { } if (status === 200) { const _responseText = response.data; - return Promise.resolve(null as any); + return Promise.resolve(null); } else if (status === 403) { const _responseText = response.data; @@ -8019,7 +8120,7 @@ export class UsersServiceProxy extends ServiceProxyBase { const _responseText = response.data; return throwException("An unexpected server error occurred.", status, _responseText, _headers); } - return Promise.resolve(null as any); + return Promise.resolve(null); } } @@ -9466,6 +9567,8 @@ export interface IClockDto { export class ControllerApiDescriptionModel implements IControllerApiDescriptionModel { controllerName!: string | undefined; controllerGroupName!: string | undefined; + isRemoteService!: boolean; + apiVersion!: string | undefined; type!: string | undefined; interfaces!: ControllerInterfaceApiDescriptionModel[] | undefined; actions!: { [key: string]: ActionApiDescriptionModel; } | undefined; @@ -9483,6 +9586,8 @@ export class ControllerApiDescriptionModel implements IControllerApiDescriptionM if (_data) { this.controllerName = _data["controllerName"]; this.controllerGroupName = _data["controllerGroupName"]; + this.isRemoteService = _data["isRemoteService"]; + this.apiVersion = _data["apiVersion"]; this.type = _data["type"]; if (Array.isArray(_data["interfaces"])) { this.interfaces = [] as any; @@ -9510,6 +9615,8 @@ export class ControllerApiDescriptionModel implements IControllerApiDescriptionM data = typeof data === 'object' ? data : {}; data["controllerName"] = this.controllerName; data["controllerGroupName"] = this.controllerGroupName; + data["isRemoteService"] = this.isRemoteService; + data["apiVersion"] = this.apiVersion; data["type"] = this.type; if (Array.isArray(this.interfaces)) { data["interfaces"] = []; @@ -9530,6 +9637,8 @@ export class ControllerApiDescriptionModel implements IControllerApiDescriptionM export interface IControllerApiDescriptionModel { controllerName: string | undefined; controllerGroupName: string | undefined; + isRemoteService: boolean; + apiVersion: string | undefined; type: string | undefined; interfaces: ControllerInterfaceApiDescriptionModel[] | undefined; actions: { [key: string]: ActionApiDescriptionModel; } | undefined; diff --git a/vben271/src/services/ServiceProxyBase.ts b/vben271/src/services/ServiceProxyBase.ts index bfa4960f..e57b6768 100644 --- a/vben271/src/services/ServiceProxyBase.ts +++ b/vben271/src/services/ServiceProxyBase.ts @@ -64,10 +64,8 @@ export class ServiceProxyBase { if (url == '/Tenants/find') { return true; } - if (url == '/api/app/account/login') { - return true; - } - if (url.startsWith('/api/app/account/login/Sts')) { + + if (url.startsWith('/api/app/account')) { return true; } diff --git a/vben271/src/store/modules/user.ts b/vben271/src/store/modules/user.ts index c1bfc442..d3cf7f1e 100644 --- a/vben271/src/store/modules/user.ts +++ b/vben271/src/store/modules/user.ts @@ -13,7 +13,7 @@ import { } from '/@/enums/cacheEnum'; import { getAuthCache, setAuthCache } from '/@/utils/auth'; import { GetUserInfoByUserIdModel, LoginParams } from '/@/api/sys/model/userModel'; -import { login, getAbpApplicationConfiguration, stsLogin } from '/@/api/sys/user'; +import { login, getAbpApplicationConfiguration, id4, github } from '/@/api/sys/user'; import { useI18n } from '/@/hooks/web/useI18n'; import { useMessage } from '/@/hooks/web/useMessage'; import { router } from '/@/router'; @@ -148,10 +148,8 @@ export const useUserStore = defineStore({ goHome && (await router.replace(PageEnum.BASE_HOME)); return null; } catch (error) { - //console.log(error); router.replace(PageEnum.BASE_LOGIN); return null; - //throw new Error(error); } }, async getAbpApplicationConfigurationAsync() { @@ -165,7 +163,7 @@ export const useUserStore = defineStore({ permissionStore.setPermCodeList(grantPolicy); }, - async stsLogin(token: string, id_token: string) { + async id4Login(token: string, id_token: string) { try { // 获取token中的租户信息 const decoded: any = jwt_decode(token); @@ -175,7 +173,7 @@ export const useUserStore = defineStore({ this.setTenant(decoded.tenantid); } - const data = await stsLogin(token); + const data = await id4(token); this.setToken(data.token as string); this.setUserInfo({ @@ -195,6 +193,54 @@ export const useUserStore = defineStore({ } }, + async githubLogin(code: string) { + try { + const data = await github(code); + this.setToken(data.token as string); + this.setTenant(''); + this.setUserInfo({ + userId: data.id as string, + username: data.userName as string, + realName: data.name as string, + roles: data.roles as [], + avatar: '', + isSts: false, + idToken: '', + }); + await this.getAbpApplicationConfigurationAsync(); + await router.replace(PageEnum.BASE_HOME); + } catch (error) { + this.setTenant(''); + router.replace(PageEnum.BASE_LOGIN); + } + }, + + // async githubLogin(code: string) { + // try { + // debugger; + // await githubLogin(code).then((res) => { + // console.log(res); + // }); + + // // this.setToken(data.token as string); + + // // this.setUserInfo({ + // // userId: decoded.sub as string, + // // username: data.userName as string, + // // realName: data.name as string, + // // roles: data.roles as [], + // // avatar: '', + // // isSts: true, + // // idToken: id_token, + // // }); + // // await this.getAbpApplicationConfigurationAsync(); + // // await router.replace(PageEnum.BASE_HOME); + // } catch (error) { + // console.log(error); + // //this.setTenant(''); + // router.replace(PageEnum.BASE_LOGIN); + // } + // }, /** * @description: logout */ diff --git a/vben271/src/views/sys/login/GithubOidcSignIn.vue b/vben271/src/views/sys/login/GithubOidcSignIn.vue new file mode 100644 index 00000000..6df5901e --- /dev/null +++ b/vben271/src/views/sys/login/GithubOidcSignIn.vue @@ -0,0 +1,46 @@ + + diff --git a/vben271/src/views/sys/login/LoginForm.vue b/vben271/src/views/sys/login/LoginForm.vue index 2c3e7c25..0b328203 100644 --- a/vben271/src/views/sys/login/LoginForm.vue +++ b/vben271/src/views/sys/login/LoginForm.vue @@ -43,7 +43,15 @@ {{ t('sys.login.otherSignIn') }}
- IdentityServer登录 + + + + +
@@ -57,6 +65,7 @@ AlipayCircleFilled, GoogleCircleFilled, TwitterCircleFilled, + LoginOutlined, } from '@ant-design/icons-vue'; import LoginFormTitle from './LoginFormTitle.vue'; diff --git a/vben271/src/views/sys/login/OidcSignIn.vue b/vben271/src/views/sys/login/OidcSignIn.vue index 07ee4281..a573bc18 100644 --- a/vben271/src/views/sys/login/OidcSignIn.vue +++ b/vben271/src/views/sys/login/OidcSignIn.vue @@ -27,7 +27,7 @@ const token = currentRoute.value.fullPath.split('=')[2].split('&')[0]; if (token) { - await userStore.stsLogin(token, id_token); + await userStore.id4Login(token, id_token); } } catch { message.error('登陆失败');