Skip to content

Commit 1a39c73

Browse files
masudul-tikwebmasudul-tikweb
authored
Merge pull request #15 from microting/master
Master changes
2 parents afa5e4d + 95d113f commit 1a39c73

File tree

5 files changed

+121
-42
lines changed

5 files changed

+121
-42
lines changed

‎eFormAPI/eFormAPI.Web/Services/UserService.cs‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,22 @@ public async Task<EformUser> GetByIdAsync(int id)
5353

5454
public async Task<EformUser> GetByUsernameAsync(string username)
5555
{
56-
return await dbContext.Users.FirstOrDefaultAsync(x => x.UserName == username);
56+
var user = await dbContext.Users.FirstOrDefaultAsync(x => x.UserName == username);
57+
if (user == null)
58+
{
59+
user = await dbContext.Users.FirstOrDefaultAsync(x => x.Email == username);
60+
if (user != null)
61+
{
62+
user.UserName = username;
63+
await userManager.UpdateAsync(user);
64+
return user;
65+
}
66+
}
67+
68+
return user;
5769
}
5870

71+
5972
public int UserId
6073
{
6174
get

‎eFormAPI/eFormAPI.Web/Startup.cs‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ namespace eFormAPI.Web;
6666
using Services.Mailing.EmailService;
6767
using Services.Mailing.EmailTags;
6868
using Microsoft.Extensions.Hosting;
69-
using Microsoft.OpenApi.Models;
69+
using Microsoft.OpenApi;
7070
using System.IO;
7171
using Microsoft.Extensions.PlatformAbstractions;
7272
using Microting.EformAngularFrontendBase.Infrastructure.Data;
@@ -294,23 +294,9 @@ public void ConfigureServices(IServiceCollection services)
294294
Scheme = "Bearer"
295295
});
296296

297-
c.AddSecurityRequirement(new OpenApiSecurityRequirement()
297+
c.AddSecurityRequirement(document => new OpenApiSecurityRequirement()
298298
{
299-
{
300-
new OpenApiSecurityScheme
301-
{
302-
Reference = new OpenApiReference
303-
{
304-
Type = ReferenceType.SecurityScheme,
305-
Id = "Bearer"
306-
},
307-
Scheme = "oauth2",
308-
Name = "Bearer",
309-
In = ParameterLocation.Header
310-
311-
},
312-
new List<string>()
313-
}
299+
[new OpenApiSecuritySchemeReference("Bearer", document)] = new List<string>()
314300
});
315301
});
316302
try

‎eFormAPI/eFormAPI.Web/eFormAPI.Web.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,17 @@
5050
<PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" Version="9.0.0" />
5151
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
5252
<PackageReference Include="HtmlToOpenXml.dll" Version="3.2.8" />
53-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.11" />
53+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.0" />
5454
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.0" />
55-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.11" />
55+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.0" />
5656
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.11" />
5757
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
5858
<PackageReference Include="Microting.eForm" Version="9.0.72" />
5959
<PackageReference Include="Microting.EformAngularFrontendBase" Version="9.0.59" />
6060
<PackageReference Include="Microting.eFormApi.BasePn" Version="9.0.62" />
6161
<PackageReference Include="PureOtp" Version="1.0.0.1" />
6262
<PackageReference Include="Sentry" Version="5.16.2" />
63-
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.6" />
63+
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
6464
<PackageReference Include="McMaster.NETCore.Plugins" Version="2.0.0" />
6565
<PackageReference Include="sendgrid" Version="9.29.3" />
6666
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.0" />

