@@ -748,18 +748,25 @@ export class Account {
748748 }
749749 static AddAccount ( tuser : TokenUser , client : any ) {
750750 try {
751- let acc = Auth . getUser ( tuser . _id , "oidc" ) ;
752- if ( ! acc ) {
753- let role = client . defaultrole ;
754- const keys : string [ ] = Object . keys ( client . rolemappings ) ;
755- for ( let i = 0 ; i < keys . length ; i ++ ) {
756- if ( tuser . HasRoleName ( keys [ i ] ) ) role = client . rolemappings [ keys [ i ] ] ;
757- }
758- ( tuser as any ) . role = role ;
759- Auth . AddUser ( tuser , tuser . _id , "oidc" )
760- return tuser as any ;
751+ let role = client . defaultrole ;
752+ const keys : string [ ] = Object . keys ( client . rolemappings ) ;
753+ for ( let i = 0 ; i < keys . length ; i ++ ) {
754+ if ( tuser . HasRoleName ( keys [ i ] ) ) role = client . rolemappings [ keys [ i ] ] ;
761755 }
762- return acc ;
756+ ( tuser as any ) . role = role ;
757+ Auth . AddUser ( tuser , tuser . _id , "oidc" )
758+ return new Account ( tuser . _id , TokenUser . From ( tuser ) ) ;
759+ // let acc = Auth.getUser(tuser._id, "oidc");
760+ // if (!acc) {
761+ // let role = client.defaultrole;
762+ // const keys: string[] = Object.keys(client.rolemappings);
763+ // for (let i = 0; i < keys.length; i++) {
764+ // if (tuser.HasRoleName(keys[i])) role = client.rolemappings[keys[i]];
765+ // }
766+ // (tuser as any).role = role;
767+ // Auth.AddUser(tuser, tuser._id, "oidc")
768+ // }
769+ // return new Account(tuser._id, TokenUser.From(tuser));
763770 } catch ( error ) {
764771 console . error ( error ) ;
765772 }
0 commit comments