Compare commits

..

No commits in common. "a554e253d0a48ca1e2adf5c15435015d232c9b0d" and "619ad0548860b353257df9ec5255deeaae5f338a" have entirely different histories.

10 changed files with 40 additions and 45 deletions

View File

@ -6,7 +6,6 @@ using System;
using System.IO;
using System.Threading.Tasks;
using System.Collections.Specialized;
using System.Net;
namespace OnlineAssessment.Helpers
{
@ -98,30 +97,12 @@ namespace OnlineAssessment.Helpers
public async Task<Stream> GetFile(string key)
{
try
{
string file = key.EndsWith(".png", StringComparison.OrdinalIgnoreCase) ? key : key + ".png";
string filename_print = _settings.AWSS3.BucketName + file;
var response = await _amazonS3.GetObjectAsync(_settings.AWSS3.BucketName, file);
if (response.HttpStatusCode == HttpStatusCode.OK)
return response.ResponseStream;
string file = key + ".png";
GetObjectResponse response = await _amazonS3.GetObjectAsync(_settings.AWSS3.BucketName, file);
if (response.HttpStatusCode == System.Net.HttpStatusCode.OK)
return response.ResponseStream;
else
return null;
}
catch (AmazonS3Exception ex)
{
Console.WriteLine($"AWS S3 Error: {ex.Message} ({ex.ErrorCode})");
throw;
}
catch (Exception ex)
{
Console.WriteLine($"General Error: {ex.Message}");
throw;
}
}
public async Task<bool> DeleteFile(string key)

View File

@ -8,8 +8,11 @@
},
"AllowedHosts": "*",
"ConnectionStrings": {
"DefaultConnectionString": "CWl5kdPv3XVgCewNZ9xsMWbKUfspY55eD30t624CW5XFBxN2arokRw5kglCPdfNE9fc0xdbYTyXrFJ1s/KVEknD0+Zz3unUPUcZjqtJrgZaOSTpxPANvf3pERJbTDELV91SrUGHsY/VugofFmzMLPTgsv9tXeGSsK/YE0uPS1i6ekiEPjm3P7t3K8Eho4rtkS+2SRFLPNIgp/tBDJ7t71yoNYZzk+zoh58jS3WiZni6BeT37eNfgCcqNg/7Jn7wW6c3IcDll6Pbw7hlQvHvxX4Xl3YFEb2x+bPCZELacMC11548Ax0nnRumfdzryCDI/ohfO3ZMA/Fni4j0g5A8qiruTtM2wwfaaDNZAPLA2aJU="
//"DefaultConnectionString": "B58MwWJom8ajCI4ia0DN+uXUcjx9/6VSwwwQLNRr0ALJmE2hmLwzJV6FYk3YezpmAQxcFLiBG1mToDKYxumHzWoyyr3/8JrMxcxJWctehH6XLaoreNgAG4pfVoNqXdy2LLDfxrh+MfXMe5vTzSRd/wgsiNcfFYzvoOA6ecg/K15a6/aM4CBWkylwwihQdCn/u567QL8IlAeUkPSM97dI6OGUYDzuGNoubGBDd2bBEKpY+HZ5gdF+hOxiC68XlkSykjk7vCDg5oIO2wNXvi2D0BmwEpXxhCMUFNaqJN7qpmo="
//Production connection string
"DefaultConnectionString": "BTG3gPH/5QU/Ziaw9qfFcCR7n1uQ58BpJeY2enHpagQNiaQohW6//faJRPLyjzLzsufkT3kcnHv7+P6DKFrnahIHTFJAhmPTRfVppxEotvCAmd6bHfq7IT9UhGEAzJkEldkpRe780FaHNfmer6pIGhS9P15G2ZrP99vd3Pxu/nUyBcoKTbo40I7lKUQJ4gRUZbWjjD/bjwMFs9ouKC7CDQ=="
//Staging Connection String
//"DefaultConnectionString": "3O5IBcQilkuCpSiL2/78srPWCHpYVGryBrDmdDH7ymmzevrvLYfgEbsScCZKknceXynyLeTn/5v0PJ4ddIyj6xF/wS+l7ElwqwaaGlpVEFNG4RetA1YQ/dKg92Y9czBU9QeEkT7DVwsBpb4LX+3X0uOd0VlQYhIQ1bmF0YNmlubv3O0k8c4UFM8sVzPexSIx8JuqhjWgfDw5sAgyKqvg/Q=="
},
"Jwt": {
"Key": "THIS_IS_ODIWARE_SECRET_KEY",

View File

@ -14,13 +14,12 @@ namespace OnlineAssessment
public static IServiceCollection AddDbConnections(this IServiceCollection services, IConfiguration configuration)
{
string connString1 = @"Server=94.249.213.139;Database=OA_STAGING;User Id=sa;Password=Odiware@1234!;TrustServerCertificate=True;MultipleActiveResultSets=true";
//string connString1 = @"Server=94.249.213.139;Database=OA_STAGING;User Id=sa;Password=Odiware@1234!;TrustServerCertificate=True;MultipleActiveResultSets=true";
//string connection1 = AesEncryptionHelper.Encrypt(connString1);
//string connString = configuration.GetConnectionString("DefaultConnectionString");
//string connection = AesEncryptionHelper.Decrypt(connString);
string connection = connString1;
string connString = configuration.GetConnectionString("DefaultConnectionString");
string connection = AesEncryptionHelper.Decrypt(connString);
//============================================

View File

@ -122,7 +122,7 @@ namespace OnlineAssessment.Data.EFCore
if (subject_id > 0)
examDetailList = examDetailList.Where(e => e.subject_count == 1 && e.subject_id == subject_id).ToList();
else if (subject_id == 0)
examDetailList = examDetailList.Where(e => e.subject_count > 1).ToList();
examDetailList = examDetailList.Where(e => e.subject_count >= 1).ToList();
if ((sortOrder != null && sortOrder.Length > 0) || (sortBy != null && sortBy.Length > 0))
{

View File

@ -8,9 +8,11 @@
},
"AllowedHosts": "*",
"ConnectionStrings": {
"DefaultConnectionString": "CWl5kdPv3XVgCewNZ9xsMWbKUfspY55eD30t624CW5XFBxN2arokRw5kglCPdfNE9fc0xdbYTyXrFJ1s/KVEknD0+Zz3unUPUcZjqtJrgZaOSTpxPANvf3pERJbTDELV91SrUGHsY/VugofFmzMLPTgsv9tXeGSsK/YE0uPS1i6ekiEPjm3P7t3K8Eho4rtkS+2SRFLPNIgp/tBDJ7t71yoNYZzk+zoh58jS3WiZni6BeT37eNfgCcqNg/7Jn7wW6c3IcDll6Pbw7hlQvHvxX4Xl3YFEb2x+bPCZELacMC11548Ax0nnRumfdzryCDI/ohfO3ZMA/Fni4j0g5A8qiruTtM2wwfaaDNZAPLA2aJU="
//"DefaultConnectionString": "yV213mRnQngKYPWcDvOoPbSopWdQ0VutXa7+S2RRjoI4G3nsjIF0PYPmwJffxL1WCdb+20HrHyf1t+DCMnGtzz6WWiwQ0oHWB26iCqTKLgQi53fmcRWMJsZkkxh4u8zKueZuEi6c/Er2MrTF4lwdqFkQmA3Wi/FzJAsifsqVer717EJkhhnz+h0pC4bQkX7P+y2TmirFPhJNWLb/uFFc5XIuKMYvuggyIOQoo84mLnX4s0Nn+FbzzmkLgVO1+dnrJAgWVJoiHcEvbdcQkfNw4LlvJ4qHS7oiBo2erYpo2USX4EwaBHnYA4xginfbudlv"
//"DefaultConnectionString": "B58MwWJom8ajCI4ia0DN+uXUcjx9/6VSwwwQLNRr0ALJmE2hmLwzJV6FYk3YezpmAQxcFLiBG1mToDKYxumHzWoyyr3/8JrMxcxJWctehH6XLaoreNgAG4pfVoNqXdy2LLDfxrh+MfXMe5vTzSRd/wgsiNcfFYzvoOA6ecg/K15a6/aM4CBWkylwwihQdCn/u567QL8IlAeUkPSM97dI6OGUYDzuGNoubGBDd2bBEKpY+HZ5gdF+hOxiC68XlkSykjk7vCDg5oIO2wNXvi2D0BmwEpXxhCMUFNaqJN7qpmo="
//Production connection string
"DefaultConnectionString": "BTG3gPH/5QU/Ziaw9qfFcCR7n1uQ58BpJeY2enHpagQNiaQohW6//faJRPLyjzLzsufkT3kcnHv7+P6DKFrnahIHTFJAhmPTRfVppxEotvCAmd6bHfq7IT9UhGEAzJkEldkpRe780FaHNfmer6pIGhS9P15G2ZrP99vd3Pxu/nUyBcoKTbo40I7lKUQJ4gRUZbWjjD/bjwMFs9ouKC7CDQ=="
//Staging Connection String
//"DefaultConnectionString": "3O5IBcQilkuCpSiL2/78srPWCHpYVGryBrDmdDH7ymmzevrvLYfgEbsScCZKknceXynyLeTn/5v0PJ4ddIyj6xF/wS+l7ElwqwaaGlpVEFNG4RetA1YQ/dKg92Y9czBU9QeEkT7DVwsBpb4LX+3X0uOd0VlQYhIQ1bmF0YNmlubv3O0k8c4UFM8sVzPexSIx8JuqhjWgfDw5sAgyKqvg/Q=="
},
"Jwt": {
"Key": "THIS_IS_ODIWARE_SECRET_KEY",

View File

@ -8,9 +8,11 @@
},
"AllowedHosts": "*",
"ConnectionStrings": {
"DefaultConnectionString": "CWl5kdPv3XVgCewNZ9xsMWbKUfspY55eD30t624CW5XFBxN2arokRw5kglCPdfNE9fc0xdbYTyXrFJ1s/KVEknD0+Zz3unUPUcZjqtJrgZaOSTpxPANvf3pERJbTDELV91SrUGHsY/VugofFmzMLPTgsv9tXeGSsK/YE0uPS1i6ekiEPjm3P7t3K8Eho4rtkS+2SRFLPNIgp/tBDJ7t71yoNYZzk+zoh58jS3WiZni6BeT37eNfgCcqNg/7Jn7wW6c3IcDll6Pbw7hlQvHvxX4Xl3YFEb2x+bPCZELacMC11548Ax0nnRumfdzryCDI/ohfO3ZMA/Fni4j0g5A8qiruTtM2wwfaaDNZAPLA2aJU="
//"DefaultConnectionString": "hCF2clp1tO6WycvgTXFGR4FIKxVkmfNDpAjGOcJ9P3YZkw9veDhS4Bk5zdWSw8Ngm+o9D7NJ5wq7pO4kY3Hj20yNI7YJygcdxz9pbEDqzmICXVd+oDnShIzFKQpy+blHQH0WcXeMJiry0xoJWTaG1Q9JTZUepUXuB2Iabkvf0sb08ENGCwPMOVquKPDNu/psU2TGXeSgXAIbSRm6fDS+mj3dw3MBtzUGlrMwBdWVo3rWifmMV5Wx0NWOaYFAr2UVuJI3mAecQpAk0rt7jmug+w=="
//"DefaultConnectionString": "B58MwWJom8ajCI4ia0DN+uXUcjx9/6VSwwwQLNRr0ALJmE2hmLwzJV6FYk3YezpmAQxcFLiBG1mToDKYxumHzWoyyr3/8JrMxcxJWctehH6XLaoreNgAG4pfVoNqXdy2LLDfxrh+MfXMe5vTzSRd/wgsiNcfFYzvoOA6ecg/K15a6/aM4CBWkylwwihQdCn/u567QL8IlAeUkPSM97dI6OGUYDzuGNoubGBDd2bBEKpY+HZ5gdF+hOxiC68XlkSykjk7vCDg5oIO2wNXvi2D0BmwEpXxhCMUFNaqJN7qpmo="
//Production connection string
"DefaultConnectionString": "BTG3gPH/5QU/Ziaw9qfFcCR7n1uQ58BpJeY2enHpagQNiaQohW6//faJRPLyjzLzsufkT3kcnHv7+P6DKFrnahIHTFJAhmPTRfVppxEotvCAmd6bHfq7IT9UhGEAzJkEldkpRe780FaHNfmer6pIGhS9P15G2ZrP99vd3Pxu/nUyBcoKTbo40I7lKUQJ4gRUZbWjjD/bjwMFs9ouKC7CDQ=="
//Staging Connection String
//"DefaultConnectionString": "3O5IBcQilkuCpSiL2/78srPWCHpYVGryBrDmdDH7ymmzevrvLYfgEbsScCZKknceXynyLeTn/5v0PJ4ddIyj6xF/wS+l7ElwqwaaGlpVEFNG4RetA1YQ/dKg92Y9czBU9QeEkT7DVwsBpb4LX+3X0uOd0VlQYhIQ1bmF0YNmlubv3O0k8c4UFM8sVzPexSIx8JuqhjWgfDw5sAgyKqvg/Q=="
},
"Jwt": {
"Key": "THIS_IS_ODIWARE_SECRET_KEY",

View File

@ -8,9 +8,7 @@
},
"AllowedHosts": "*",
"ConnectionStrings": {
"DefaultConnectionString": "CWl5kdPv3XVgCewNZ9xsMWbKUfspY55eD30t624CW5XFBxN2arokRw5kglCPdfNE9fc0xdbYTyXrFJ1s/KVEknD0+Zz3unUPUcZjqtJrgZaOSTpxPANvf3pERJbTDELV91SrUGHsY/VugofFmzMLPTgsv9tXeGSsK/YE0uPS1i6ekiEPjm3P7t3K8Eho4rtkS+2SRFLPNIgp/tBDJ7t71yoNYZzk+zoh58jS3WiZni6BeT37eNfgCcqNg/7Jn7wW6c3IcDll6Pbw7hlQvHvxX4Xl3YFEb2x+bPCZELacMC11548Ax0nnRumfdzryCDI/ohfO3ZMA/Fni4j0g5A8qiruTtM2wwfaaDNZAPLA2aJU="
//"DefaultConnectionString": "yV213mRnQngKYPWcDvOoPbSopWdQ0VutXa7+S2RRjoI4G3nsjIF0PYPmwJffxL1WCdb+20HrHyf1t+DCMnGtzz6WWiwQ0oHWB26iCqTKLgQi53fmcRWMJsZkkxh4u8zKueZuEi6c/Er2MrTF4lwdqFkQmA3Wi/FzJAsifsqVer717EJkhhnz+h0pC4bQkX7P+y2TmirFPhJNWLb/uFFc5XIuKMYvuggyIOQoo84mLnX4s0Nn+FbzzmkLgVO1+dnrJAgWVJoiHcEvbdcQkfNw4LlvJ4qHS7oiBo2erYpo2USX4EwaBHnYA4xginfbudlv"
//"DefaultConnectionString": "B58MwWJom8ajCI4ia0DN+uXUcjx9/6VSwwwQLNRr0ALJmE2hmLwzJV6FYk3YezpmAQxcFLiBG1mToDKYxumHzWoyyr3/8JrMxcxJWctehH6XLaoreNgAG4pfVoNqXdy2LLDfxrh+MfXMe5vTzSRd/wgsiNcfFYzvoOA6ecg/K15a6/aM4CBWkylwwihQdCn/u567QL8IlAeUkPSM97dI6OGUYDzuGNoubGBDd2bBEKpY+HZ5gdF+hOxiC68XlkSykjk7vCDg5oIO2wNXvi2D0BmwEpXxhCMUFNaqJN7qpmo="
"DefaultConnectionString": "BTG3gPH/5QU/Ziaw9qfFcCR7n1uQ58BpJeY2enHpagQNiaQohW6//faJRPLyjzLzsufkT3kcnHv7+P6DKFrnahIHTFJAhmPTRfVppxEotvCAmd6bHfq7IT9UhGEAzJkEldkpRe780FaHNfmer6pIGhS9P15G2ZrP99vd3Pxu/nUyBcoKTbo40I7lKUQJ4gRUZbWjjD/bjwMFs9ouKC7CDQ=="
},
"Jwt": {
"Key": "THIS_IS_ODIWARE_SECRET_KEY",

View File

@ -8,8 +8,11 @@
},
"AllowedHosts": "*",
"ConnectionStrings": {
"DefaultConnectionString": "CWl5kdPv3XVgCewNZ9xsMWbKUfspY55eD30t624CW5XFBxN2arokRw5kglCPdfNE9fc0xdbYTyXrFJ1s/KVEknD0+Zz3unUPUcZjqtJrgZaOSTpxPANvf3pERJbTDELV91SrUGHsY/VugofFmzMLPTgsv9tXeGSsK/YE0uPS1i6ekiEPjm3P7t3K8Eho4rtkS+2SRFLPNIgp/tBDJ7t71yoNYZzk+zoh58jS3WiZni6BeT37eNfgCcqNg/7Jn7wW6c3IcDll6Pbw7hlQvHvxX4Xl3YFEb2x+bPCZELacMC11548Ax0nnRumfdzryCDI/ohfO3ZMA/Fni4j0g5A8qiruTtM2wwfaaDNZAPLA2aJU="
//"DefaultConnectionString": "B58MwWJom8ajCI4ia0DN+uXUcjx9/6VSwwwQLNRr0ALJmE2hmLwzJV6FYk3YezpmAQxcFLiBG1mToDKYxumHzWoyyr3/8JrMxcxJWctehH6XLaoreNgAG4pfVoNqXdy2LLDfxrh+MfXMe5vTzSRd/wgsiNcfFYzvoOA6ecg/K15a6/aM4CBWkylwwihQdCn/u567QL8IlAeUkPSM97dI6OGUYDzuGNoubGBDd2bBEKpY+HZ5gdF+hOxiC68XlkSykjk7vCDg5oIO2wNXvi2D0BmwEpXxhCMUFNaqJN7qpmo="
//Production connection string
"DefaultConnectionString": "BTG3gPH/5QU/Ziaw9qfFcCR7n1uQ58BpJeY2enHpagQNiaQohW6//faJRPLyjzLzsufkT3kcnHv7+P6DKFrnahIHTFJAhmPTRfVppxEotvCAmd6bHfq7IT9UhGEAzJkEldkpRe780FaHNfmer6pIGhS9P15G2ZrP99vd3Pxu/nUyBcoKTbo40I7lKUQJ4gRUZbWjjD/bjwMFs9ouKC7CDQ==",
//Staging Connection String
//"DefaultConnectionString": "3O5IBcQilkuCpSiL2/78srPWCHpYVGryBrDmdDH7ymmzevrvLYfgEbsScCZKknceXynyLeTn/5v0PJ4ddIyj6xF/wS+l7ElwqwaaGlpVEFNG4RetA1YQ/dKg92Y9czBU9QeEkT7DVwsBpb4LX+3X0uOd0VlQYhIQ1bmF0YNmlubv3O0k8c4UFM8sVzPexSIx8JuqhjWgfDw5sAgyKqvg/Q=="
},
"Jwt": {
"Key": "THIS_IS_ODIWARE_SECRET_KEY",

View File

@ -8,8 +8,11 @@
},
"AllowedHosts": "*",
"ConnectionStrings": {
"DefaultConnectionString": "CWl5kdPv3XVgCewNZ9xsMWbKUfspY55eD30t624CW5XFBxN2arokRw5kglCPdfNE9fc0xdbYTyXrFJ1s/KVEknD0+Zz3unUPUcZjqtJrgZaOSTpxPANvf3pERJbTDELV91SrUGHsY/VugofFmzMLPTgsv9tXeGSsK/YE0uPS1i6ekiEPjm3P7t3K8Eho4rtkS+2SRFLPNIgp/tBDJ7t71yoNYZzk+zoh58jS3WiZni6BeT37eNfgCcqNg/7Jn7wW6c3IcDll6Pbw7hlQvHvxX4Xl3YFEb2x+bPCZELacMC11548Ax0nnRumfdzryCDI/ohfO3ZMA/Fni4j0g5A8qiruTtM2wwfaaDNZAPLA2aJU="
//"DefaultConnectionString": "B58MwWJom8ajCI4ia0DN+uXUcjx9/6VSwwwQLNRr0ALJmE2hmLwzJV6FYk3YezpmAQxcFLiBG1mToDKYxumHzWoyyr3/8JrMxcxJWctehH6XLaoreNgAG4pfVoNqXdy2LLDfxrh+MfXMe5vTzSRd/wgsiNcfFYzvoOA6ecg/K15a6/aM4CBWkylwwihQdCn/u567QL8IlAeUkPSM97dI6OGUYDzuGNoubGBDd2bBEKpY+HZ5gdF+hOxiC68XlkSykjk7vCDg5oIO2wNXvi2D0BmwEpXxhCMUFNaqJN7qpmo="
//Production connection string
"DefaultConnectionString": "BTG3gPH/5QU/Ziaw9qfFcCR7n1uQ58BpJeY2enHpagQNiaQohW6//faJRPLyjzLzsufkT3kcnHv7+P6DKFrnahIHTFJAhmPTRfVppxEotvCAmd6bHfq7IT9UhGEAzJkEldkpRe780FaHNfmer6pIGhS9P15G2ZrP99vd3Pxu/nUyBcoKTbo40I7lKUQJ4gRUZbWjjD/bjwMFs9ouKC7CDQ=="
//Staging Connection String
//"DefaultConnectionString": "3O5IBcQilkuCpSiL2/78srPWCHpYVGryBrDmdDH7ymmzevrvLYfgEbsScCZKknceXynyLeTn/5v0PJ4ddIyj6xF/wS+l7ElwqwaaGlpVEFNG4RetA1YQ/dKg92Y9czBU9QeEkT7DVwsBpb4LX+3X0uOd0VlQYhIQ1bmF0YNmlubv3O0k8c4UFM8sVzPexSIx8JuqhjWgfDw5sAgyKqvg/Q=="
},
"Jwt": {
"Key": "THIS_IS_ODIWARE_SECRET_KEY",

View File

@ -4,7 +4,11 @@
},
"AllowedHosts": "*",
"ConnectionStrings": {
"DefaultConnectionString": "3O5IBcQilkuCpSiL2/78srPWCHpYVGryBrDmdDH7ymmzevrvLYfgEbsScCZKknceXynyLeTn/5v0PJ4ddIyj6xF/wS+l7ElwqwaaGlpVEFNG4RetA1YQ/dKg92Y9czBU9QeEkT7DVwsBpb4LX+3X0uOd0VlQYhIQ1bmF0YNmlubv3O0k8c4UFM8sVzPexSIx8JuqhjWgfDw5sAgyKqvg/Q=="
//Production connection string
"DefaultConnectionString": "BTG3gPH/5QU/Ziaw9qfFcCR7n1uQ58BpJeY2enHpagQNiaQohW6//faJRPLyjzLzsufkT3kcnHv7+P6DKFrnahIHTFJAhmPTRfVppxEotvCAmd6bHfq7IT9UhGEAzJkEldkpRe780FaHNfmer6pIGhS9P15G2ZrP99vd3Pxu/nUyBcoKTbo40I7lKUQJ4gRUZbWjjD/bjwMFs9ouKC7CDQ=="
//Staging Connection String
//"DefaultConnectionString": "3O5IBcQilkuCpSiL2/78srPWCHpYVGryBrDmdDH7ymmzevrvLYfgEbsScCZKknceXynyLeTn/5v0PJ4ddIyj6xF/wS+l7ElwqwaaGlpVEFNG4RetA1YQ/dKg92Y9czBU9QeEkT7DVwsBpb4LX+3X0uOd0VlQYhIQ1bmF0YNmlubv3O0k8c4UFM8sVzPexSIx8JuqhjWgfDw5sAgyKqvg/Q=="
},
"Jwt": {
"Key": "THIS_IS_ODIWARE_SECRET_KEY",