Skip to content

Commit 3b7b01f

Browse files
author
Calin Lupas
authored
Merge pull request #23 from DevExcelerate/feature/updates
Feature/updates
2 parents 728f54b + b75eec9 commit 3b7b01f

14 files changed

Lines changed: 640 additions & 285 deletions

‎src/DevExcelerateApi/Core/Extensions/ServiceExtensions.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ internal static IServiceCollection AddAppServices(this IServiceCollection servic
9494
services.AddSingleton<IGitHubHelper, GitHubHelper>();
9595
services.AddSingleton<IDevExIssuesEventProcessorService, DevExIssuesEventProcessorService>();
9696
services.AddSingleton<WebhookEventProcessor, DevExWebhookEventProcessorService>();
97-
97+
services.AddSingleton<IRepositoryService, RepositoryService>();
98+
services.AddSingleton<IIssueService, IssueService>();
99+
98100
return services;
99101
}
100102

‎src/DevExcelerateApi/Core/Options/GitHubOptions.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ public class GitHubOptions
5252
[Required]
5353
public required bool IssueAutoApprove { get; set; }
5454

55+
/// <summary>
56+
/// The custom property name for the repository rulesets.
57+
/// </summary>
58+
[Required]
59+
public required string RepoRulesetsCustomPropertyName { get; set; }
60+
5561
/// <summary>
5662
/// Gets or sets the local path to the RSA private key used for the signing credentials.
5763
/// </summary>

‎src/DevExcelerateApi/Helpers/GitHubClientFactory.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ private async Task<string> GenerateAppJwtTokenAsync()
115115
var tokenDescriptor = new SecurityTokenDescriptor
116116
{
117117
Issuer = _gitHubOptions.AppId,
118-
Expires = now.AddMinutes(10).UtcDateTime,
118+
Expires = now.AddMinutes(5).UtcDateTime,
119119
IssuedAt = now.UtcDateTime,
120120
SigningCredentials = credentials
121121
};

‎src/DevExcelerateApi/Resources/Services.DevExIssuesEventProcessorService.fr.resx‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -117,33 +117,12 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="ERROR_REPO_CREATION" xml:space="preserve">
121-
<value>Une erreur s'est produite lors de la création du dépôt.</value>
122-
</data>
123-
<data name="ERROR_REPO_EXISTS" xml:space="preserve">
124-
<value>Le nom du dépôt existe déjà au sein de l'organisation.</value>
125-
</data>
126-
<data name="ERROR_REPO_RULESET_DOES_NOT_EXISTS" xml:space="preserve">
127-
<value>Le set de règles '{0}' n'existe pas.</value>
128-
</data>
129-
<data name="ERROR_REPO_TEAM_DOES_NOT_EXISTS" xml:space="preserve">
130-
<value>L'équipe ou le membre '{0}' n'existe pas.</value>
131-
</data>
132120
<data name="ISSUE_APPROVED" xml:space="preserve">
133121
<value>Nous avons approuvé votre demande et elle est en cours de traitement.</value>
134122
</data>
135-
<data name="ISSUE_COMPLETED" xml:space="preserve">
136-
<value>Votre demande a été complétée et les ressources ont été créées en conséquence. Merci !</value>
137-
</data>
138-
<data name="ISSUE_FAILED" xml:space="preserve">
139-
<value>Votre demande n'a pas passé la validation. Veuillez consulter les détails ci-dessous. Vous pouvez la réapprouver après avoir corrigé les problèmes de validation.</value>
140-
</data>
141123
<data name="ISSUE_REJECTED" xml:space="preserve">
142124
<value>Nous avons rejeté votre demande. Le problème peut être rouvert avec une raison valable pour approbation.</value>
143125
</data>
144-
<data name="ISSUE_VALIDATED" xml:space="preserve">
145-
<value>Votre demande a été validée et le dépôt sera créé sous peu.</value>
146-
</data>
147126
<data name="THANK_YOU_MESSAGE" xml:space="preserve">
148127
<value>Merci d'avoir soumis votre ticket. Votre demande est en cours de traitement.</value>
149128
</data>

