changes for FSA 35.0

Author: Fabien Coelho

tests/app.py

@@ -4,38 +4,44 @@
 import secret
 
 # create application with token, param and basic authentication
-app = fsa.Flask("app", FSA_MODE="dev", FSA_AUTH=["token", "param", "basic", "none"])
+app = fsa.Flask(
+    "app",
+    FSA_MODE="dev",
+    FSA_AUTH=["token", "param", "basic", "none"],
+)
 
 # authentication with randomly-generated passwords
-PASSDB: dict[str, str] = {login: app.hash_password(pwd) for login, pwd in secret.PASSES.items()}
+PASSDB: dict[str, str] = {
+    login: app.hash_password(pwd) for login, pwd in secret.PASSES.items()
+}
 app.get_user_pass(PASSDB.get)
 
 # admin group authorization
 ADMINS: set[str] = {"calvin", "susie"}
 app.group_check("ADMIN", ADMINS.__contains__)
 
 # login routes
-@app.get("/login", authorize="AUTH", auth="basic")
+@app.get("/login", authz="AUTH", authn="basic")
 def get_login(user: fsa.CurrentUser):
     return {"user": user, "token": app.create_token(user)}, 200
 
-@app.post("/login", authorize="AUTH", auth="param")
+@app.post("/login", authz="AUTH", authn="param")
 def post_login(user: fsa.CurrentUser):
     return {"user": user, "token": app.create_token(user)}, 201
 
 # identity routes
-@app.get("/who-am-i", authorize="AUTH")
+@app.get("/who-am-i", authz="AUTH")
 def get_who_am_i(user: fsa.CurrentUser, lang: fsa.Cookie = None):
     return {"user": user, "isadmin": user in ADMINS, "lang": lang}, 200
 
-@app.get("/admin", authorize="ADMIN")
+@app.get("/admin", authz="ADMIN")
 def get_admin(user: fsa.CurrentUser):
     return {"user": user, "isadmin": True}, 200
 
 # incredible open service for top-notch translations
 HELLO = {"it": "Ciao", "fr": "Salut", "en": "Hi", "ko": "안녕"}
 
-@app.get("/hello", authorize="OPEN")
+@app.get("/hello", authz="OPEN")
 def get_hello(lang: fsa.Cookie = "en"):
     return {"lang": lang, "hello": HELLO.get(lang, "Hi")}, 200
 
@@ -45,34 +51,34 @@ def get_hello(lang: fsa.Cookie = "en"):
 import model
 
 # FIXME could we drop fsa.jsonify?
-@app.get("/t0", authorize="OPEN")
+@app.get("/t0", authz="OPEN")
 def get_t0(t: fsa.JsonData):
     return fsa.jsonify(t)
 
-@app.post("/t0", authorize="OPEN")
+@app.post("/t0", authz="OPEN")
 def post_t0(t: fsa.JsonData):
     return fsa.jsonify(t)
 
-@app.get("/t1", authorize="OPEN")
+@app.get("/t1", authz="OPEN")
 def get_t1(t: model.Thing1):
     return fsa.jsonify(t)
 
-@app.post("/t1", authorize="OPEN")
+@app.post("/t1", authz="OPEN")
 def post_t1(t: model.Thing1):
     return fsa.jsonify(t)
 
-@app.get("/t2", authorize="OPEN")
+@app.get("/t2", authz="OPEN")
 def get_t2(t: model.Thing2):
     return fsa.jsonify(t)
 
-@app.post("/t2", authorize="OPEN")
+@app.post("/t2", authz="OPEN")
 def post_t2(t: model.Thing2):
     return fsa.jsonify(t)
 
-@app.get("/t3", authorize="OPEN")
+@app.get("/t3", authz="OPEN")
 def get_t3(t: model.Thing3):
     return fsa.jsonify(t)
 
-@app.post("/t3", authorize="OPEN")
+@app.post("/t3", authz="OPEN")
 def post_t3(t: model.Thing3):
     return fsa.jsonify(t)

tests/app2.py

@@ -17,19 +17,19 @@ def create_app():
     app.group_check("admin", ADMIN.__contains__)
 
     # 4 routes
-    @app.get("/open", authorize="OPEN")
+    @app.get("/open", authz="OPEN")
     def get_no_auth(lang: fsa.Cookie = "de"):
         return fsa.jsonify(HELLO.get(lang, "Hey"))
 
-    @app.get("/authenticated", authorize="AUTH")
+    @app.get("/authenticated", authz="AUTH")
     def get_authenticated(user: fsa.CurrentUser, lang: fsa.Cookie = "de"):
         return fsa.jsonify(HELLO.get(lang, "Hey") + " " + user)
 
-    @app.get("/only-admin", authorize="admin")
+    @app.get("/only-admin", authz="admin")
     def get_only_admin():
         return fsa.jsonify("Salut administrateur !")
 
-    @app.get("/add", authorize="OPEN")
+    @app.get("/add", authz="OPEN")
     def get_add(i: int, j: int):
         return {"sum": i + j}