First pass

1 files changed, 19 insertions, 9 deletions

diff --git a/src/main/java/org/traccar/model/Server.java b/src/main/java/org/traccar/model/Server.java
index 4c6e10b5e..b790ca472 100644
--- a/src/main/java/org/traccar/model/Server.java
+++ b/src/main/java/org/traccar/model/Server.java
@@ -17,15 +17,13 @@ package org.traccar.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import org.traccar.Main;
-import org.traccar.api.security.OpenIDProvider;
 import org.traccar.storage.QueryIgnore;
 import org.traccar.storage.StorageName;
 
 @StorageName("tc_servers")
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Server extends ExtendedModel implements UserRestrictions {
-    
+
     private boolean registration;
 
     public boolean getRegistration() {
@@ -264,15 +262,27 @@ public class Server extends ExtendedModel implements UserRestrictions {
         this.newServer = newServer;
     }
 
+    private boolean openIdEnabled;
+
+    @QueryIgnore
+    public boolean getOpenIdEnabled() {
+        return openIdEnabled;
+    }
+
+    @QueryIgnore
+    public void setOpenIdEnabled(boolean openIdEnabled) {
+        this.openIdEnabled = openIdEnabled;
+    }
+
+    private boolean openIdForce;
+
     @QueryIgnore
-    public boolean getOidcEnabled() {
-        OpenIDProvider oidc = Main.getInjector().getInstance(OpenIDProvider.class);
-        return oidc != null;
+    public boolean getOpenIdForce() {
+        return openIdForce;
     }
 
     @QueryIgnore
-    public boolean getOidcForce() {
-        OpenIDProvider oidc = Main.getInjector().getInstance(OpenIDProvider.class);
-        return oidc != null && oidc.force;
+    public void setOpenIdForce(boolean openIdForce) {
+        this.openIdForce = openIdForce;
     }
 }