Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix iamapikey bug #280

Merged
merged 4 commits into from
Jan 23, 2020
Merged

Fix iamapikey bug #280

merged 4 commits into from
Jan 23, 2020

Conversation

bmpotter
Copy link
Member

  • Fixed the logging of rejections
  • Fixed listing all of a resource type from another org
  • Added separate way to query icp/ocp exchange org

@bmpotter bmpotter requested a review from sf2ne January 23, 2020 20:16
Copy link
Collaborator

@sf2ne sf2ne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks good. I had a couple comments, but they are really minor and can be ignored in the interest of time.

userRow <- fetchUser(orgId, userInfo)
userAction <- {
logger.debug(s"userRow: $userRow")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we actually leave this log in? Is it ok because it's a debug log?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you are worried about the pw, it is bcrypted

@@ -486,7 +490,7 @@ object IbmCloudAuth {
//logger.error(s"IAM authentication succeeded, but no matching exchange org with a cloud account id was found for ${authInfo.org}")
DBIO.failed(OrgNotFound(authInfo.org))
} else if (authInfo.keyType == "iamtoken" && userInfo.accountId == "") {
//todo: this is the case with tokens from the edge mgmt ui (because we don't get the accountId when we validate an iamtoken). The ui already verified the org and is using the right one,
//todx: this is the case with tokens from the edge mgmt ui (because we don't get the accountId when we validate an iamtoken). The ui already verified the org and is using the right one,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor typo

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, ya, i actually did that on purpose, because that code is commented out. I'm going to get rid of that block of commented out code in the next PR. (I was just really unsure of that change.)

@bmpotter bmpotter merged commit 65daabc into open-horizon:master Jan 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants