Skip to content

Commit 2c3b110

Browse files
acoumbacoumb
committed
PR updates
1 parent 05f7c75 commit 2c3b110

File tree

9 files changed

+33
-57
lines changed

9 files changed

+33
-57
lines changed

‎src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/js/configuration.controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
}
4444

4545
function getAccessToken(event) {
46-
if (event.data.type === "hubspot:oauth:success") {
46+
if (event.data.type === "dynamics:oauth:success") {
4747
umbracoCmsIntegrationsCrmDynamicsResource.getAccessToken(event.data.code).then(function (response) {
4848
if (response.startsWith("Error:")) {
4949

‎src/Umbraco.Cms.Integrations.Crm.Dynamics/DynamicsComposer.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ public void Compose(IUmbracoBuilder builder)
2929

3030
builder.AddNotificationHandler<UmbracoApplicationStartingNotification, UmbracoAppStartingHandler>();
3131

32-
builder.Services.AddTransient<UmbracoAuthorizationService>();
33-
builder.Services.AddTransient<AuthorizationService>();
34-
builder.Services.AddTransient<AuthorizationImplementationFactory>(f => useUmbracoAuthorization =>
32+
builder.Services.AddSingleton<UmbracoAuthorizationService>();
33+
builder.Services.AddSingleton<AuthorizationService>();
34+
builder.Services.AddSingleton<AuthorizationImplementationFactory>(f => useUmbracoAuthorization =>
3535
{
3636
return useUmbracoAuthorization switch
3737
{
@@ -47,15 +47,15 @@ public void Compose(IUmbracoBuilder builder)
4747
#else
4848
public void Compose(Composition composition)
4949
{
50-
composition.Register<UmbracoAuthorizationService>(Lifetime.Transient);
51-
composition.Register<AuthorizationService>(Lifetime.Transient);
50+
composition.Register<UmbracoAuthorizationService>(Lifetime.Singleton);
51+
composition.Register<AuthorizationService>(Lifetime.Singleton);
5252
composition.Register<AuthorizationImplementationFactory>(f => (useUmbracoAuthorization) =>
5353
{
5454
if (useUmbracoAuthorization)
5555
return f.GetInstance<UmbracoAuthorizationService>();
5656

5757
return f.GetInstance<AuthorizationService>();
58-
}, Lifetime.Transient);
58+
}, Lifetime.Singleton);
5959

6060
composition.Register<DynamicsService>(Lifetime.Singleton);
6161

‎src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/JavascriptResponse.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ protected JavascriptResponse(bool success, string data, string error)
3232
ScriptBuilder = new StringBuilder();
3333
ScriptBuilder.AppendLine("<script>");
3434
ScriptBuilder.AppendLine(success
35-
? "window.opener.postMessage({ type: 'hubspot:oauth:success', url: location.href, code: '" + data + "' }, '*');"
36-
: "window.opener.postMessage({ type: 'hubspot:oauth:error', url: location.href, response: '" + error + "' }, '*');");
35+
? "window.opener.postMessage({ type: 'dynamics:oauth:success', url: location.href, code: '" + data + "' }, '*');"
36+
: "window.opener.postMessage({ type: 'dynamics:oauth:error', url: location.href, response: '" + error + "' }, '*');");
3737
ScriptBuilder.AppendLine("window.close();");
3838
ScriptBuilder.AppendLine("</script>");
3939
}

‎src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/AuthorizationService.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,5 @@ public async Task<string> GetAccessTokenAsync(string code)
8383

8484
return "Error: " + errorDto.ErrorDescription;
8585
}
86-
87-
public string RefreshAccessToken()
88-
{
89-
throw new NotImplementedException();
90-
}
91-
92-
public Task<string> RefreshAccessTokenAsync()
93-
{
94-
throw new NotImplementedException();
95-
}
9686
}
9787
}

‎src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/IDynamicsAuthorizationService.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,5 @@ public interface IDynamicsAuthorizationService
99
string GetAccessToken(string code);
1010

1111
Task<string> GetAccessTokenAsync(string code);
12-
13-
string RefreshAccessToken();
14-
15-
Task<string> RefreshAccessTokenAsync();
1612
}
1713
}

‎src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/UmbracoAuthorizationService.cs

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ public class UmbracoAuthorizationService : BaseAuthorizationService, IDynamicsAu
2121

2222
public const string ClientId = "813c5a65-cfd6-48d6-8928-dffe02aaf61a";
2323

24-
public const string RedirectUri = OAuthProxyBaseUrl;
25-
2624
public const string Service = "Dynamics";
2725

2826
public const string OAuthProxyBaseUrl = "https://hubspot-forms-auth.umbraco.com/"; // for local testing: https://localhost:44364;
2927

30-
public const string OAuthProxyTokenEndpoint = "{0}oauth/v1/token";
28+
public const string OAuthProxyRedirectUrl = OAuthProxyBaseUrl + "oauth/dynamics/";
29+
30+
public const string OAuthProxyTokenUrl = OAuthProxyBaseUrl + "oauth/v1/token";
3131

3232
protected const string OAuthScopes = "{0}.default";
3333

@@ -49,7 +49,7 @@ public UmbracoAuthorizationService(DynamicsService dynamicsService, DynamicsConf
4949
public string GetAuthorizationUrl()
5050
{
5151
var scopes = string.Format(OAuthScopes, _settings.HostUrl);
52-
return string.Format(DynamicsAuthorizationUrl, ClientId, OAuthProxyBaseUrl, scopes);
52+
return string.Format(DynamicsAuthorizationUrl, ClientId, OAuthProxyRedirectUrl, scopes);
5353
}
5454

5555
public string GetAccessToken(string code) =>
@@ -61,14 +61,14 @@ public async Task<string> GetAccessTokenAsync(string code)
6161
{
6262
{ "grant_type", "authorization_code" },
6363
{ "client_id", ClientId },
64-
{ "redirect_uri", RedirectUri },
64+
{ "redirect_uri", OAuthProxyRedirectUrl },
6565
{ "code", code }
6666
};
6767

6868
var requestMessage = new HttpRequestMessage
6969
{
7070
Method = HttpMethod.Post,
71-
RequestUri = new Uri(string.Format(OAuthProxyTokenEndpoint, OAuthProxyBaseUrl)),
71+
RequestUri = new Uri(OAuthProxyTokenUrl),
7272
Content = new FormUrlEncodedContent(data)
7373
};
7474
requestMessage.Headers.Add("service_name", Service);
@@ -95,15 +95,5 @@ public async Task<string> GetAccessTokenAsync(string code)
9595

9696
return "Error: " + errorDto.ErrorDescription;
9797
}
98-
99-
public string RefreshAccessToken()
100-
{
101-
throw new NotImplementedException();
102-
}
103-
104-
public Task<string> RefreshAccessTokenAsync()
105-
{
106-
throw new NotImplementedException();
107-
}
10898
}
10999
}

