Merge pull request #173 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-merge-path-params-into-querystring to release/2.2.0

* commit '035ad926c85b8e7d5a341253253a3453ac0e4ef9':
  改进:把path中的params合并到querystring中,这样允许在listItemFilter中访问这些params参数,并且实现对数据的过滤
This commit is contained in:
李泽玺
2018-09-10 10:17:56 +08:00
3 changed files with 34 additions and 41 deletions
-21
View File
@@ -53,33 +53,12 @@ func (dispatcher *DBModelDispatcher) ContextKeywordPlural() []string {
return nil
}
/*
const (
AUTH_TOKEN = appctx.AppContextKey("X_AUTH_TOKEN")
)
*/
func (dispatcher *DBModelDispatcher) Filter(f appsrv.FilterHandler) appsrv.FilterHandler {
return auth.Authenticate(f)
/*return func(ctx context.Context, w http.ResponseWriter, r *http.Request) {
tokenStr := r.Header.Get("X-Auth-Token")
if len(tokenStr) == 0 {
httperrors.UnauthorizedError(w, "Unauthorized")
return
}
token, err := auth.Verify(tokenStr)
if err != nil {
log.Errorf("Verify token failed: %s", err)
httperrors.UnauthorizedError(w, "InvalidToken")
return
}
ctx = context.WithValue(ctx, AUTH_TOKEN, token)
f(ctx, w, r)
} */
}
func fetchUserCredential(ctx context.Context) mcclient.TokenCredential {
// token, ok := ctx.Value(AUTH_TOKEN).(mcclient.TokenCredential)
token := auth.FetchUserCredential(ctx)
if token == nil {
log.Fatalf("user token credential not found?")