Merged
Conversation
![github-code-quality[bot]](https://avatars.githubusercontent.com/u/9919?s=60&v=4){kind=small}
| ((AtomicBehavior2) => { | ||
| AtomicBehavior2[AtomicBehavior2["Lock"] = 0] = "Lock"; | ||
| AtomicBehavior2[AtomicBehavior2["Rename"] = 1] = "Rename"; | ||
| })(AtomicBehavior || (AtomicBehavior = {})); |
Member
|
senay18 you have a lot of merge conflicts now my man, use AI to tell it your exact situation of what's going on, feed it what's going on, then run those commands. Keep prompting it until you learn how to solve these types of issues in the git workflows |
…ariable' Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>
Member
|
@Team-Deepiri/support-team Someone handle this. @chexedy |
Member
Contributor
|
on it |
Member
|
You’re the man.
…On Wed, Mar 11, 2026 at 4:57 PM ayaan ***@***.***> wrote:
*chexedy* left a comment (Team-Deepiri/deepiri-platform#129)
<#129 (comment)>
on it
—
Reply to this email directly, view it on GitHub
<#129 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/BFHDDTGD7PLNXR5EXSFGYU34QHHLNAVCNFSM6AAAAACWKWBCMGVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHM2DANBSGE3DEOJQHE>
.
You are receiving this because you are on a team that was mentioned.Message
ID: ***@***.***>
|
Member
|
@chexedy You are not the man, where is this PR? That was lackluster and we may need to rethink you being apart of the team |
Member
Contributor
|
@ericchen682 if you could take over on this that'd be great, consider this your PR for the week. Thank you! |
# Conflicts: # deepiri-core-api # deepiri-modelkit # diri-cyrex # diri-helox # platform-services/backend/deepiri-auth-service # platform-services/backend/deepiri-engagement-service/package.json # platform-services/backend/deepiri-external-bridge-service # platform-services/backend/deepiri-language-intelligence-service # platform-services/backend/deepiri-realtime-gateway/package-lock.json
Made-with: Cursor
Made-with: Cursor
Made-with: Cursor
ericchen682
reviewed
Mar 29, 2026
Member
There was a problem hiding this comment.
QA Approved:
- Handled merge conflicts
- Verified JWT token generation and validation
- Tested that the messaging route was accessible through API gateway
Everything worked locally for me, although I did choose to handle merge conflicts on my own.
Everything LGTM
ericchen682
approved these changes
Mar 29, 2026
Member
ericchen682
left a comment
ericchen682
left a comment
There was a problem hiding this comment.
Meant to approve with previous comment.
Member
|
@ericchen682 great job! Merge it
…On Sat, Mar 28, 2026 at 9:08 PM Eric Chen ***@***.***> wrote:
***@***.**** approved this pull request.
Meant to approve with previous comment.
—
Reply to this email directly, view it on GitHub
<#129?email_source=notifications&email_token=BFHDDTHZSTRPEF67PJUNGPT4TBZSTA5CNFSNUABKM5UWIORPF5TWS5BNNB2WEL2QOVWGYUTFOF2WK43UKJSXM2LFO4XTIMBSGYZDEMZUGU4KM4TFMFZW63VMORSWC3K7NVSW45DJN5XKKZLWMVXHJPLQOJPXEZLWNFSXOX3ON52GSZTJMNQXI2LPNZZV6Y3MNFRWW#pullrequestreview-4026223458>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/BFHDDTDQAAIEGMRNCF27D2L4TBZSTAVCNFSM6AAAAACWKWBCMGVHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHM2DAMRWGIZDGNBVHA>
.
You are receiving this because you are on a team that was mentioned.Message
ID: ***@***.***>
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR adds JWT token handling and a messaging route to the API gateway.
Related Issue number: conflicts
Plaky feature name: auth messaging
Component, feature, or system affected: deepiri-api-gateway, authentication, messaging
Purpose of change: feature
Changes
Implemented JWT token changes for authentication
Added messaging route in the API gateway
Added messaging-related changes to support the new route
Resolved merge conflicts with dev branch (submodules, shared-utils dependencies)
Related
Issue: 2
Plaky: auth messaging
Related PRs (optional):
Testing
Verified JWT token generation and validation
Tested messaging route is accessible through the API gateway
Dependencies required for testing: MESSAGING_SERVICE_URL must be set (or default service URL must be reachable)
Important Notes (Optional)
Known limitations: None
Blockers: None
CI/CD issues unrelated to this PR: None
Dependencies required for testing: MESSAGING_SERVICE_URL environment variable
Workflow Checklist (Required)
Branch is up to date with dev
PR is from your branch → dev (no longer directly into main)
PR title follows convention (feat:, fix:, refactor:, etc.)
Plaky feature/bug name included above
Tagged @Team-Deepiri/support-team
Plaky task moved to "Needs QA"