Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev to stage conflicts 06 03 23 #1551

Open
wants to merge 42 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
f711ac8
variables added
yesidevelop Feb 7, 2023
d201258
staging update
yesidevelop Feb 7, 2023
aaab21b
up
yesidevelop Feb 8, 2023
2b67010
client variable updates for kubernetes
yesidevelop Feb 9, 2023
c375657
pilots prod config
yesidevelop Feb 9, 2023
f38f570
updated charts
yesidevelop Feb 13, 2023
0281b7e
prod value updated
yesidevelop Feb 13, 2023
3b4d797
stage value updated
yesidevelop Feb 13, 2023
6a7ff5e
trax image updated
yesidevelop Feb 13, 2023
2a0ebd8
php-fpm added
yesidevelop Feb 15, 2023
4f1e929
nginx and fpm implemented
yesidevelop Feb 15, 2023
f3ec7bd
nginx and fpm implemented
yesidevelop Feb 15, 2023
ce602e0
added postgres extension
yesidevelop Feb 15, 2023
2be6156
added postgres extension
yesidevelop Feb 15, 2023
56fc59c
added postgres extension
yesidevelop Feb 15, 2023
8aa7565
cert paths update
yesidevelop Feb 15, 2023
6eebc90
updated api
yesidevelop Feb 15, 2023
415d6a3
variables updated
yesidevelop Feb 15, 2023
7671bb3
updated entrypoint
yesidevelop Feb 15, 2023
a82d93c
env added
yesidevelop Feb 15, 2023
6016673
env added
yesidevelop Feb 15, 2023
db92c26
updated h5p
yesidevelop Feb 16, 2023
253ee7f
type directory removed
yesidevelop Feb 16, 2023
dfc5567
previleged security added
yesidevelop Feb 16, 2023
d363e39
hostpath removed
yesidevelop Feb 16, 2023
594e12b
Merge pull request #1511 from ActiveLearningStudio/bugfix/CUR4655-ind…
AqibYounasAtTkxel Feb 15, 2023
c8853e6
Merge pull request #1524 from ActiveLearningStudio/bugfix/ind_activit…
AqibYounasAtTkxel Feb 17, 2023
4416eff
missing slash added
AqibYounasAtTkxel Jan 23, 2023
37288d6
Conflict resolve
AqibYounasAtTkxel Feb 17, 2023
6f11935
Merge pull request #1526 from ActiveLearningStudio/release/cherry-pic…
mohsin-tkxel Feb 17, 2023
802192e
API to change status of an assignment is complete
AqibYounasAtTkxel Jan 17, 2023
183d7c9
scope for refresh token added
AqibYounasAtTkxel Jan 23, 2023
6115533
API to change status of an assignment is complete
AqibYounasAtTkxel Jan 17, 2023
ffd02e1
removed unnecessary validation
AqibYounasAtTkxel Feb 16, 2023
801ba1d
MSteams api cherry-pick
AqibYounasAtTkxel Feb 16, 2023
57c437a
Update Jenkinsfile.api
yesidevelop Feb 17, 2023
93383a0
quick fix
AqibYounasAtTkxel Feb 17, 2023
b75526a
Merge pull request #1527 from ActiveLearningStudio/release/cherry-pic…
mohsin-tkxel Feb 17, 2023
138e268
Merge branch 'staging' of https://github.com/ActiveLearningStudio/Act…
AqibYounasAtTkxel Mar 6, 2023
e84ac70
removed ms secret
yesidevelop Mar 6, 2023
bad624b
charts removed
yesidevelop Mar 7, 2023
f48427c
removed secret
yesidevelop Mar 7, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions app/Http/Controllers/Api/V1/MicroSoftTeamController.php
Original file line number Diff line number Diff line change
Expand Up @@ -268,16 +268,16 @@ public function getUserPofile(GetUserProfileRequest $request)
if ($accessToken && array_key_exists('access_token', $accessToken)) {
$getProfile = $this->microsoftTeamRepository->getUserProfile($accessToken['access_token']);

return response([
'profile' => $getProfile,
], 200);
} else {
return response([
'status_code' => 424,
'errors' => $accessToken['error'],
'message' => $accessToken['error_description']
], 500);
if ($getProfile && array_key_exists('displayName', $getProfile)) {
return response([
'profile' => $getProfile,
], 200);
}
}

return response([
'profile' => 'Something went wrong with the login code or token, unable to fetch user profile',
], 400);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion app/Repositories/MicrosoftTeam/MicrosoftTeamRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ private function getUserDetails($token)
*/
public function getUserProfile($token)
{
$apiURL = $this->landingUrl . '/me';
$apiURL = $this->landingUrl . '/profile';
$headers = [
'Content-length' => 0,
'Content-type' => 'application/json',
Expand Down
3 changes: 0 additions & 3 deletions charts/curriki/Chart.yaml

This file was deleted.

63 changes: 0 additions & 63 deletions charts/curriki/templates/_helpers.tpl

This file was deleted.

15 changes: 0 additions & 15 deletions charts/curriki/templates/acme-issuer.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions charts/curriki/templates/api-ing.yaml

This file was deleted.

Loading