Skip to content

Commit

Permalink
Merge pull request #758 from gisaia/fix/iam_api
Browse files Browse the repository at this point in the history
Fix IAM API
  • Loading branch information
MohamedHamouGisaia authored Apr 2, 2024
2 parents 0702d39 + 63981c1 commit 3962ebf
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"ajv-keywords": "5.1.0",
"angular-oauth2-oidc": "~14.0.1",
"angular-oauth2-oidc-jwks": "~14.0.1",
"arlas-iam-api": "25.0.0-beta.2",
"arlas-iam-api": "25.0.0-beta.6",
"arlas-permissions-api": "25.0.0-beta.2",
"arlas-persistence-api": "25.0.0-beta.2",
"arlas-tagger-api": "25.0.0-beta.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export class PermissionsCreatorComponent implements OnInit, OnDestroy {
// logout ?
}
const currentOrg = currentUser.organisations.find(o => o.name === orgName);
if (!!currentOrg && currentOrg.is_owner) {
if (!!currentOrg && currentOrg.isOwner) {
return true;
}
return false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ export class UserInfosComponent implements OnInit {
if (!!authSettings) {
if (authSettings.auth_mode === 'iam') {
const userInfos = this.arlasIamService.user;
if (userInfos.first_name && userInfos.last_name) {
this.name = userInfos.first_name + ' ' + userInfos.last_name;
if (userInfos.firstName && userInfos.lastName) {
this.name = userInfos.firstName + ' ' + userInfos.lastName;
}
this.email = userInfos.email;
this.organisations = userInfos.organisations.map(o => o.display_name);
this.organisations = userInfos.organisations.map(o => o.displayName);
this.avatar = '';
} else {
this.authentService.loadUserInfo().subscribe(user => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ export class ArlasIamService extends ArlasAuthentificationService {
}

public change(oldPassword: string, newPassword: string): Observable<UserData> {
return from(this.arlasIamApi.updateUser({ old_password: oldPassword, new_password: newPassword }, this.user.id, this.options));
return from(this.arlasIamApi.updateUser({ oldPassword: oldPassword, newPassword: newPassword }, this.user.id, this.options));
}

public createPermission(oid: string, permissionDef: PermissionDef): Observable<PermissionData> {
Expand Down

0 comments on commit 3962ebf

Please sign in to comment.