Add saml private key to gitignore, remove unused constants (#27391)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
7d06ac8812
Коммит
a624c6dc87
1
server/.gitignore
поставляемый
1
server/.gitignore
поставляемый
@@ -12,6 +12,7 @@ mattermost.mattermost-license
|
|||||||
config/mattermost.mattermost-license
|
config/mattermost.mattermost-license
|
||||||
config/config.json
|
config/config.json
|
||||||
config/*.crt
|
config/*.crt
|
||||||
|
config/*.key
|
||||||
|
|
||||||
web/static/js/bundle*.js
|
web/static/js/bundle*.js
|
||||||
web/static/js/bundle*.js.map
|
web/static/js/bundle*.js.map
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ package app
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/golang-jwt/jwt/v5"
|
"github.com/golang-jwt/jwt/v5"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
@@ -14,10 +13,6 @@ import (
|
|||||||
"github.com/mattermost/mattermost/server/v8/channels/store"
|
"github.com/mattermost/mattermost/server/v8/channels/store"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
|
||||||
JWTDefaultTokenExpiration = 7 * 24 * time.Hour // 7 days of expiration
|
|
||||||
)
|
|
||||||
|
|
||||||
func (ch *Channels) License() *model.License {
|
func (ch *Channels) License() *model.License {
|
||||||
return ch.srv.License()
|
return ch.srv.License()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/golang-jwt/jwt/v5"
|
"github.com/golang-jwt/jwt/v5"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
@@ -24,8 +23,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
LicenseEnv = "MM_LICENSE"
|
LicenseEnv = "MM_LICENSE"
|
||||||
JWTDefaultTokenExpiration = 7 * 24 * time.Hour // 7 days of expiration
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// JWTClaims custom JWT claims with the needed information for the
|
// JWTClaims custom JWT claims with the needed information for the
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user