‎src/DevExcelerateApi/Resources/Services.DevExIssuesEventProcessorService.resx‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -117,33 +117,12 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="ERROR_REPO_CREATION" xml:space="preserve">
121-
<value>An error occurred while creating the repository.</value>
122-
</data>
123-
<data name="ERROR_REPO_EXISTS" xml:space="preserve">
124-
<value>The repository name already exists within the organization.</value>
125-
</data>
126-
<data name="ERROR_REPO_RULESET_DOES_NOT_EXISTS" xml:space="preserve">
127-
<value>The '{0}' ruleset does not exist. </value>
128-
</data>
129-
<data name="ERROR_REPO_TEAM_DOES_NOT_EXISTS" xml:space="preserve">
130-
<value>The '{0}' team or member does not exist.</value>
131-
</data>
132120
<data name="ISSUE_APPROVED" xml:space="preserve">
133121
<value>Your request has been approved and is currently being processed.</value>
134122
</data>
135-
<data name="ISSUE_COMPLETED" xml:space="preserve">
136-
<value>Your request has been completed, and the resources have been created accordingly. Thank you!</value>
137-
</data>
138-
<data name="ISSUE_FAILED" xml:space="preserve">
139-
<value>Your request did not pass validation. Please see the details below. You can reapprove it after fixing the validation issues.</value>
140-
</data>
141123
<data name="ISSUE_REJECTED" xml:space="preserve">
142124
<value>We have rejected your request. The issue can be reopened with a valid reason for approval.</value>
143125
</data>
144-
<data name="ISSUE_VALIDATED" xml:space="preserve">
145-
<value>Your request has been validated, and the repository will be created shortly.</value>
146-
</data>
147126
<data name="THANK_YOU_MESSAGE" xml:space="preserve">
148127
<value>Thank you for submitting your ticket. Your request is currently being processed.</value>
149128
</data>

‎src/DevExcelerateApi/Resources/Services.RepositoryService.fr.resx‎

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="ERROR_REPO_CREATION" xml:space="preserve">
121+
<value>Une erreur s'est produite lors de la création du dépôt.</value>
122+
</data>
123+
<data name="ERROR_REPO_EXISTS" xml:space="preserve">
124+
<value>Le nom du dépôt existe déjà au sein de l'organisation.</value>
125+
</data>
126+
<data name="ERROR_REPO_RULESET_DOES_NOT_EXISTS" xml:space="preserve">
127+
<value>Le set de règles '{0}' n'existe pas.</value>
128+
</data>
129+
<data name="ERROR_REPO_TEAM_DOES_NOT_EXISTS" xml:space="preserve">
130+
<value>L'équipe ou le membre '{0}' n'existe pas.</value>
131+
</data>
132+
<data name="ISSUE_COMPLETED" xml:space="preserve">
133+
<value>Votre demande a été complétée et les ressources ont été créées en conséquence. Merci !</value>
134+
</data>
135+
<data name="ISSUE_FAILED" xml:space="preserve">
136+
<value>Votre demande n'a pas passé la validation. Veuillez consulter les détails ci-dessous. Vous pouvez la réapprouver après avoir corrigé les problèmes de validation.</value>
137+
</data>
138+
<data name="ISSUE_VALIDATED" xml:space="preserve">
139+
<value>Votre demande a été validée et le dépôt sera créé sous peu.</value>
140+
</data>
141+
</root>

‎src/DevExcelerateApi/Resources/Services.RepositoryService.resx‎

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="ERROR_REPO_CREATION" xml:space="preserve">
121+
<value>An error occurred while creating the repository.</value>
122+
</data>
123+
<data name="ERROR_REPO_EXISTS" xml:space="preserve">
124+
<value>The repository name already exists within the organization.</value>
125+
</data>
126+
<data name="ERROR_REPO_RULESET_DOES_NOT_EXISTS" xml:space="preserve">
127+
<value>The '{0}' ruleset does not exist. </value>
128+
</data>
129+
<data name="ERROR_REPO_TEAM_DOES_NOT_EXISTS" xml:space="preserve">
130+
<value>The '{0}' team or member does not exist.</value>
131+
</data>
132+
<data name="ISSUE_COMPLETED" xml:space="preserve">
133+
<value>Your request has been completed, and the resources have been created accordingly. Thank you!</value>
134+
</data>
135+
<data name="ISSUE_FAILED" xml:space="preserve">
136+
<value>Your request did not pass validation. Please see the details below. You can reapprove it after fixing the validation issues.</value>
137+
</data>
138+
<data name="ISSUE_VALIDATED" xml:space="preserve">
139+
<value>Your request has been validated, and the repository will be created shortly.</value>
140+
</data>
141+
</root>

0 commit comments

Comments
 (0)