-
-
-
-
-
-
- auto_fix_high
- Auto-populate
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Auto Launch
-
Redirect to the auth provider automatically when navigating to the /login page
+
+
+ auto_fix_high
+ Auto-populate
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Used for connecting existing users. Once connected, users will be matched by a unique id from your SSO provider
+
+
+
+
+
Auto Launch
+
Redirect to the auth provider automatically when navigating to the login page
+
+
+
+
+
Auto Register
+
Automatically create new users after logging in
+
+
{{ $strings.ButtonSave }}
@@ -90,6 +102,22 @@ export default {
computed: {
authMethods() {
return this.authSettings.authActiveAuthMethods || []
+ },
+ matchingExistingOptions() {
+ return [
+ {
+ text: 'Do not match',
+ value: null
+ },
+ {
+ text: 'Match by email',
+ value: 'email'
+ },
+ {
+ text: 'Match by username',
+ value: 'username'
+ }
+ ]
}
},
methods: {
diff --git a/server/objects/settings/ServerSettings.js b/server/objects/settings/ServerSettings.js
index 781943b4..05a64d06 100644
--- a/server/objects/settings/ServerSettings.js
+++ b/server/objects/settings/ServerSettings.js
@@ -74,6 +74,8 @@ class ServerSettings {
this.authOpenIDClientSecret = ''
this.authOpenIDButtonText = 'Login with OpenId'
this.authOpenIDAutoLaunch = false
+ this.authOpenIDAutoRegister = false
+ this.authOpenIDMatchExistingBy = null
if (settings) {
this.construct(settings)
@@ -130,6 +132,8 @@ class ServerSettings {
this.authOpenIDClientSecret = settings.authOpenIDClientSecret || ''
this.authOpenIDButtonText = settings.authOpenIDButtonText || 'Login with OpenId'
this.authOpenIDAutoLaunch = !!settings.authOpenIDAutoLaunch
+ this.authOpenIDAutoRegister = !!settings.authOpenIDAutoRegister
+ this.authOpenIDMatchExistingBy = settings.authOpenIDMatchExistingBy || null
if (!Array.isArray(this.authActiveAuthMethods)) {
this.authActiveAuthMethods = ['local']
@@ -234,7 +238,9 @@ class ServerSettings {
authOpenIDClientID: this.authOpenIDClientID, // Do not return to client
authOpenIDClientSecret: this.authOpenIDClientSecret, // Do not return to client
authOpenIDButtonText: this.authOpenIDButtonText,
- authOpenIDAutoLaunch: this.authOpenIDAutoLaunch
+ authOpenIDAutoLaunch: this.authOpenIDAutoLaunch,
+ authOpenIDAutoRegister: this.authOpenIDAutoRegister,
+ authOpenIDMatchExistingBy: this.authOpenIDMatchExistingBy
}
}
@@ -263,7 +269,9 @@ class ServerSettings {
authOpenIDClientID: this.authOpenIDClientID, // Do not return to client
authOpenIDClientSecret: this.authOpenIDClientSecret, // Do not return to client
authOpenIDButtonText: this.authOpenIDButtonText,
- authOpenIDAutoLaunch: this.authOpenIDAutoLaunch
+ authOpenIDAutoLaunch: this.authOpenIDAutoLaunch,
+ authOpenIDAutoRegister: this.authOpenIDAutoRegister,
+ authOpenIDMatchExistingBy: this.authOpenIDMatchExistingBy
}
}