mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-14 20:08:02 +00:00
8a5badddf6
* 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>
126 lines
4.1 KiB
Go
126 lines
4.1 KiB
Go
package model
|
|
|
|
import (
|
|
"encoding/json"
|
|
"time"
|
|
|
|
"github.com/caos/logging"
|
|
caos_errs "github.com/caos/zitadel/internal/errors"
|
|
"github.com/caos/zitadel/internal/eventstore/models"
|
|
"github.com/caos/zitadel/internal/usergrant/model"
|
|
es_model "github.com/caos/zitadel/internal/usergrant/repository/eventsourcing/model"
|
|
"github.com/lib/pq"
|
|
)
|
|
|
|
const (
|
|
UserGrantKeyID = "id"
|
|
UserGrantKeyUserID = "user_id"
|
|
UserGrantKeyProjectID = "project_id"
|
|
UserGrantKeyResourceOwner = "resource_owner"
|
|
UserGrantKeyState = "state"
|
|
UserGrantKeyOrgName = "org_name"
|
|
)
|
|
|
|
type UserGrantView struct {
|
|
ID string `json:"-" gorm:"column:id;primary_key"`
|
|
ResourceOwner string `json:"-" gorm:"resource_owner"`
|
|
UserID string `json:"userId" gorm:"user_id"`
|
|
ProjectID string `json:"projectId" gorm:"column:project_id"`
|
|
UserName string `json:"-" gorm:"column:user_name"`
|
|
FirstName string `json:"-" gorm:"column:first_name"`
|
|
LastName string `json:"-" gorm:"column:last_name"`
|
|
Email string `json:"-" gorm:"column:email"`
|
|
ProjectName string `json:"-" gorm:"column:project_name"`
|
|
OrgName string `json:"-" gorm:"column:org_name"`
|
|
OrgDomain string `json:"-" gorm:"column:org_domain"`
|
|
RoleKeys pq.StringArray `json:"roleKeys" gorm:"column:role_keys"`
|
|
|
|
CreationDate time.Time `json:"-" gorm:"column:creation_date"`
|
|
ChangeDate time.Time `json:"-" gorm:"column:change_date"`
|
|
State int32 `json:"-" gorm:"column:grant_state"`
|
|
|
|
Sequence uint64 `json:"-" gorm:"column:sequence"`
|
|
}
|
|
|
|
func UserGrantFromModel(grant *model.UserGrantView) *UserGrantView {
|
|
return &UserGrantView{
|
|
ID: grant.ID,
|
|
ResourceOwner: grant.ResourceOwner,
|
|
UserID: grant.UserID,
|
|
ProjectID: grant.ProjectID,
|
|
ChangeDate: grant.ChangeDate,
|
|
CreationDate: grant.CreationDate,
|
|
State: int32(grant.State),
|
|
UserName: grant.UserName,
|
|
FirstName: grant.FirstName,
|
|
LastName: grant.LastName,
|
|
Email: grant.Email,
|
|
ProjectName: grant.ProjectName,
|
|
OrgName: grant.OrgName,
|
|
OrgDomain: grant.OrgDomain,
|
|
RoleKeys: grant.RoleKeys,
|
|
Sequence: grant.Sequence,
|
|
}
|
|
}
|
|
|
|
func UserGrantToModel(grant *UserGrantView) *model.UserGrantView {
|
|
return &model.UserGrantView{
|
|
ID: grant.ID,
|
|
ResourceOwner: grant.ResourceOwner,
|
|
UserID: grant.UserID,
|
|
ProjectID: grant.ProjectID,
|
|
ChangeDate: grant.ChangeDate,
|
|
CreationDate: grant.CreationDate,
|
|
State: model.UserGrantState(grant.State),
|
|
UserName: grant.UserName,
|
|
FirstName: grant.FirstName,
|
|
LastName: grant.LastName,
|
|
Email: grant.Email,
|
|
ProjectName: grant.ProjectName,
|
|
OrgName: grant.OrgName,
|
|
OrgDomain: grant.OrgDomain,
|
|
RoleKeys: grant.RoleKeys,
|
|
Sequence: grant.Sequence,
|
|
}
|
|
}
|
|
|
|
func UserGrantsToModel(grants []*UserGrantView) []*model.UserGrantView {
|
|
result := make([]*model.UserGrantView, len(grants))
|
|
for i, g := range grants {
|
|
result[i] = UserGrantToModel(g)
|
|
}
|
|
return result
|
|
}
|
|
|
|
func (g *UserGrantView) AppendEvent(event *models.Event) (err error) {
|
|
g.ChangeDate = event.CreationDate
|
|
g.Sequence = event.Sequence
|
|
switch event.Type {
|
|
case es_model.UserGrantAdded:
|
|
g.State = int32(model.USERGRANTSTATE_ACTIVE)
|
|
g.CreationDate = event.CreationDate
|
|
g.setRootData(event)
|
|
err = g.setData(event)
|
|
case es_model.UserGrantChanged:
|
|
err = g.setData(event)
|
|
case es_model.UserGrantDeactivated:
|
|
g.State = int32(model.USERGRANTSTATE_INACTIVE)
|
|
case es_model.UserGrantReactivated:
|
|
g.State = int32(model.USERGRANTSTATE_ACTIVE)
|
|
}
|
|
return err
|
|
}
|
|
|
|
func (u *UserGrantView) setRootData(event *models.Event) {
|
|
u.ID = event.AggregateID
|
|
u.ResourceOwner = event.ResourceOwner
|
|
}
|
|
|
|
func (u *UserGrantView) setData(event *models.Event) error {
|
|
if err := json.Unmarshal(event.Data, u); err != nil {
|
|
logging.Log("EVEN-l9sw4").WithError(err).Error("could not unmarshal event data")
|
|
return caos_errs.ThrowInternal(nil, "MODEL-7xhke", "could not unmarshal data")
|
|
}
|
|
return nil
|
|
}
|