KEYCLOAK-12875: User w/o pswd can't set pswd in new acct console.

dayantrivani · Feb 10, 2020 · b236cae · b236cae
1 parent 41bf0b7
commit b236cae
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/themes/src/main/resources/theme/keycloak-preview/account/messages/messages_en.properties b/themes/src/main/resources/theme/keycloak-preview/account/messages/messages_en.properties
@@ -74,6 +74,8 @@ webauthn-display-name=Security Key
 webauthn-help-text=Use your security key to log in.
 webauthn-passwordless-display-name=Security Key
 webauthn-passwordless-help-text=Use your security key for passwordless log in.
+basic-authentication=Basic Authentication
+basic-auth-help-text=Sign in with username and password.
 
 # Applications page
 applicationsPageTitle=Applications

diff --git a/...ces/theme/keycloak-preview/account/resources/app/content/signingin-page/SigningInPage.tsx b/...ces/theme/keycloak-preview/account/resources/app/content/signingin-page/SigningInPage.tsx
@@ -57,7 +57,7 @@ interface UserCredential {
     id: string;
     type: string;
     userLabel: string;
-    createdDate: number;
+    createdDate?: number;
     strCreatedDate?: string;
 }
 
@@ -69,7 +69,6 @@ interface CredentialContainer {
     helptext?: string;
     createAction?: string;
     updateAction?: string;
-    iconCssClass: string;
     removeable: boolean;
     userCredentials: UserCredential[];
 }
@@ -185,7 +184,7 @@ class SigningInPage extends React.Component<SigningInPageProps, SigningInPageSta
         const type: string = credContainer.type;
         const displayName: string = credContainer.displayName;
 
-        if (userCredentials.length === 0) {
+        if (!userCredentials || userCredentials.length === 0) {
             const localizedDisplayName = Msg.localize(displayName);
             return (
                 <DataListItem key='no-credentials-list-item' aria-labelledby='no-credentials-list-item'>
@@ -203,7 +202,7 @@ class SigningInPage extends React.Component<SigningInPageProps, SigningInPageSta
 
         userCredentials.forEach(credential => {
             if (!credential.userLabel) credential.userLabel = Msg.localize(credential.type);
-            credential.strCreatedDate = moment(credential.createdDate).format('LLL');
+            if (credential.hasOwnProperty('createdDate') && credential.createdDate! > 0) credential.strCreatedDate = moment(credential.createdDate).format('LLL');
         });
 
         let updateAIA: AIACommand;
@@ -216,12 +215,7 @@ class SigningInPage extends React.Component<SigningInPageProps, SigningInPageSta
                 userCredentials.map(credential => (
                     <DataListItem id={`${SigningInPage.credElementId(type, credential.id, 'row')}`} key={'credential-list-item-' + credential.id} aria-labelledby={'credential-list-item-' + credential.userLabel}>
                         <DataListItemRow key={'userCredentialRow-' + credential.id}>
-                            <DataListItemCells
-                                dataListCells={[
-                                    <DataListCell id={`${SigningInPage.credElementId(type, credential.id, 'label')}`} key={'userLabel-' + credential.id}>{credential.userLabel}</DataListCell>,
-                                    <DataListCell id={`${SigningInPage.credElementId(type, credential.id, 'created-at')}`} key={'created-' + credential.id}><strong><Msg msgKey='credentialCreatedAt'/>: </strong>{credential.strCreatedDate}</DataListCell>,
-                                    <DataListCell key={'spacer-' + credential.id}/>
-                                ]}/>
+                            <DataListItemCells dataListCells={this.credentialRowCells(credential, type)}/>
 
                             <CredentialAction credential={credential}
                                               removeable={removeable}
@@ -234,8 +228,19 @@ class SigningInPage extends React.Component<SigningInPageProps, SigningInPageSta
             </React.Fragment>)
     }
 
+    private credentialRowCells(credential: UserCredential, type: string): React.ReactNode[] {
+        const credRowCells: React.ReactNode[] = [];
+        credRowCells.push(<DataListCell id={`${SigningInPage.credElementId(type, credential.id, 'label')}`} key={'userLabel-' + credential.id}>{credential.userLabel}</DataListCell>);
+        if (credential.strCreatedDate) {
+            credRowCells.push(<DataListCell id={`${SigningInPage.credElementId(type, credential.id, 'created-at')}`} key={'created-' + credential.id}><strong><Msg msgKey='credentialCreatedAt'/>: </strong>{credential.strCreatedDate}</DataListCell>);
+            credRowCells.push(<DataListCell key={'spacer-' + credential.id}/>);
+        }
+
+        return credRowCells;
+    }
+
     private renderCredTypeTitle(credContainer: CredentialContainer): React.ReactNode {
-        if (credContainer.category === 'password') return;
+        if (!credContainer.hasOwnProperty('helptext') && !credContainer.hasOwnProperty('createAction')) return;
 
         let setupAction: AIACommand;
         if (credContainer.createAction) {