mirror of
https://github.com/zitadel/zitadel.git
synced 2025-11-15 04:33:37 +00:00
feat: Login, OP Support and Auth Queries (#177)
* fix: change oidc config * fix: change oidc config secret * begin models * begin repo * fix: implement grpc app funcs * fix: add application requests * fix: converter * fix: converter * fix: converter and generate clientid * fix: tests * feat: project grant aggregate * feat: project grant * fix: project grant check if role existing * fix: project grant requests * fix: project grant fixes * fix: project grant member model * fix: project grant member aggregate * fix: project grant member eventstore * fix: project grant member requests * feat: user model * begin repo * repo models and more * feat: user command side * lots of functions * user command side * profile requests * commit before rebase on user * save * local config with gopass and more * begin new auth command (user centric) * Update internal/user/model/user.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/address.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/address.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/email.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/email.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/email.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/mfa.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/mfa.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/password.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/password.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/password.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/phone.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/phone.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/phone.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/user.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/user.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/user.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/usergrant/repository/eventsourcing/model/user_grant.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/usergrant/repository/eventsourcing/model/user_grant.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/usergrant/repository/eventsourcing/user_grant.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/user_test.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/eventstore_mock_test.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * changes from mr review * save files into basedir * changes from mr review * changes from mr review * move to auth request * Update internal/usergrant/repository/eventsourcing/cache.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/usergrant/repository/eventsourcing/cache.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * changes requested on mr * fix generate codes * fix return if no events * password code * email verification step * more steps * lot of mfa * begin tests * more next steps * auth api * auth api (user) * auth api (user) * auth api (user) * differ requests * merge * tests * fix compilation error * mock for id generator * Update internal/user/repository/eventsourcing/model/password.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/user/repository/eventsourcing/model/user.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * requests of mr * check email * begin separation of command and query * otp * change packages * some cleanup and fixes * tests for auth request / next steps * add VerificationLifetimes to config and make it run * tests * fix code challenge validation * cleanup * fix merge * begin view * repackaging tests and configs * fix startup config for auth * add migration * add PromptSelectAccount * fix copy / paste * remove user_agent files * fixes * fix sequences in user_session * token commands * token queries and signout * fix * fix set password test * add token handler and table * handle session init * add session state * add user view test cases * change VerifyMyMfaOTP * some fixes * fix user repo in auth api * cleanup * add user session view test * fix merge * begin oidc * user agent and more * config * keys * key command and query * add login statics * key handler * start login * login handlers * lot of fixes * merge oidc * add missing exports * add missing exports * fix some bugs * authrequestid in htmls * getrequest * update auth request * fix userid check * add username to authrequest * fix user session and auth request handling * fix UserSessionsByAgentID * fix auth request tests * fix user session on UserPasswordChanged and MfaOtpRemoved * fix MfaTypesSetupPossible * handle mfa * fill username * auth request query checks new events * fix userSessionByIDs * fix tokens * fix userSessionByIDs test * add user selection * init code * user code creation date * add init user step * add verification failed types * add verification failures * verify init code * user init code handle * user init code handle * fix userSessionByIDs * update logging * user agent cookie * browserinfo from request * add DeleteAuthRequest * add static login files to binary * add login statik to build * move generate to separate file and remove statik.go files * remove static dirs from startup.yaml * generate into separate namespaces * merge master * auth request code * auth request type mapping * fix keys * improve tokens * improve register and basic styling * fix ailerons font * improve password reset * add audience to token * all oidc apps as audience * fix test nextStep * fix email texts * remove "not set" * lot of style changes * improve copy to clipboard * fix footer * add cookie handler * remove placeholders * fix compilation after merge * fix auth config * remove comments * typo * use new secrets store * change default pws to match default policy * fixes * add todo * enable login * fix db name * Auth queries (#179) * my usersession * org structure/ auth handlers * working user grant spooler * auth internal user grants * search my project orgs * remove permissions file * my zitadel permissions * my zitadel permissions * remove unused code * authz * app searches in view * token verification * fix user grant load * fix tests * fix tests * read configs * remove unused const * remove todos * env variables * app_name * working authz * search projects * global resourceowner * Update internal/api/auth/permissions.go Co-authored-by: Livio Amstutz <livio.a@gmail.com> * Update internal/api/auth/permissions.go Co-authored-by: Livio Amstutz <livio.a@gmail.com> * model2 rename * at least it works * check token expiry * search my user grants * remove token table from authz Co-authored-by: Livio Amstutz <livio.a@gmail.com> * fix test * fix ports and enable console Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com> Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com> Co-authored-by: Silvan <silvan.reusser@gmail.com>
This commit is contained in:
@@ -2,6 +2,7 @@ package eventsourcing
|
||||
|
||||
import (
|
||||
"context"
|
||||
"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
@@ -428,7 +429,7 @@ func TestOrgEventstore_OrgMemberByIDs(t *testing.T) {
|
||||
{
|
||||
name: "new events found and added success",
|
||||
fields: fields{Eventstore: newTestEventstore(t).expectFilterEvents([]*es_models.Event{
|
||||
{Sequence: 6, Data: []byte("{\"userId\": \"banana\", \"roles\": [\"bananaa\"]}"), Type: org_model.OrgMemberChanged},
|
||||
{Sequence: 6, Data: []byte("{\"userId\": \"banana\", \"roles\": [\"bananaa\"]}"), Type: model.OrgMemberChanged},
|
||||
}, nil)},
|
||||
args: args{
|
||||
ctx: auth.NewMockContext("user", "org"),
|
||||
@@ -442,8 +443,8 @@ func TestOrgEventstore_OrgMemberByIDs(t *testing.T) {
|
||||
{
|
||||
name: "not member of org error",
|
||||
fields: fields{Eventstore: newTestEventstore(t).expectFilterEvents([]*es_models.Event{
|
||||
{Sequence: 6, Data: []byte("{\"userId\": \"banana\", \"roles\": [\"bananaa\"]}"), Type: org_model.OrgMemberAdded},
|
||||
{Sequence: 7, Data: []byte("{\"userId\": \"apple\"}"), Type: org_model.OrgMemberRemoved},
|
||||
{Sequence: 6, Data: []byte("{\"userId\": \"banana\", \"roles\": [\"bananaa\"]}"), Type: model.OrgMemberAdded},
|
||||
{Sequence: 7, Data: []byte("{\"userId\": \"apple\"}"), Type: model.OrgMemberRemoved},
|
||||
}, nil)},
|
||||
args: args{
|
||||
ctx: auth.NewMockContext("user", "org"),
|
||||
@@ -511,7 +512,7 @@ func TestOrgEventstore_AddOrgMember(t *testing.T) {
|
||||
expectFilterEvents([]*es_models.Event{
|
||||
{
|
||||
AggregateID: "hodor-org",
|
||||
Type: org_model.OrgAdded,
|
||||
Type: model.OrgAdded,
|
||||
Sequence: 4,
|
||||
Data: []byte("{}"),
|
||||
},
|
||||
@@ -541,7 +542,7 @@ func TestOrgEventstore_AddOrgMember(t *testing.T) {
|
||||
expectFilterEvents([]*es_models.Event{
|
||||
{
|
||||
AggregateID: "hodor-org",
|
||||
Type: org_model.OrgAdded,
|
||||
Type: model.OrgAdded,
|
||||
Sequence: 4,
|
||||
Data: []byte("{}"),
|
||||
},
|
||||
@@ -570,7 +571,7 @@ func TestOrgEventstore_AddOrgMember(t *testing.T) {
|
||||
expectAggregateCreator().
|
||||
expectFilterEvents([]*es_models.Event{
|
||||
{
|
||||
Type: org_model.OrgMemberAdded,
|
||||
Type: model.OrgMemberAdded,
|
||||
Data: []byte(`{"userId": "hodor", "roles": ["master"]}`),
|
||||
Sequence: 6,
|
||||
},
|
||||
@@ -600,12 +601,12 @@ func TestOrgEventstore_AddOrgMember(t *testing.T) {
|
||||
expectPushEvents(10, nil).
|
||||
expectFilterEvents([]*es_models.Event{
|
||||
{
|
||||
Type: org_model.OrgMemberAdded,
|
||||
Type: model.OrgMemberAdded,
|
||||
Data: []byte(`{"userId": "hodor", "roles": ["master"]}`),
|
||||
Sequence: 6,
|
||||
},
|
||||
{
|
||||
Type: org_model.OrgMemberRemoved,
|
||||
Type: model.OrgMemberRemoved,
|
||||
Data: []byte(`{"userId": "hodor"}`),
|
||||
Sequence: 10,
|
||||
},
|
||||
@@ -708,13 +709,13 @@ func TestOrgEventstore_ChangeOrgMember(t *testing.T) {
|
||||
expectFilterEvents([]*es_models.Event{
|
||||
{
|
||||
AggregateID: "hodor-org",
|
||||
Type: org_model.OrgAdded,
|
||||
Type: model.OrgAdded,
|
||||
Sequence: 4,
|
||||
Data: []byte("{}"),
|
||||
},
|
||||
{
|
||||
AggregateID: "hodor-org",
|
||||
Type: org_model.OrgMemberAdded,
|
||||
Type: model.OrgMemberAdded,
|
||||
Data: []byte(`{"userId": "brudi", "roles": ["master of desaster"]}`),
|
||||
Sequence: 6,
|
||||
},
|
||||
@@ -740,13 +741,13 @@ func TestOrgEventstore_ChangeOrgMember(t *testing.T) {
|
||||
expectFilterEvents([]*es_models.Event{
|
||||
{
|
||||
AggregateID: "hodor-org",
|
||||
Type: org_model.OrgAdded,
|
||||
Type: model.OrgAdded,
|
||||
Sequence: 4,
|
||||
Data: []byte("{}"),
|
||||
},
|
||||
{
|
||||
AggregateID: "hodor-org",
|
||||
Type: org_model.OrgMemberAdded,
|
||||
Type: model.OrgMemberAdded,
|
||||
Data: []byte(`{"userId": "hodor", "roles": ["master"]}`),
|
||||
Sequence: 6,
|
||||
},
|
||||
@@ -772,13 +773,13 @@ func TestOrgEventstore_ChangeOrgMember(t *testing.T) {
|
||||
expectFilterEvents([]*es_models.Event{
|
||||
{
|
||||
AggregateID: "hodor-org",
|
||||
Type: org_model.OrgAdded,
|
||||
Type: model.OrgAdded,
|
||||
Sequence: 4,
|
||||
Data: []byte("{}"),
|
||||
},
|
||||
{
|
||||
AggregateID: "hodor-org",
|
||||
Type: org_model.OrgMemberAdded,
|
||||
Type: model.OrgMemberAdded,
|
||||
Data: []byte(`{"userId": "hodor", "roles": ["master"]}`),
|
||||
Sequence: 6,
|
||||
},
|
||||
@@ -805,13 +806,13 @@ func TestOrgEventstore_ChangeOrgMember(t *testing.T) {
|
||||
expectFilterEvents([]*es_models.Event{
|
||||
{
|
||||
AggregateID: "hodor-org",
|
||||
Type: org_model.OrgAdded,
|
||||
Type: model.OrgAdded,
|
||||
Sequence: 4,
|
||||
Data: []byte("{}"),
|
||||
},
|
||||
{
|
||||
AggregateID: "hodor-org",
|
||||
Type: org_model.OrgMemberAdded,
|
||||
Type: model.OrgMemberAdded,
|
||||
Data: []byte(`{"userId": "hodor", "roles": ["master"]}`),
|
||||
Sequence: 6,
|
||||
},
|
||||
@@ -890,13 +891,13 @@ func TestOrgEventstore_RemoveOrgMember(t *testing.T) {
|
||||
expectFilterEvents([]*es_models.Event{
|
||||
{
|
||||
AggregateID: "hodor-org",
|
||||
Type: org_model.OrgAdded,
|
||||
Type: model.OrgAdded,
|
||||
Sequence: 4,
|
||||
Data: []byte("{}"),
|
||||
},
|
||||
{
|
||||
AggregateID: "hodor-org",
|
||||
Type: org_model.OrgMemberAdded,
|
||||
Type: model.OrgMemberAdded,
|
||||
Data: []byte(`{"userId": "brudi", "roles": ["master of desaster"]}`),
|
||||
Sequence: 6,
|
||||
},
|
||||
@@ -921,13 +922,13 @@ func TestOrgEventstore_RemoveOrgMember(t *testing.T) {
|
||||
expectFilterEvents([]*es_models.Event{
|
||||
{
|
||||
AggregateID: "hodor-org",
|
||||
Type: org_model.OrgAdded,
|
||||
Type: model.OrgAdded,
|
||||
Sequence: 4,
|
||||
Data: []byte("{}"),
|
||||
},
|
||||
{
|
||||
AggregateID: "hodor-org",
|
||||
Type: org_model.OrgMemberAdded,
|
||||
Type: model.OrgMemberAdded,
|
||||
Data: []byte(`{"userId": "hodor", "roles": ["master"]}`),
|
||||
Sequence: 6,
|
||||
},
|
||||
@@ -952,13 +953,13 @@ func TestOrgEventstore_RemoveOrgMember(t *testing.T) {
|
||||
expectFilterEvents([]*es_models.Event{
|
||||
{
|
||||
AggregateID: "hodor-org",
|
||||
Type: org_model.OrgAdded,
|
||||
Type: model.OrgAdded,
|
||||
Sequence: 4,
|
||||
Data: []byte("{}"),
|
||||
},
|
||||
{
|
||||
AggregateID: "hodor-org",
|
||||
Type: org_model.OrgMemberAdded,
|
||||
Type: model.OrgMemberAdded,
|
||||
Data: []byte(`{"userId": "hodor", "roles": ["master"]}`),
|
||||
Sequence: 6,
|
||||
},
|
||||
@@ -996,7 +997,7 @@ func TestOrgEventstore_RemoveOrgMember(t *testing.T) {
|
||||
func orgCreatedEvent() *es_models.Event {
|
||||
return &es_models.Event{
|
||||
AggregateID: "hodor-org",
|
||||
AggregateType: org_model.OrgAggregate,
|
||||
AggregateType: model.OrgAggregate,
|
||||
AggregateVersion: "v1",
|
||||
CreationDate: time.Now().Add(-1 * time.Minute),
|
||||
Data: []byte(`{"name": "hodor-org", "domain":"hodor.org"}`),
|
||||
@@ -1005,14 +1006,14 @@ func orgCreatedEvent() *es_models.Event {
|
||||
ID: "sdlfö4t23kj",
|
||||
ResourceOwner: "hodor-org",
|
||||
Sequence: 32,
|
||||
Type: org_model.OrgAdded,
|
||||
Type: model.OrgAdded,
|
||||
}
|
||||
}
|
||||
|
||||
func orgInactiveEvent() *es_models.Event {
|
||||
return &es_models.Event{
|
||||
AggregateID: "hodor-org",
|
||||
AggregateType: org_model.OrgAggregate,
|
||||
AggregateType: model.OrgAggregate,
|
||||
AggregateVersion: "v1",
|
||||
CreationDate: time.Now().Add(-1 * time.Minute),
|
||||
Data: nil,
|
||||
@@ -1021,6 +1022,6 @@ func orgInactiveEvent() *es_models.Event {
|
||||
ID: "sdlfö4t23kj",
|
||||
ResourceOwner: "hodor-org",
|
||||
Sequence: 52,
|
||||
Type: org_model.OrgDeactivated,
|
||||
Type: model.OrgDeactivated,
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user