Browse Source

UI: fixed client form blocking save, mobile app enabled by default

pull/11231/head
rusikv 2 years ago
parent
commit
78b43c04aa
  1. 4
      ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts
  2. 1
      ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/client.component.ts
  3. 2
      ui-ngx/src/app/modules/home/pages/admin/oauth2/mobile-apps/mobile-app.component.ts

4
ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts

@ -15,8 +15,8 @@
///
import { inject, NgModule } from '@angular/core';
import { ActivatedRouteSnapshot, ResolveFn, RouterStateSnapshot } from '@angular/router';
import { RouterModule, Routes } from '@angular/router';
import { ActivatedRouteSnapshot, Resolve, ResolveFn, RouterModule, RouterStateSnapshot, Routes } from '@angular/router';
import { MailServerComponent } from '@modules/home/pages/admin/mail-server.component';
import { ConfirmOnExitGuard } from '@core/guards/confirm-on-exit.guard';
import { Authority } from '@shared/models/authority.enum';

1
ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/client.component.ts

@ -278,6 +278,7 @@ export class ClientComponent extends EntityComponent<OAuth2Client, PageLink, OAu
mapperConfig.addControl('basic', this.formBasicGroup(predefinedValue?.basic));
} else if (predefinedValue?.basic) {
mapperConfig.get('basic').patchValue(predefinedValue.basic, {emitEvent: false});
mapperConfig.get('basic.tenantNameStrategy').updateValueAndValidity({onlySelf: true});
}
if (type === MapperType.GITHUB) {
mapperConfig.get('basic.emailAttributeKey').disable();

2
ui-ngx/src/app/modules/home/pages/admin/oauth2/mobile-apps/mobile-app.component.ts

@ -57,7 +57,7 @@ export class MobileAppComponent extends EntityComponent<MobileAppInfo> {
pkgName: [entity?.pkgName ? entity.pkgName : '', [Validators.required]],
appSecret: [entity?.appSecret ? entity.appSecret : btoa(randomAlphanumeric(64)),
[Validators.required, this.base64Format]],
oauth2Enabled: isDefinedAndNotNull(entity?.oauth2Enabled) ? entity.oauth2Enabled : false,
oauth2Enabled: isDefinedAndNotNull(entity?.oauth2Enabled) ? entity.oauth2Enabled : true,
oauth2ClientInfos: entity?.oauth2ClientInfos ? entity.oauth2ClientInfos.map(info => info.id.id) : []
});
}

Loading…
Cancel
Save