Skip to content

Commit a113857

Browse files
committed
current scrope added for the db connection, is this the best method thought?
1 parent 6391352 commit a113857

File tree

2 files changed

+6
-20
lines changed

2 files changed

+6
-20
lines changed

src/Our.Umbraco.AuthU/Data/UmbracoDbOAuthClientStore.cs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
using Our.Umbraco.AuthU.Interfaces;
22
using Our.Umbraco.AuthU.Models;
3-
using Umbraco.Core.Scoping;
3+
using Umbraco.Core.Composing;
44

55
namespace Our.Umbraco.AuthU.Data
66
{
77
public class UmbracoDbOAuthClientStore : IOAuthClientStore
88
{
9-
private readonly IScopeProvider _scopeProvider;
10-
11-
public UmbracoDbOAuthClientStore(IScopeProvider scopeProvider)
12-
{
13-
_scopeProvider = scopeProvider;
14-
}
15-
169
public OAuthClient FindClient(string clientId)
1710
{
18-
using (var scope = _scopeProvider.CreateScope(autoComplete: true))
11+
using (var scope = Current.ScopeProvider.CreateScope(autoComplete: true))
1912
{
2013
return scope.Database.SingleOrDefault<OAuthClient>("SELECT * FROM [OAuthClient] WHERE [ClientId] = @0", clientId);
2114
}

src/Our.Umbraco.AuthU/Data/UmbracoDbOAuthRefreshTokenStore.cs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Our.Umbraco.AuthU.Interfaces;
22
using Our.Umbraco.AuthU.Models;
3-
using Umbraco.Core.Scoping;
3+
using Umbraco.Core.Composing;
44

55
namespace Our.Umbraco.AuthU.Data
66
{
@@ -9,16 +9,9 @@ public class UmbracoDbOAuthRefreshTokenStore : IOAuthRefreshTokenStore
99
internal const string CurrentVersion = "1.0.1";
1010
internal const string SubProductName = "AuthU_UmbracoDbOAuthRefreshTokenStore";
1111

12-
private readonly IScopeProvider _scopeProvider;
13-
14-
public UmbracoDbOAuthRefreshTokenStore(IScopeProvider scopeProvider)
15-
{
16-
_scopeProvider = scopeProvider;
17-
}
18-
1912
public void AddRefreshToken(OAuthRefreshToken token)
2013
{
21-
using (var scope = _scopeProvider.CreateScope(autoComplete: true))
14+
using (var scope = Current.ScopeProvider.CreateScope(autoComplete: true))
2215
{
2316
scope.Database.Execute("DELETE FROM [OAuthRefreshToken] WHERE [Subject] = @0 AND [UserType] = @1 AND [Realm] = @2 AND [ClientId] = @3 AND [DeviceId] = @4",
2417
token.Subject,
@@ -33,15 +26,15 @@ public void AddRefreshToken(OAuthRefreshToken token)
3326

3427
public void RemoveRefreshToken(string refreshTokenId)
3528
{
36-
using (var scope = _scopeProvider.CreateScope(autoComplete: true))
29+
using (var scope = Current.ScopeProvider.CreateScope(autoComplete: true))
3730
{
3831
scope.Database.Execute("DELETE FROM [OAuthRefreshToken] WHERE [Key] = @0", refreshTokenId);
3932
}
4033
}
4134

4235
public OAuthRefreshToken FindRefreshToken(string refreshTokenId)
4336
{
44-
using (var scope = _scopeProvider.CreateScope(autoComplete: true))
37+
using (var scope = Current.ScopeProvider.CreateScope(autoComplete: true))
4538
{
4639
return scope.Database.SingleOrDefault<OAuthRefreshToken>("SELECT * FROM [OAuthRefreshToken] WHERE [Key] = @0", refreshTokenId);
4740
}

0 commit comments

Comments
 (0)