change oidc TTL to minutes

Author: skadefro

OpenFlow/src/Config.ts

@@ -108,15 +108,12 @@ export class Config {
         Config.cache_store_redis_port = parseInt(Config.getEnv("cache_store_redis_port", "6379"));
         Config.cache_store_redis_password = Config.getEnv("cache_store_redis_password", "");
 
-        Config.oidc_access_token_ttl = parseInt(Config.getEnv("oidc_access_token_ttl", "28800"));
-        Config.oidc_authorization_code_ttl = parseInt(Config.getEnv("oidc_authorization_code_ttl", "28800"));
-        Config.oidc_client_credentials_ttl = parseInt(Config.getEnv("oidc_client_credentials_ttl", "28800"));
-        Config.oidc_refresh_token_ttl = parseInt(Config.getEnv("oidc_refresh_token_ttl", "1209600"));
-        Config.oidc_session_ttl = parseInt(Config.getEnv("oidc_session_ttl", "1209600"));
-
-        Config.oauth_token_cache_seconds = parseInt(Config.getEnv("oauth_token_cache_seconds", "60000"));
-        Config.oauth_access_token_lifetime = parseInt(Config.getEnv("oauth_access_token_lifetime", "604800"));
-        Config.oauth_refresh_token_lifetime = parseInt(Config.getEnv("oauth_refresh_token_lifetime", "604800"));
+        Config.oidc_access_token_ttl = parseInt(Config.getEnv("oidc_access_token_ttl", "480"));
+        Config.oidc_authorization_code_ttl = parseInt(Config.getEnv("oidc_authorization_code_ttl", "480"));
+        Config.oidc_client_credentials_ttl = parseInt(Config.getEnv("oidc_client_credentials_ttl", "480"));
+        Config.oidc_refresh_token_ttl = parseInt(Config.getEnv("oidc_refresh_token_ttl", "20160"));
+        Config.oidc_session_ttl = parseInt(Config.getEnv("oidc_session_ttl", "20160"));
+
         Config.api_rate_limit = Config.parseBoolean(Config.getEnv("api_rate_limit", "true"));
         Config.api_rate_limit_points = parseInt(Config.getEnv("api_rate_limit_points", "60"));
         Config.api_rate_limit_duration = parseInt(Config.getEnv("api_rate_limit_duration", "1"));
@@ -293,15 +290,12 @@ export class Config {
     public static cache_store_redis_port: number = parseInt(Config.getEnv("cache_store_redis_port", "6379"));
     public static cache_store_redis_password: string = Config.getEnv("cache_store_redis_password", "");
 
-    public static oidc_access_token_ttl: number = parseInt(Config.getEnv("oidc_access_token_ttl", "28800")); // 8 hours
-    public static oidc_authorization_code_ttl: number = parseInt(Config.getEnv("oidc_authorization_code_ttl", "28800")); // 8 hours
-    public static oidc_client_credentials_ttl: number = parseInt(Config.getEnv("oidc_client_credentials_ttl", "28800")); // 8 hours
-    public static oidc_refresh_token_ttl: number = parseInt(Config.getEnv("oidc_refresh_token_ttl", "1209600")); // 14 days in seconds
-    public static oidc_session_ttl: number = parseInt(Config.getEnv("oidc_session_ttl", "1209600")); // 14 days in seconds
+    public static oidc_access_token_ttl: number = parseInt(Config.getEnv("oidc_access_token_ttl", "480")); // 8 hours
+    public static oidc_authorization_code_ttl: number = parseInt(Config.getEnv("oidc_authorization_code_ttl", "480")); // 8 hours
+    public static oidc_client_credentials_ttl: number = parseInt(Config.getEnv("oidc_client_credentials_ttl", "480")); // 8 hours
+    public static oidc_refresh_token_ttl: number = parseInt(Config.getEnv("oidc_refresh_token_ttl", "20160")); // 14 days in seconds
+    public static oidc_session_ttl: number = parseInt(Config.getEnv("oidc_session_ttl", "20160")); // 14 days in seconds
 
-    public static oauth_token_cache_seconds: number = parseInt(Config.getEnv("oauth_token_cache_seconds", "60000"));
-    public static oauth_access_token_lifetime: number = parseInt(Config.getEnv("oauth_access_token_lifetime", "604800"));
-    public static oauth_refresh_token_lifetime: number = parseInt(Config.getEnv("oauth_refresh_token_lifetime", "604800"));
     public static oidc_cookie_key: string = Config.getEnv("oidc_cookie_key", "Y6SPiXCxDhAJbN7cbydMw5eX1wIrdy8PiWApqEcguss=");
     public static api_rate_limit: boolean = Config.parseBoolean(Config.getEnv("api_rate_limit", "true"));
     public static api_rate_limit_points: number = parseInt(Config.getEnv("api_rate_limit_points", "20"));

OpenFlow/src/OAuthProvider.ts

@@ -138,11 +138,11 @@ export class OAuthProvider {
                     AccessToken: 'jwt',
                 },
                 ttl: {
-                    AccessToken: Config.oidc_access_token_ttl,
-                    AuthorizationCode: Config.oidc_authorization_code_ttl,
-                    ClientCredentials: Config.oidc_client_credentials_ttl,
-                    RefreshToken: Config.oidc_refresh_token_ttl,
-                    Session: Config.oidc_session_ttl
+                    AccessToken: (Config.oidc_access_token_ttl * 60),
+                    AuthorizationCode: (Config.oidc_authorization_code_ttl * 60),
+                    ClientCredentials: (Config.oidc_client_credentials_ttl * 60),
+                    RefreshToken: (Config.oidc_refresh_token_ttl * 60),
+                    Session: (Config.oidc_session_ttl * 60)
                 },
                 jwks: jwks,
                 features: {