Merge branch 'main' of https://github.com/authorizerdev/authorizer into feat/twitter-login

This commit is contained in:
Lakhan Samani 2022-08-13 12:37:16 +05:30
commit 4427cb7301

8
server/env/env.go vendored
View File

@ -357,28 +357,28 @@ func InitAllEnv() error {
if val, ok := envData[constants.EnvKeyLinkedInClientID]; !ok || val == "" { if val, ok := envData[constants.EnvKeyLinkedInClientID]; !ok || val == "" {
envData[constants.EnvKeyLinkedInClientID] = osLinkedInClientID envData[constants.EnvKeyLinkedInClientID] = osLinkedInClientID
} }
if osFacebookClientID != "" && envData[constants.EnvKeyLinkedInClientID] != osFacebookClientID { if osLinkedInClientID != "" && envData[constants.EnvKeyLinkedInClientID] != osLinkedInClientID {
envData[constants.EnvKeyLinkedInClientID] = osLinkedInClientID envData[constants.EnvKeyLinkedInClientID] = osLinkedInClientID
} }
if val, ok := envData[constants.EnvKeyLinkedInClientSecret]; !ok || val == "" { if val, ok := envData[constants.EnvKeyLinkedInClientSecret]; !ok || val == "" {
envData[constants.EnvKeyLinkedInClientSecret] = osLinkedInClientSecret envData[constants.EnvKeyLinkedInClientSecret] = osLinkedInClientSecret
} }
if osFacebookClientSecret != "" && envData[constants.EnvKeyLinkedInClientSecret] != osFacebookClientSecret { if osLinkedInClientSecret != "" && envData[constants.EnvKeyLinkedInClientSecret] != osLinkedInClientSecret {
envData[constants.EnvKeyLinkedInClientSecret] = osLinkedInClientSecret envData[constants.EnvKeyLinkedInClientSecret] = osLinkedInClientSecret
} }
if val, ok := envData[constants.EnvKeyAppleClientID]; !ok || val == "" { if val, ok := envData[constants.EnvKeyAppleClientID]; !ok || val == "" {
envData[constants.EnvKeyAppleClientID] = osAppleClientID envData[constants.EnvKeyAppleClientID] = osAppleClientID
} }
if osFacebookClientID != "" && envData[constants.EnvKeyAppleClientID] != osFacebookClientID { if osAppleClientID != "" && envData[constants.EnvKeyAppleClientID] != osAppleClientID {
envData[constants.EnvKeyAppleClientID] = osAppleClientID envData[constants.EnvKeyAppleClientID] = osAppleClientID
} }
if val, ok := envData[constants.EnvKeyAppleClientSecret]; !ok || val == "" { if val, ok := envData[constants.EnvKeyAppleClientSecret]; !ok || val == "" {
envData[constants.EnvKeyAppleClientSecret] = osAppleClientSecret envData[constants.EnvKeyAppleClientSecret] = osAppleClientSecret
} }
if osFacebookClientSecret != "" && envData[constants.EnvKeyAppleClientSecret] != osFacebookClientSecret { if osAppleClientSecret != "" && envData[constants.EnvKeyAppleClientSecret] != osAppleClientSecret {
envData[constants.EnvKeyAppleClientSecret] = osAppleClientSecret envData[constants.EnvKeyAppleClientSecret] = osAppleClientSecret
} }