‎src/Umbraco.Cms.Integrations.Crm.Hubspot/HubspotComposer.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ public void Compose(IUmbracoBuilder builder)
2727

2828
builder.Services.AddSingleton<ITokenService, TokenService>();
2929

30-
builder.Services.AddTransient<UmbracoAuthorizationService>();
31-
builder.Services.AddTransient<AuthorizationService>();
32-
builder.Services.AddTransient<AuthorizationImplementationFactory>(f => useUmbracoAuthorization =>
30+
builder.Services.AddSingleton<UmbracoAuthorizationService>();
31+
builder.Services.AddSingleton<AuthorizationService>();
32+
builder.Services.AddSingleton<AuthorizationImplementationFactory>(f => useUmbracoAuthorization =>
3333
{
3434
return useUmbracoAuthorization switch
3535
{
@@ -43,15 +43,15 @@ public void Compose(Composition composition)
4343
{
4444
composition.Register<ITokenService, TokenService>(Lifetime.Singleton);
4545

46-
composition.Register<UmbracoAuthorizationService>(Lifetime.Transient);
47-
composition.Register<AuthorizationService>(Lifetime.Transient);
46+
composition.Register<UmbracoAuthorizationService>(Lifetime.Singleton);
47+
composition.Register<AuthorizationService>(Lifetime.Singleton);
4848
composition.Register<AuthorizationImplementationFactory>(f => (useUmbracoAuthorization) =>
4949
{
5050
if (useUmbracoAuthorization)
5151
return f.GetInstance<UmbracoAuthorizationService>();
5252

5353
return f.GetInstance<AuthorizationService>();
54-
}, Lifetime.Transient);
54+
}, Lifetime.Singleton);
5555
}
5656
#endif
5757

‎src/Umbraco.Cms.Integrations.SEO.GoogleSearchConsole.UrlInspectionTool/GoogleComposer.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ public void Compose(IUmbracoBuilder builder)
3131

3232
builder.Services.AddSingleton<ITokenService, TokenService>();
3333

34-
builder.Services.AddTransient<UmbracoAuthorizationService>();
35-
builder.Services.AddTransient<AuthorizationService>();
36-
builder.Services.AddTransient<AuthorizationImplementationFactory>(f => useUmbracoAuthorization =>
34+
builder.Services.AddSingleton<UmbracoAuthorizationService>();
35+
builder.Services.AddSingleton<AuthorizationService>();
36+
builder.Services.AddSingleton<AuthorizationImplementationFactory>(f => useUmbracoAuthorization =>
3737
{
3838
return useUmbracoAuthorization switch
3939
{
@@ -49,15 +49,15 @@ public void Compose(Composition composition)
4949

5050
composition.Register<ITokenService, TokenService>(Lifetime.Singleton);
5151

52-
composition.Register<UmbracoAuthorizationService>(Lifetime.Transient);
53-
composition.Register<AuthorizationService>(Lifetime.Transient);
52+
composition.Register<UmbracoAuthorizationService>(Lifetime.Singleton);
53+
composition.Register<AuthorizationService>(Lifetime.Singleton);
5454
composition.Register<AuthorizationImplementationFactory>(f => (useUmbracoAuthorization) =>
5555
{
5656
if (useUmbracoAuthorization)
5757
return f.GetInstance<UmbracoAuthorizationService>();
5858

5959
return f.GetInstance<AuthorizationService>();
60-
}, Lifetime.Transient);
60+
}, Lifetime.Singleton);
6161
}
6262
#endif
6363

‎src/Umbraco.Cms.Integrations.SEO.Semrush/SemrushComposer.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ public void Compose(IUmbracoBuilder builder)
3333

3434
builder.Services.AddScoped<TokenBuilder>();
3535

36-
builder.Services.AddTransient<UmbracoAuthorizationService>();
37-
builder.Services.AddTransient<AuthorizationService>();
38-
builder.Services.AddTransient<AuthorizationImplementationFactory>(f => useUmbracoAuthorization =>
36+
builder.Services.AddSingleton<UmbracoAuthorizationService>();
37+
builder.Services.AddSingleton<AuthorizationService>();
38+
builder.Services.AddSingleton<AuthorizationImplementationFactory>(f => useUmbracoAuthorization =>
3939
{
4040
return useUmbracoAuthorization switch
4141
{
@@ -54,15 +54,15 @@ public void Compose(Composition composition)
5454

5555
composition.Register<TokenBuilder>(Lifetime.Request);
5656

57-
composition.Register<UmbracoAuthorizationService>(Lifetime.Transient);
58-
composition.Register<AuthorizationService>(Lifetime.Transient);
57+
composition.Register<UmbracoAuthorizationService>(Lifetime.Singleton);
58+
composition.Register<AuthorizationService>(Lifetime.Singleton);
5959
composition.Register<AuthorizationImplementationFactory>(f => (useUmbracoAuthorization) =>
6060
{
6161
if (useUmbracoAuthorization)
6262
return f.GetInstance<UmbracoAuthorizationService>();
6363

6464
return f.GetInstance<AuthorizationService>();
65-
}, Lifetime.Transient);
65+
}, Lifetime.Singleton);
6666
}
6767
#endif
6868
}

0 commit comments

Comments
 (0)