Chore: Add user service method SetUsingOrg and GetSignedInUserWithCacheCtx (#53343)

* Chore: Add user service method SetUsingOrg * Chore: Add user service method GetSignedInUserWithCacheCtx * Use method GetSignedInUserWithCacheCtx from user service * Fix lint after rebase * Fix lint * Fix lint error * roll back some changes * Roll back changes in api and middleware * Add xorm tags to SignedInUser ID fields
2022-08-11 13:28:55 +02:00
parent ca72cd570e
commit a14621fff6
191 changed files with 1108 additions and 1049 deletions
@@ -95,7 +95,7 @@ func (p *Provider) pluginContext(ctx context.Context, pluginID string, user *use
 	}

 	return backend.PluginContext{
-		OrgID:    user.OrgId,
+		OrgID:    user.OrgID,
 		PluginID: plugin.ID,
 		User:     adapters.BackendUserFromSignedInUser(user),
 		AppInstanceSettings: &backend.AppInstanceSettings{
@@ -111,14 +111,14 @@ func (p *Provider) getCachedPluginSettings(ctx context.Context, pluginID string,

 	if cached, found := p.cacheService.Get(cacheKey); found {
 		ps := cached.(*pluginsettings.DTO)
-		if ps.OrgID == user.OrgId {
+		if ps.OrgID == user.OrgID {
 			return ps, nil
 		}
 	}

 	ps, err := p.pluginSettingsService.GetPluginSettingByPluginID(ctx, &pluginsettings.GetByPluginIDArgs{
 		PluginID: pluginID,
-		OrgID:    user.OrgId,
+		OrgID:    user.OrgID,
 	})
 	if err != nil {
 		return nil, err