‎eform-client/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"@angular-material-extensions/password-strength": "^16.0.0",
6868
"@angular/animations": "20.1.2",
6969
"@angular/cdk": "20.1.2",
70-
"@angular/common": "20.1.2",
70+
"@angular/common": "20.3.14",
7171
"@angular/compiler": "20.1.2",
7272
"@angular/core": "20.1.2",
7373
"@angular/forms": "20.1.2",
@@ -118,7 +118,7 @@
118118
"rxjs": "7.8.2",
119119
"tslib": "^2.8.1",
120120
"uuid": "13.0.0",
121-
"validator": "^13.15.20",
121+
"validator": "^13.15.23",
122122
"zone.js": "^0.15.1"
123123
},
124124
"devDependencies": {
@@ -146,7 +146,7 @@
146146
"@typescript-eslint/eslint-plugin": "^7.18.0",
147147
"@typescript-eslint/parser": "^7.18.0",
148148
"@typescript-eslint/utils": "^8.46.1",
149-
"@wdio/cli": "9.20.0",
149+
"@wdio/cli": "9.20.1",
150150
"@wdio/local-runner": "9.20.0",
151151
"@wdio/mocha-framework": "9.20.0",
152152
"@wdio/spec-reporter": "9.20.0",

‎eform-client/yarn.lock‎

Lines changed: 98 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -452,10 +452,10 @@
452452
yargs "18.0.0"
453453
zod "3.25.76"
454454

455-
"@angular/common@20.1.2":
456-
version "20.1.2"
457-
resolved "https://registry.yarnpkg.com/@angular/common/-/common-20.1.2.tgz#e9f2c9bc6d811bd01d3e35cfabdbc1ed85feb8aa"
458-
integrity sha512-MQYP+4lvw81jBRknNYgIye7N36SD68SADUB7xO+7pF5+KbGundfmZkO29uWCnTBU86C4xU4DshlFVhzFK1lreQ==
455+
"@angular/common@20.3.14":
456+
version "20.3.14"
457+
resolved "https://registry.yarnpkg.com/@angular/common/-/common-20.3.14.tgz#62d7e693ae70d3ac41aa424c602c490c0e8d46c5"
458+
integrity sha512-OOUvjTtnpktJLsNupA+GFT2q5zNocPdpOENA8aSrXvAheNybLjgi+otO3U3sQsvB1VwaoEZ9GT5O3lZlstnA/A==
459459
dependencies:
460460
tslib "^2.3.0"
461461

@@ -4699,18 +4699,18 @@
46994699
magic-string "^0.30.17"
47004700
pathe "^2.0.3"
47014701

4702-
"@wdio/[email protected].0":
4703-
version "9.20.0"
4704-
resolved "https://registry.yarnpkg.com/@wdio/cli/-/cli-9.20.0.tgz#062ddc3c6603959bd848c982edadf65db3cebb64"
4705-
integrity sha512-dGkZFp09aIyoN6HlJah7zJApG/FzN0O/HaTfTkWrOM5GBli9th/9VIfbsT3vx4I9mBdETiYPmgfl4LqDP2p0VQ==
4702+
"@wdio/[email protected].1":
4703+
version "9.20.1"
4704+
resolved "https://registry.yarnpkg.com/@wdio/cli/-/cli-9.20.1.tgz#947353bf2eac51144f399422cae4ab1164271981"
4705+
integrity sha512-aeU6iV79GVdUkuHfuqbx4RkaJWY1amsQbiawr8VXhFTmBhPKQdzqQEVs/G+FG2zh2ILTXZ8+spv9irWMQmpGBA==
47064706
dependencies:
47074707
"@vitest/snapshot" "^2.1.1"
4708-
"@wdio/config" "9.20.0"
4708+
"@wdio/config" "9.20.1"
47094709
"@wdio/globals" "9.17.0"
47104710
"@wdio/logger" "9.18.0"
47114711
"@wdio/protocols" "9.16.2"
47124712
"@wdio/types" "9.20.0"
4713-
"@wdio/utils" "9.20.0"
4713+
"@wdio/utils" "9.20.1"
47144714
async-exit-hook "^2.0.1"
47154715
chalk "^5.4.1"
47164716
chokidar "^4.0.0"
@@ -4722,7 +4722,7 @@
47224722
lodash.union "^4.6.0"
47234723
read-pkg-up "^10.0.0"
47244724
tsx "^4.7.2"
4725-
webdriverio "9.20.0"
4725+
webdriverio "9.20.1"
47264726
yargs "^17.7.2"
47274727

47284728
"@wdio/[email protected]":
@@ -4738,6 +4738,18 @@
47384738
import-meta-resolve "^4.0.0"
47394739
jiti "^2.5.1"
47404740

4741+
"@wdio/[email protected]":
4742+
version "9.20.1"
4743+
resolved "https://registry.yarnpkg.com/@wdio/config/-/config-9.20.1.tgz#472da0c48409f8a4523c5c6e916eb207612afea2"
4744+
integrity sha512-npl2J+rjCDJPjVySgWpciOyhWddn6s7n5sepKXLR7x1ADQHl5zUFv1dHD3jx4OQ9l6lrGQSPaofuz+7e9mu+vg==
4745+
dependencies:
4746+
"@wdio/logger" "9.18.0"
4747+
"@wdio/types" "9.20.0"
4748+
"@wdio/utils" "9.20.1"
4749+
deepmerge-ts "^7.0.3"
4750+
glob "^10.2.2"
4751+
import-meta-resolve "^4.0.0"
4752+
47414753
"@wdio/[email protected]":
47424754
version "9.20.0"
47434755
resolved "https://registry.yarnpkg.com/@wdio/dot-reporter/-/dot-reporter-9.20.0.tgz#9d3fc5c166576a2d5f111cb4a7609fa7448eb90a"
@@ -4888,6 +4900,26 @@
48884900
split2 "^4.2.0"
48894901
wait-port "^1.1.0"
48904902

4903+
"@wdio/[email protected]":
4904+
version "9.20.1"
4905+
resolved "https://registry.yarnpkg.com/@wdio/utils/-/utils-9.20.1.tgz#1530f0461f1bb83342e7f3301e8b28b8d18b1729"
4906+
integrity sha512-C/Gsy5NAatsGUF1eT9Ks/ErR52/X4YI7MSm7BtwNOw8v2Ko+SiCA5qXts61J0A7QYwOn4gfXfBZZnzSAng6G/w==
4907+
dependencies:
4908+
"@puppeteer/browsers" "^2.2.0"
4909+
"@wdio/logger" "9.18.0"
4910+
"@wdio/types" "9.20.0"
4911+
decamelize "^6.0.0"
4912+
deepmerge-ts "^7.0.3"
4913+
edgedriver "^6.1.2"
4914+
geckodriver "^5.0.0"
4915+
get-port "^7.0.0"
4916+
import-meta-resolve "^4.0.0"
4917+
locate-app "^2.2.24"
4918+
mitt "^3.0.1"
4919+
safaridriver "^1.0.0"
4920+
split2 "^4.2.0"
4921+
wait-port "^1.1.0"
4922+
48914923
"@wdio/[email protected]":
48924924
version "9.20.0"
48934925
resolved "https://registry.yarnpkg.com/@wdio/xvfb/-/xvfb-9.20.0.tgz#bc52072708666ae870b26db73fb792e4f10724a5"
@@ -11069,9 +11101,9 @@ node-fetch@^3.3.2:
1106911101
formdata-polyfill "^4.0.10"
1107011102

1107111103
node-forge@^1:
11072-
version "1.3.1"
11073-
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
11074-
integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
11104+
version "1.3.2"
11105+
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.2.tgz#d0d2659a26eef778bf84d73e7f55c08144ee7750"
11106+
integrity sha512-6xKiQ+cph9KImrRh0VsjH2d8/GXA4FIMlgU4B757iI1ApvcyA9VlouP0yZJha01V+huImO+kKMU7ih+2+E14fw==
1107511107

1107611108
[email protected]:
1107711109
version "5.2.2"
@@ -14166,10 +14198,10 @@ validate-npm-package-name@^6.0.0, validate-npm-package-name@^6.0.2:
1416614198
resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-6.0.2.tgz#4e8d2c4d939975a73dd1b7a65e8f08d44c85df96"
1416714199
integrity sha512-IUoow1YUtvoBBC06dXs8bR8B9vuA3aJfmQNKMoaPG/OFsPmoQvw8xh+6Ye25Gx9DQhoEom3Pcu9MKHerm/NpUQ==
1416814200

14169-
validator@^13.15.20:
14170-
version "13.15.20"
14171-
resolved "https://registry.yarnpkg.com/validator/-/validator-13.15.20.tgz#054e9238109538a1bf46ae3e1290845a64fa2186"
14172-
integrity sha512-KxPOq3V2LmfQPP4eqf3Mq/zrT0Dqp2Vmx2Bn285LwVahLc+CsxOM0crBHczm8ijlcjZ0Q5Xd6LW3z3odTPnlrw==
14201+
validator@^13.15.23:
14202+
version "13.15.23"
14203+
resolved "https://registry.yarnpkg.com/validator/-/validator-13.15.23.tgz#59a874f84e4594588e3409ab1edbe64e96d0c62d"
14204+
integrity sha512-4yoz1kEWqUjzi5zsPbAS/903QXSYp0UOtHsPpp7p9rHAw/W+dkInskAE386Fat3oKRROwO98d9ZB0G4cObgUyw==
1417314205

1417414206
vary@^1, vary@^1.1.2, vary@~1.1.2:
1417514207
version "1.1.2"
@@ -14307,6 +14339,23 @@ [email protected]:
1430714339
undici "^6.21.3"
1430814340
ws "^8.8.0"
1430914341

14342+
[email protected]:
14343+
version "9.20.1"
14344+
resolved "https://registry.yarnpkg.com/webdriver/-/webdriver-9.20.1.tgz#d82e12c0e408e99fafc4933eb86ad56c92fce408"
14345+
integrity sha512-QtvYqPai2NOnq7qePPH6kNSwk7+tnmSvnlOnY8dIT/Y24TPdQp44NjF/BUYAWIlqoBlZqHClQFTSVwT2qvO2Tw==
14346+
dependencies:
14347+
"@types/node" "^20.1.0"
14348+
"@types/ws" "^8.5.3"
14349+
"@wdio/config" "9.20.1"
14350+
"@wdio/logger" "9.18.0"
14351+
"@wdio/protocols" "9.16.2"
14352+
"@wdio/types" "9.20.0"
14353+
"@wdio/utils" "9.20.1"
14354+
deepmerge-ts "^7.0.3"
14355+
https-proxy-agent "^7.0.6"
14356+
undici "^6.21.3"
14357+
ws "^8.8.0"
14358+
1431014359
[email protected]:
1431114360
version "9.20.0"
1431214361
resolved "https://registry.yarnpkg.com/webdriverio/-/webdriverio-9.20.0.tgz#46f45268f2c4021a18045a7e7dfd738225514ece"
@@ -14338,6 +14387,37 @@ [email protected]:
1433814387
urlpattern-polyfill "^10.0.0"
1433914388
webdriver "9.20.0"
1434014389

14390+
[email protected]:
14391+
version "9.20.1"
14392+
resolved "https://registry.yarnpkg.com/webdriverio/-/webdriverio-9.20.1.tgz#2ed1de1eb516cbf287216c137421457d9f1bbdc2"
14393+
integrity sha512-QVM/asb5sDESz37ow/BAOA0z2HtUJsuAjPKHdw+Vx92PaQP3EfHwTgxK2T5rgwa0WRNh+c+n/0nEqIvqBl01sA==
14394+
dependencies:
14395+
"@types/node" "^20.11.30"
14396+
"@types/sinonjs__fake-timers" "^8.1.5"
14397+
"@wdio/config" "9.20.1"
14398+
"@wdio/logger" "9.18.0"
14399+
"@wdio/protocols" "9.16.2"
14400+
"@wdio/repl" "9.16.2"
14401+
"@wdio/types" "9.20.0"
14402+
"@wdio/utils" "9.20.1"
14403+
archiver "^7.0.1"
14404+
aria-query "^5.3.0"
14405+
cheerio "^1.0.0-rc.12"
14406+
css-shorthand-properties "^1.1.1"
14407+
css-value "^0.0.1"
14408+
grapheme-splitter "^1.0.4"
14409+
htmlfy "^0.8.1"
14410+
is-plain-obj "^4.1.0"
14411+
jszip "^3.10.1"
14412+
lodash.clonedeep "^4.5.0"
14413+
lodash.zip "^4.2.0"
14414+
query-selector-shadow-dom "^1.0.1"
14415+
resq "^1.11.0"
14416+
rgb2hex "0.2.5"
14417+
serialize-error "^12.0.0"
14418+
urlpattern-polyfill "^10.0.0"
14419+
webdriver "9.20.1"
14420+
1434114421
webidl-conversions@^3.0.0:
1434214422
version "3.0.1"
1434314423
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"

0 commit comments

Comments
 (0)