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.

Sign up for GitHub

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

[GH-183] Add jaas support #219

Open
wants to merge 69 commits into
base: master
Choose a base branch
from
Open

[GH-183] Add jaas support #219

Show file tree
Hide file tree
Changes from 68 commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
30a2ff8
Add contributing information to README
jasonblais Jul 13, 2020
74a6f0c
Update README.md
jasonblais Jul 13, 2020
18b443c
Create CONTRIBUTING.md
jasonblais Jul 13, 2020
0a41971
Update CONTRIBUTING.md
justinegeffen Jan 13, 2021
e9e710d
Apply suggestions from code review
justinegeffen Jan 13, 2021
79dc804
Update CONTRIBUTING.md
justinegeffen Jan 13, 2021
a43d1ec
Add support for JaaS
cristifg Mar 17, 2021
6b6c268
Address review comments
cristifg Mar 29, 2021
d4f14bb
Fix compatibility mode
cristifg Apr 21, 2021
0e3394c
Address review comments
cristifg Jun 2, 2021
01e20f6
Move plugin struct definitions to model.go
cristifg Jun 2, 2021
a476e04
Address review comments
cristifg Jun 8, 2021
4d07154
Keep manifest version 2.0.0
cristifg Jun 14, 2021
cd1edfc
Remove generated file from commit
cristifg Jun 14, 2021
f4bd5f8
Fix lint issue
cristifg Jul 27, 2021
6f78a25
Fix lint issue
cristifg Jul 27, 2021
cc5cf92
Add ts manifest
cristifg Jul 27, 2021
97b6e79
Merge remote-tracking branch 'origin/master' into theunafraid-master
hanzei Jan 25, 2022
250d91d
pull from jasonblais-contribute
raghavaggarwal2308 Jun 13, 2022
a1f9a18
Merge branch 'master' of github.com:theunafraid/mattermost-plugin-jit…
raghavaggarwal2308 Jun 13, 2022
9546ad0
Merge branch 'master' of github.com:mattermost/mattermost-plugin-jits…
raghavaggarwal2308 Jun 17, 2022
2ad938a
[MI-1865] Fixed error in jaas/index.tsx file
raghavaggarwal2308 Jun 17, 2022
ba58fb5
[MI-1865]Added translation
raghavaggarwal2308 Jun 24, 2022
683ef17
[MI-1865]Upgraded UI
raghavaggarwal2308 Jun 25, 2022
947dbaa
[MI-1865]Fixes
raghavaggarwal2308 Jun 27, 2022
06fb874
[MI-1865]Updatedd description of private key
raghavaggarwal2308 Jun 27, 2022
4dae89d
[MI-1865]Removed redundant jaas directory
raghavaggarwal2308 Jun 27, 2022
fd53d20
removed extra console.log statements
raghavaggarwal2308 Jun 28, 2022
e5ca98e
[MI-1865]Review fixes
raghavaggarwal2308 Jun 30, 2022
37f5b93
[MI-1865]Review fixes
raghavaggarwal2308 Jul 2, 2022
467da80
[MI-1865]Review fixes and restored deleted code
raghavaggarwal2308 Jul 5, 2022
3e26435
Self review fix
raghavaggarwal2308 Jul 5, 2022
252c27a
[MI-1917]: Add radio field and input field components
ayusht2810 Jul 6, 2022
c00fcfb
[MI-1917] Review fixes
ayusht2810 Jul 7, 2022
ed375b9
[MI-1865]Review fixes
raghavaggarwal2308 Jul 8, 2022
612f7d2
[MI-1865]Review fixes
raghavaggarwal2308 Jul 8, 2022
139ae91
[MI-1865]Review fixes
raghavaggarwal2308 Jul 11, 2022
2dc0256
[MI-1917] Review fixes 2
ayusht2810 Jul 11, 2022
94aafca
[MI-1917] Pull from MI-1865
ayusht2810 Jul 11, 2022
cab2c8b
[MI-1917] Fix TS error
ayusht2810 Jul 11, 2022
5254536
Merge pull request #1 from Brightscout/MI-1865
raghavaggarwal2308 Jul 11, 2022
59880af
[MI-1865] Fixed camera and microphone issue
raghavaggarwal2308 Jul 12, 2022
860a2d3
[MI-1917] Review fixes 3
ayusht2810 Jul 12, 2022
dc91a52
[MI-1917] Correct prop name
ayusht2810 Jul 12, 2022
4b9b0ba
[MI-1865] Fixed failing ci test
raghavaggarwal2308 Jul 12, 2022
ec11210
Removed code to turn off camera and mic by default
raghavaggarwal2308 Jul 12, 2022
ee26016
Fixed lint error
raghavaggarwal2308 Jul 12, 2022
bb91613
Merge pull request #4 from Brightscout/MI-1865
raghavaggarwal2308 Jul 12, 2022
068b8de
[MI-1917] Review fixes 4
ayusht2810 Jul 13, 2022
e9ee058
[MI-1917] Review fixes 5
ayusht2810 Jul 14, 2022
58adbc3
Merge pull request #3 from Brightscout/MI-1917
ayusht2810 Jul 15, 2022
5ab46bf
[MI-2097]:Fixed review fixes given by mattermost on Jaas Support PR (#5)
Kshitij-Katiyar Sep 9, 2022
5d7154d
fixed lint errors
Kshitij-Katiyar Sep 9, 2022
8dd04ef
Merge branch 'master' of github.com:mattermost/mattermost-plugin-jits…
raghavaggarwal2308 Nov 17, 2022
b33b88f
[MI-2371] updated golang.org/x/sys
raghavaggarwal2308 Nov 21, 2022
c13ed5c
Merge pull request #7 from Brightscout/MI-2371_fix
raghavaggarwal2308 Nov 22, 2022
9966780
[MI-2453]:Fixed review comments given by mattermost team on Jitsi PR …
Kshitij-Katiyar Dec 12, 2022
ea0313a
[MI-2589]: Fixed the bug of updating the redux state after login and …
Kshitij-Katiyar Jan 12, 2023
0ddc924
[MI-2735]:Added check for loaded script (#12)
Kshitij-Katiyar Feb 8, 2023
2e76cd9
Merge branch 'master' of github.com:mattermost/mattermost-plugin-jits…
raghavaggarwal2308 Jan 17, 2024
4f2a796
Fix lint errors
raghavaggarwal2308 Jan 17, 2024
a7cf239
Fix test cases
raghavaggarwal2308 Jan 17, 2024
6cc34c1
Fix build errors
raghavaggarwal2308 Jan 19, 2024
1d39e73
Merge branch 'master' of github.com:mattermost/mattermost-plugin-jits…
raghavaggarwal2308 Mar 8, 2024
915b5e3
Update webapp/tsconfig.json
raghavaggarwal2308 Apr 30, 2024
425a001
Merge branch 'master' of github.com:mattermost-community/mattermost-p…
raghavaggarwal2308 Jul 8, 2024
89b261c
Fix lint error
raghavaggarwal2308 Jul 8, 2024
a7d92c6
[MM-552] Fix build error
raghavaggarwal2308 Jul 8, 2024
97af4ac
Fix issue: jaas meeting not getting created with appbar button when j…
raghavaggarwal2308 Jul 13, 2024
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ server/manifest.go

assets/i18n/translate.*.json

public/jaas
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this gitignored?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make dist will automatically generate folder named Jaas inside the public directory


# Jetbrains
.idea/

3 changes: 2 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ module github.com/mattermost/mattermost-plugin-jitsi
go 1.21

require (
github.com/cristalhq/jwt/v2 v2.0.0
github.com/cristalhq/jwt/v3 v3.1.0
github.com/google/uuid v1.5.0
github.com/gorilla/mux v1.8.1
github.com/mattermost/mattermost/server/public v0.0.12
github.com/nicksnyder/go-i18n/v2 v2.3.0
github.com/pkg/errors v0.9.1
Expand Down
6 changes: 4 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp
github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/cristalhq/jwt/v2 v2.0.0 h1:CxleHxkZQQ5J0siUQ2gwZrhAysmh8Ddh/R06AzCiYao=
github.com/cristalhq/jwt/v2 v2.0.0/go.mod h1:nQT19GqJbrWubmI+ULE8PYsR1GCbwI5hAg1nG+9AbTg=
github.com/cristalhq/jwt/v3 v3.1.0 h1:iLeL9VzB0SCtjCy9Kg53rMwTcrNm+GHyVcz2eUujz6s=
github.com/cristalhq/jwt/v3 v3.1.0/go.mod h1:XOnIXst8ozq/esy5N1XOlSyQqBd+84fxJ99FK+1jgL8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down Expand Up @@ -69,6 +69,8 @@ github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
Expand Down
57 changes: 46 additions & 11 deletions plugin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,21 @@
"settings_schema": {
"settings": [
{
"key": "JitsiURL",
"display_name": "Jitsi Server URL:",
"type": "text",
"help_text": "The URL for your Jitsi server, for example https://jitsi.example.com. Defaults to https://meet.jit.si, which is the public server provided by Jitsi.",
"placeholder": "https://meet.jit.si",
"default": "https://meet.jit.si"
"key": "ServerType",
"display_name": "Server:",
"type": "radio",
"help_text": "Select the type of jitsi server you want to use.",
"default": "jitsi",
"options": [
{
"display_name": "Jitsi",
"value": "jitsi"
},
{
"display_name": "JaaS",
"value": "jaas"
}
]
},
{
"key": "JitsiEmbedded",
Expand All @@ -33,6 +42,21 @@
"help_text": "(Experimental) When true, Jitsi video is embedded as a floating window inside Mattermost by default. Users can override this setting with '/jitsi settings'."
},
{
"key": "JitsiCompatibilityMode",
"display_name": "Enable Compatibility Mode:",
"type": "bool",
"help_text": "(Insecure) If your Jitsi server is not compatible with this plugin, include the JavaScript API hosted on your Jitsi server directly in Mattermost instead of the default API version provided by the plugin. **WARNING:** Enabling this setting can compromise the security of your Mattermost system, if your Jitsi server is not fully trusted and allows direct modification of program files. Use with caution.",
"default": false
},
{
"key": "JitsiURL",
"display_name": "Jitsi Server URL:",
"type": "text",
"help_text": "The URL for your Jitsi server, for example https://jitsi.example.com. Defaults to https://meet.jit.si, which is the public server provided by Jitsi.",
"placeholder": "https://meet.jit.si",
"default": "https://meet.jit.si"
},
{
"key": "JitsiPrejoinPage",
"display_name": "Show pre-join page:",
"type": "bool",
Expand Down Expand Up @@ -89,11 +113,22 @@
"default": 30
},
{
"key": "JitsiCompatibilityMode",
"display_name": "Enable Compatibility Mode:",
"type": "bool",
"help_text": "(Insecure) If your Jitsi server is not compatible with this plugin, include the JavaScript API hosted on your Jitsi server directly in Mattermost instead of the default API version provided by the plugin. **WARNING:** Enabling this setting can compromise the security of your Mattermost system, if your Jitsi server is not fully trusted and allows direct modification of program files. Use with caution.",
"default": false
"key": "JaaSAppID",
"display_name": "AppID for JaaS Authentication:",
"type": "text",
"help_text": "Specify your JaaS AppID. You can get the AppID from https://jaas.8x8.vc/#/apikeys."
},
{
"key": "JaaSApiKey",
"display_name": "Api key ID for JaaS Authentication:",
"type": "text",
"help_text": "Specify your JaaS Api key ID. You can get the Api key ID from https://jaas.8x8.vc/#/apikeys."
},
{
"key": "JaaSPrivateKey",
"display_name": "RSA Private key for JaaS Authentication:",
"type": "longtext",
"help_text": "Specify your JaaS private key. You can get the private key by generating an API key pair from https://jaas.8x8.vc/#/apikeys OR from https://jaas.8x8.vc/#/start-guide in the Api Key section. (NOTE: While generating the key manually make sure to set the size to be 2048 and not 4096)."
}
]
}
Expand Down
Loading