feat: Associate role with appkeys #1198
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JigarJoshi
force-pushed
the
jmj/add_role_to_apps
branch
from
03ce7a9
to
699b32d
Compare
JigarJoshi
force-pushed
the
jmj/add_role_to_apps
branch
2 times, most recently
from
9512f3e
to
ee9fd3d
Compare
JigarJoshi
force-pushed
the
jmj/add_role_to_apps
branch
2 times, most recently
from
b834c8c
to
8118b35
Compare
efirs
previously approved these changes
May 25, 2023
JigarJoshi
force-pushed
the
jmj/add_role_to_apps
branch
from
d500e21
to
f45639c
Compare
JigarJoshi
commented
Jun 2, 2023
server/config/options.go
Outdated
| @@ -101,6 +101,13 @@ type AuthConfig struct { | |||
| EnableErrorLog bool `mapstructure:"enable_error_log" yaml:"enable_error_log" json:"enable_error_log"` | |||
| } | |||
|
|
|||
| type ApiKeysConfig struct { | |||
There was a problem hiding this comment.
not related to this change but manual merge has moved it around.
JigarJoshi
commented
Jun 2, 2023
| // role names. | ||
| readOnlyRoleName = "ro" | ||
| editorRoleName = "e" | ||
| ownerRoleName = "o" |
There was a problem hiding this comment.
moved it to auth package to avoid circular dependencies.
JigarJoshi
commented
Jun 2, 2023
| @@ -450,6 +447,19 @@ func authorize(ctx context.Context) (err error) { | |||
| return nil | |||
| } | |||
|
|
|||
| /* | |||
| func isAuthorizedProject(reqMetadata *request.Metadata, accessToken *types.AccessToken) bool { | |||
There was a problem hiding this comment.
keeping it here to enable back the project mismatch authz.
JigarJoshi
commented
Jun 2, 2023
| @@ -115,8 +122,15 @@ type GetUserResp struct { | |||
| AppMetaData *UserAppData `json:"app_metadata" db:"app_metadata"` | |||
| } | |||
|
|
|||
| // returns currentSub, creationTime, error. | |||
| func _createAppKey(ctx context.Context, clientId string, clientSecret string, g *gotrue, keyName string, keyDescription string, project string, keyType string) (string, int64, error) { | |||
| type keyInfo struct { | |||
There was a problem hiding this comment.
internal type to avoid long number of args.
JigarJoshi
commented
Jun 2, 2023
Comment on lines
+181
to
+187
| func _getEmail(clientId string, appKeyType string, g *gotrue) string { | ||
| suffix := g.AuthConfig.Gotrue.UsernameSuffix | ||
| if appKeyType == AppKeyTypeApiKey { | ||
| suffix = g.AuthConfig.ApiKeys.EmailSuffix | ||
| } | ||
| return fmt.Sprintf("%s%s", clientId, suffix) | ||
| } |
There was a problem hiding this comment.
manual merge moved this method around.
JigarJoshi
commented
Jun 2, 2023
test/v1/server/auth_test.go
Outdated
| @@ -193,48 +193,127 @@ func TestGoTrueAuthProvider(t *testing.T) { | |||
| Boolean() | |||
| require.True(t, deletedResponse.Raw()) | |||
| } | |||
| func TestApiKeyCrud(t *testing.T) { | |||
There was a problem hiding this comment.
manual merge moved it around.
JigarJoshi
force-pushed
the
jmj/add_role_to_apps
branch
3 times, most recently
from
bae077c
to
f1f3f4f
Compare
feat: Associate role with appkeys fix: Do not allow higher role app key created fix: Fixed test to follow project level authz fix: rebase fix: rebase fix: rebase fix: Fix the merge fix: User cannot invite user with higher role
JigarJoshi
force-pushed
the
jmj/add_role_to_apps
branch
from
f1f3f4f
to
21c2f5a
Compare
efirs
approved these changes
Jun 8, 2023
|
🎉 This PR is included in version 1.0.0-beta.117 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe your changes
Note: This should not be merged prior to updating interfaces (cloud console, CLI) that accepts the role for app key creation.
How best to test these changes
Added test.
Issue ticket number and link