1 files changed, 4 insertions, 45 deletions

diff --git a/src/main/java/com/mxgraph/online/GitHubAuthServlet.java b/src/main/java/com/mxgraph/online/GitHubAuthServlet.java
index c1758fe7..610cf4ce 100644
--- a/src/main/java/com/mxgraph/online/GitHubAuthServlet.java
+++ b/src/main/java/com/mxgraph/online/GitHubAuthServlet.java
@@ -18,42 +18,16 @@ public class GitHubAuthServlet extends AbsAuthServlet
 	{
 		if (CONFIG == null)
 		{
-			String clientSerets, clientIds;
-			
-			try
-			{
-				clientSerets = Utils
-						.readInputStream(getServletContext()
-								.getResourceAsStream(getSecretPath()))
-						.replaceAll("\n", "");
-			}
-			catch (IOException e)
-			{
-				throw new RuntimeException("Client secrets path invalid");
-			}
-
-			try
-			{
-				clientIds = Utils
-						.readInputStream(getServletContext()
-								.getResourceAsStream(getIdPath()))
-						.replaceAll("\n", "");
-			}
-			catch (IOException e)
-			{
-				throw new RuntimeException("Client IDs path invalid");
-			}
+			String clientSerets = SecretFacade.getSecret(CLIENT_SECRET_FILE_PATH, getServletContext()), 
+					clientIds = SecretFacade.getSecret(CLIENT_ID_FILE_PATH, getServletContext());
 			
 			CONFIG = new Config(clientIds, clientSerets);
 
 			try
 			{
-				CONFIG.AUTH_SERVICE_URL = Utils
-						.readInputStream(getServletContext()
-								.getResourceAsStream(getServiceUrlPath()))
-						.replaceAll("\n", "");
+				CONFIG.AUTH_SERVICE_URL = SecretFacade.getSecret(AUTH_SERVICE_URL_FILE_PATH, getServletContext());
 			}
-			catch (IOException e)
+			catch (Exception e)
 			{
 				CONFIG.AUTH_SERVICE_URL = "https://github.com/login/oauth/access_token";
 			}
@@ -64,21 +38,6 @@ public class GitHubAuthServlet extends AbsAuthServlet
 		return CONFIG;
 	}
 
-	protected String getSecretPath()
-	{
-		return AbsAuthServlet.SECRETS_DIR_PATH + CLIENT_SECRET_FILE_PATH;
-	}
-
-	protected String getIdPath()
-	{
-		return AbsAuthServlet.SECRETS_DIR_PATH + CLIENT_ID_FILE_PATH;
-	}
-
-	protected String getServiceUrlPath()
-	{
-		return AbsAuthServlet.SECRETS_DIR_PATH + AUTH_SERVICE_URL_FILE_PATH;
-	}
-
 	public GitHubAuthServlet()
 	{
 		super();