@c8y/login 1023.22.7 → 1023.22.14

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@c8y/login",
-  "version": "1023.22.7",
+  "version": "1023.22.14",
   "description": "This package is used to scaffold a login application for Cumulocity IoT.",
   "dependencies": {
-    "@c8y/style": "1023.22.7",
-    "@c8y/ngx-components": "1023.22.7",
-    "@c8y/client": "1023.22.7",
-    "@c8y/bootstrap": "1023.22.7",
+    "@c8y/style": "1023.22.14",
+    "@c8y/ngx-components": "1023.22.14",
+    "@c8y/client": "1023.22.14",
+    "@c8y/bootstrap": "1023.22.14",
     "@angular/cdk": "^20.2.14",
     "monaco-editor": "~0.53.0",
     "ngx-bootstrap": "20.0.2",
     "rxjs": "7.8.2"
   },
   "devDependencies": {
-    "@c8y/options": "1023.22.7",
-    "@c8y/devkit": "1023.22.7"
+    "@c8y/options": "1023.22.14",
+    "@c8y/devkit": "1023.22.14"
   },
   "peerDependencies": {
     "@angular/common": ">=20 <21"

package/src/app/login/login.service.ts

@@ -37,7 +37,6 @@ import {
 export class LoginService extends SimplifiedAuthService {
   rememberMe = false;
   loginMode: ITenantLoginOption;
-  managementLoginMode: ITenantLoginOption;
   oauthOptions: ITenantLoginOption;
   isFirstLogin = true;
   automaticLoginInProgress$ = new BehaviorSubject(true);
@@ -435,7 +434,7 @@ export class LoginService extends SimplifiedAuthService {
    * @param credentials The credentials for that login
    */
   async switchLoginMode(credentials?: ICredentials) {
-    const isPasswordGrantLogin = await this.isPasswordGrantLogin(credentials);
+    const isPasswordGrantLogin = await this.isPasswordGrantLogin();
     if (isPasswordGrantLogin && credentials) {
       const res = await this.generateOauthToken(credentials);
       if (!res?.ok) {
@@ -454,7 +453,7 @@ export class LoginService extends SimplifiedAuthService {
   }
 
   async generateOauthToken(credentials?: ICredentials): Promise<IFetchResponse | null> {
-    if ((await this.isPasswordGrantLogin(credentials)) && credentials) {
+    if ((await this.isPasswordGrantLogin()) && credentials) {
       const params = new URLSearchParams({
         grant_type: 'PASSWORD',
         username: credentials.user,
@@ -473,17 +472,8 @@ export class LoginService extends SimplifiedAuthService {
     return null;
   }
 
-  async isPasswordGrantLogin(credentials?: ICredentials) {
-    let loginMode = this.loginMode;
-
-    if (this.isSupportUser(credentials)) {
-      if (!this.managementLoginMode) {
-        this.managementLoginMode = await this.getManagementLoginMode();
-      }
-      loginMode = this.managementLoginMode;
-    }
-
-    return this.tenantUiService.isOauthInternal(loginMode);
+  async isPasswordGrantLogin() {
+    return this.tenantUiService.isOauthInternal(this.loginMode);
   }
 
   /**
@@ -688,11 +678,6 @@ export class LoginService extends SimplifiedAuthService {
       : `tenant/oauth`;
   }
 
-  private async getManagementLoginMode() {
-    const managementLoginOptions = (await this.tenantLoginOptionsService.listForManagement()).data;
-    return this.tenantUiService.getPreferredLoginOption(managementLoginOptions);
-  }
-
   private async handleErrorStatusCodes(response: IFetchResponse): Promise<IFetchResponse> {
     if (response.status >= 400) {
       const data = await response.json();

package/src/app/login/sms-challenge/sms-challenge.component.html

@@ -1,47 +1,62 @@
-<form #twoFactorForm="ngForm" class="loginForm" (ngSubmit)="verifyTFACode()" novalidate>
-  <div class="legend form-block center" translate>Two-factor authentication</div>
+<form
+  class="loginForm"
+  #twoFactorForm="ngForm"
+  (ngSubmit)="verifyTFACode()"
+  novalidate
+>
+  <div
+    class="legend form-block center"
+    translate
+  >
+    Two-factor authentication
+  </div>
 
   <c8y-form-group>
     <label translate>Verification code</label>
     <input
-      [(ngModel)]="model.smsToken"
-      #sms_token="ngModel"
-      type="text"
+      class="form-control"
+      placeholder="{{ 'e.g.' | translate }} 624327"
       name="sms_token"
+      type="text"
       autofocus
+      required
+      [(ngModel)]="model.smsToken"
+      #sms_token="ngModel"
       autocapitalize="off"
       autocorrect="off"
-      class="form-control"
-      placeholder="{{ 'e.g.' | translate }} 624327"
-      required
     />
-    <p *ngIf="!twoFactorForm.form.valid || isLoading" class="help-block" translate>
-      Insert the code received via SMS.
-    </p>
+    @if (!twoFactorForm.form.valid || isLoading) {
+      <p
+        class="help-block"
+        translate
+      >
+        Insert the code received via SMS.
+      </p>
+    }
   </c8y-form-group>
 
   <button
+    class="btn btn-primary btn-lg btn-block form-group"
     title="{{ 'Verify' | translate }}"
     [disabled]="!twoFactorForm.form.valid || isLoading"
-    class="btn btn-primary btn-lg btn-block form-group"
   >
     {{ 'Verify' | translate }}
   </button>
 
   <div class="d-flex m-t-8 j-c-center">
     <button
-      type="button"
+      class="btn btn-link btn-sm"
       title="{{ 'Send new code' | translate }}"
+      type="button"
       [ngClass]="{ disabled: isLoading }"
-      class="btn btn-link btn-sm"
       (click)="resendTFASms()"
     >
       {{ 'Send new code' | translate }}
     </button>
     <button
-      type="button"
-      title="{{ 'Log in' | translate }}"
       class="btn btn-link btn-sm"
+      title="{{ 'Log in' | translate }}"
+      type="button"
       (click)="onCancel.emit()"
     >
       {{ 'Log in' | translate }}

package/src/app/login/sms-challenge/sms-challenge.component.ts

@@ -11,7 +11,7 @@ import {
 } from '@c8y/ngx-components';
 import { gettext } from '@c8y/ngx-components/gettext';
 import { FormsModule } from '@angular/forms';
-import { NgIf, NgClass } from '@angular/common';
+import { NgClass } from '@angular/common';
 import { LoginEvent, LoginViews } from '../login.model';
 
 @Component({
@@ -24,7 +24,6 @@ import { LoginEvent, LoginViews } from '../login.model';
     C8yTranslateDirective,
     FormGroupComponent,
     RequiredInputPlaceholderDirective,
-    NgIf,
     NgClass,
     C8yTranslatePipe
   ]
@@ -75,7 +74,7 @@ export class SmsChallengeComponent {
   }
 
   private async usesOAuthInternal() {
-    return this.loginService.isPasswordGrantLogin(this.credentials);
+    return this.loginService.isPasswordGrantLogin();
   }
 
   private async verifyCodeWithOauth() {