Switch to unified view

a/AlluraTesting/alluratest/controller.py b/AlluraTesting/alluratest/controller.py
...
...
115
        ming.orm.session(self.token).flush()
115
        ming.orm.session(self.token).flush()
116
116
117
    def set_api_token(self, token):
117
    def set_api_token(self, token):
118
        self.token = token
118
        self.token = token
119
119
120
    def api_post(self, path, api_key=None, api_timestamp=None, api_signature=None,
120
    def _api_getpost(self, method, path, api_key=None, api_timestamp=None, api_signature=None,
121
                 wrap_args=None, **params):
121
                 wrap_args=None, **params):
122
        if wrap_args:
122
        if wrap_args:
123
            params = {wrap_args: params}
123
            params = {wrap_args: params}
124
        params = variabledecode.variable_encode(params, add_repetitions=False)
124
        params = variabledecode.variable_encode(params, add_repetitions=False)
125
        if api_key: params['api_key'] = api_key
125
        if api_key: params['api_key'] = api_key
126
        if api_timestamp: params['api_timestamp'] = api_timestamp
126
        if api_timestamp: params['api_timestamp'] = api_timestamp
127
        if api_signature: params['api_signature'] = api_signature
127
        if api_signature: params['api_signature'] = api_signature
128
        params = self.token.sign_request(path, params)
128
        params = self.token.sign_request(path, params)
129
130
        fn = self.app.post if method=='POST' else self.app.get
131
129
        response = self.app.post(
132
        response = fn(
130
            str(path),
133
            str(path),
131
            params=params,
134
            params=params,
132
            status=[200, 302, 400, 403, 404])
135
            status=[200, 302, 400, 403, 404])
133
        if response.status_int == 302:
136
        if response.status_int == 302:
134
            return response.follow()
137
            return response.follow()
135
        else:
138
        else:
136
            return response
139
            return response
140
141
    def api_get(self, path, api_key=None, api_timestamp=None, api_signature=None,
142
                 wrap_args=None, **params):
143
        return self._api_getpost('GET', path, api_key, api_timestamp, api_signature, wrap_args, **params)
144
145
    def api_post(self, path, api_key=None, api_timestamp=None, api_signature=None,
146
                 wrap_args=None, **params):
147
        return self._api_getpost('POST', path, api_key, api_timestamp, api_signature, wrap_args, **params)