Gleipnir/nidus-sync
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Stop adding users to organizations based on Arcgis Account

Browse source
This commit is contained in:
Eli Ribble 2026-03-20 06:04:30 +00:00
parent a87904f2ff
commit 29e66327ee
No known key found for this signature in database
1 changed files with 3 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

35
platform/arcgis.go
View file

@ -264,22 +264,9 @@ func updateArcgisUserData(ctx context.Context, user *models.User, oauth *models.
log.Error().Err(err).Msg("Failed to update oauth token portal data")
return
}
txn.Commit(ctx)
// At this point we have the arcgis ID. If the ID matches an existing ID, join it with the users organization
orgs, err := models.Organizations.Query(
sm.Where(
psql.Quote("arcgis_account_id").EQ(psql.Arg(ag_user.OrgID)),
),
).All(ctx, db.PGInstance.BobDB)
if err != nil {
log.Error().Err(err).Str("arcgis_id", ag_user.OrgID).Msg("Failed to search for organization with arcgis id")
return
}
var org *models.Organization
switch len(orgs) {
case 0:
org = user.R.Organization
err = org.Update(ctx, db.PGInstance.BobDB, &models.OrganizationSetter{
org := user.R.Organization
if org.ArcgisAccountID.IsNull() {
err = org.Update(ctx, txn, &models.OrganizationSetter{
ArcgisAccountID: omitnull.From(ag_user.OrgID),
})
if err != nil {
@ -287,24 +274,8 @@ func updateArcgisUserData(ctx context.Context, user *models.User, oauth *models.
return
}
log.Info().Int32("org_id", org.ID).Str("arcgis_id", ag_user.OrgID).Msg("Updated org arcgis ID")
case 1:
org = orgs[0]
user.Update(ctx, db.PGInstance.BobDB, &models.UserSetter{
OrganizationID: omit.From(org.ID),
})
log.Info().Int32("org_id", org.ID).Int32("user_id", user.ID).Msg("Moved user into organization")
default:
log.Warn().Int("orgs", len(orgs)).Msg("Got too many orgs, programmer error.")
return
}
txn, err = db.PGInstance.BobDB.BeginTx(ctx, nil)
if err != nil {
log.Error().Err(err).Msg("Create transaction")
return
}
defer txn.Rollback(ctx)
fssync, err := fieldseeker.NewFieldSeekerFromAG(ctx, *client)
if err != nil {
log.Error().Err(err).Msg("Failed to create fieldseeker")