|
|
@ -157,6 +157,7 @@ func (ss *SQLStore) getOrCreateOrg(sess *DBSession, orgName string) (int64, erro |
|
|
|
if has { |
|
|
|
if has { |
|
|
|
return org.ID, nil |
|
|
|
return org.ID, nil |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
ss.log.Debug("auto assigned organization not found") |
|
|
|
|
|
|
|
|
|
|
|
if ss.Cfg.AutoAssignOrgId != 1 { |
|
|
|
if ss.Cfg.AutoAssignOrgId != 1 { |
|
|
|
ss.log.Error("Could not create user: organization ID does not exist", "orgID", |
|
|
|
ss.log.Error("Could not create user: organization ID does not exist", "orgID", |
|
|
@ -168,6 +169,11 @@ func (ss *SQLStore) getOrCreateOrg(sess *DBSession, orgName string) (int64, erro |
|
|
|
org.Name = mainOrgName |
|
|
|
org.Name = mainOrgName |
|
|
|
org.ID = int64(ss.Cfg.AutoAssignOrgId) |
|
|
|
org.ID = int64(ss.Cfg.AutoAssignOrgId) |
|
|
|
if err := sess.InsertId(&org, ss.Dialect); err != nil { |
|
|
|
if err := sess.InsertId(&org, ss.Dialect); err != nil { |
|
|
|
|
|
|
|
ss.log.Error("failed to insert organization with provided id", "org_id", org.ID, "err", err) |
|
|
|
|
|
|
|
// ignore failure if for some reason the organization exists
|
|
|
|
|
|
|
|
if ss.GetDialect().IsUniqueConstraintViolation(err) { |
|
|
|
|
|
|
|
return org.ID, nil |
|
|
|
|
|
|
|
} |
|
|
|
return 0, err |
|
|
|
return 0, err |
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
} else { |
|
|
|