@@ -40,54 +40,80 @@ def get_pkce_params(self):
4040 return pkce_code_params
4141 return {}
4242
43- def get_auth_params (self , request , action ):
43+ def get_auth_params (self ):
4444 """
4545 Returns a dictionary of additional parameters passed to the OAuth2
4646 redirect URL. Additional -- so no need to pass the standard `client_id`,
4747 `redirect_uri`, `response_type`.
4848 """
4949 settings = self .get_settings ()
5050 ret = dict (settings .get ("AUTH_PARAMS" , {}))
51+ return ret
52+
53+ def get_auth_params_from_request (self , request , action ):
54+ """
55+ Returns a dictionary of additional parameters passed to the OAuth2
56+ redirect URL. Additional -- so no need to pass the standard `client_id`,
57+ `redirect_uri`, `response_type`.
58+ """
59+ ret = self .get_auth_params ()
5160 dynamic_auth_params = request .GET .get ("auth_params" , None )
5261 if dynamic_auth_params :
5362 ret .update (dict (parse_qsl (dynamic_auth_params )))
5463 return ret
5564
56- def get_scope (self , request ):
65+ def get_default_scope (self ):
66+ """
67+ Returns the default scope to use.
68+ """
69+ return []
70+
71+ def get_scope (self ):
72+ """
73+ Returns the scope to use, taking settings `SCOPE` into consideration.
74+ """
5775 settings = self .get_settings ()
5876 scope = list (settings .get ("SCOPE" , self .get_default_scope ()))
77+ return scope
78+
79+ def get_scope_from_request (self , request ):
80+ """
81+ Returns the scope to use for the given request.
82+ """
83+ scope = self .get_scope ()
5984 dynamic_scope = request .GET .get ("scope" , None )
6085 if dynamic_scope :
6186 scope .extend (dynamic_scope .split ("," ))
6287 return scope
6388
64- def get_default_scope (self ):
65- return []
66-
6789 def get_oauth2_adapter (self , request ):
6890 return self .oauth2_adapter_class (request )
6991
7092 def get_redirect_from_request_kwargs (self , request ):
7193 kwargs = super ().get_redirect_from_request_kwargs (request )
72- kwargs ["scope" ] = self .get_scope (request )
94+ kwargs ["scope" ] = self .get_scope_from_request (request )
7395 action = request .GET .get ("action" , AuthAction .AUTHENTICATE )
74- kwargs ["auth_params" ] = self .get_auth_params (request , action )
96+ kwargs ["auth_params" ] = self .get_auth_params_from_request (request , action )
7597 return kwargs
7698
7799 def redirect (self , request , process , next_url = None , data = None , ** kwargs ):
78100 app = self .app
79101 oauth2_adapter = self .get_oauth2_adapter (request )
80102 client = oauth2_adapter .get_client (request , app )
81103 auth_url = oauth2_adapter .authorize_url
82- auth_params = kwargs ["auth_params" ]
104+ auth_params = kwargs .get ("auth_params" )
105+ if auth_params is None :
106+ auth_params = self .get_auth_params ()
83107 pkce_params = self .get_pkce_params ()
84108 code_verifier = pkce_params .pop ("code_verifier" , None )
85109 auth_params .update (pkce_params )
86110 if code_verifier :
87111 request .session ["pkce_code_verifier" ] = code_verifier
88112
89113 client .state = self .stash_redirect_state (request , process , next_url , data )
90- scope = kwargs ["scope" ]
114+ scope = kwargs .get ("scope" )
115+ if scope is None :
116+ scope = self .get_scope ()
91117 try :
92118 return HttpResponseRedirect (
93119 client .get_redirect_url (auth_url , scope , auth_params )
0 commit comments