initial version of env vars for heroku

Author: Bernhard Grünewaldt

Procfile

@@ -1 +1 @@
-web: python heroku.py -e heroku -p $PORT --authType allGitHubUsers --owner comsysto --repository github-pages-basic-auth-proxy --obfuscator 086e41eb6ff7a50ad33ad742dbaa2e70b75740c4950fd5bbbdc71981e6fe88e3
+web: python heroku.py -e heroku -p $PORT

app.json

@@ -4,5 +4,24 @@
   "image": "heroku/python",
   "repository": "https://github.com/comsysto/github-pages-basic-auth-proxy",
   "keywords": ["python", "gh-pages" ],
-  "addons": [  ]
+  "success_url": "/install-success",
+  "addons": [  ],
+  "env": {
+    "PROXY_AUTH_TYPE": {
+      "description": "The authType. allGitHubUsers or onlyGitHubOrgUsers.",
+      "value": "allGitHubUsers"
+    },
+    "GITHUB_REPOSITORY_OWNER": {
+      "description": "The owner of the GitHub repository you want to proxy",
+      "value": "comsysto"
+    },
+    "GITHUB_REPOSITORY_NAME": {
+      "description": "The name of the GitHub repository you want to proxy",
+      "value": "github-pages-basic-auth-proxy"
+    },
+    "GITHUB_REPOSITORY_OBFUSCATOR": {
+      "description": "The name of the GitHub repository you want to proxy",
+      "value": "086e41eb6ff7a50ad33ad742dbaa2e70b75740c4950fd5bbbdc71981e6fe88e3"
+    }
+  }
 }

cs_proxy/proxy.py

@@ -23,7 +23,7 @@ def main():
     parser.add_argument("-ghr", "--repository", help='the repository name.')
     parser.add_argument("-obf", "--obfuscator", help='the subfolder-name in gh-pages branch used as obfuscator')
     parser.add_argument("-p", "--port", help='the port to run proxy e.g. 8881')
-    parser.add_argument("-a", "--authType", help='how should users auth.', choices=['allGitHubUsers', 'onlyGitHubOrgUsers'] )
+    parser.add_argument("-a", "--authType", help='how should users auth.', choices=['allGitHubUsers', 'onlyGitHubOrgUsers'], required=False )
 
 
     args = parser.parse_args()
@@ -38,6 +38,15 @@ def main():
 
         sys.exit(1)
 
+    if args.environment == 'heroku':
+        args = parser.parse_args(['--environment', 'heroku',
+                                  '--port',       os.environ.get("PORT", 5000),
+                                  '--authType',   os.environ.get("PROXY_AUTH_TYPE", 'allGitHubUsers'),
+                                  '--owner',      os.environ.get("GITHUB_REPOSITORY_OWNER", 'comsysto'),
+                                  '--repository', os.environ.get("GITHUB_REPOSITORY_NAME", 'github-pages-basic-auth-proxy'),
+                                  '--obfuscator', os.environ.get("GITHUB_REPOSITORY_OBFUSCATOR", '086e41eb6ff7a50ad33ad742dbaa2e70b75740c4950fd5bbbdc71981e6fe88e3')
+                                 ])
+
     run_proxy(args)
 
 #
@@ -136,6 +145,10 @@ def error500(error):
     def hello():
         return 'ok'
 
+    @route('/install-success')
+    def hello():
+        return 'The Auth Basic GitHub Pages Proxy was installed successfully.'
+
     #
     # make args available in auth callback
     #
@@ -159,7 +172,7 @@ def proxy_trough_root_page():
     if args.environment == 'wsgi':
         run(host='localhost', port=args.port, debug=True)
     if args.environment == 'heroku':
-        run(host="0.0.0.0", port=int(os.environ.get("PORT", 5000)))
+        run(host="0.0.0.0", port=int(args.port))
     else:
         run(server='cgi')