-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Aurelien Bondis
committed
Sep 15, 2015
1 parent
79e90e9
commit e9e5d22
Showing
6 changed files
with
130 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
#! /usr/bin/env python | ||
# -*- coding: utf-8 -*- | ||
# vim:fenc=utf-8 | ||
from jeto import db | ||
|
||
|
||
class APIKeys(db.Model): | ||
__tablename__ = 'api_keys' | ||
id = db.Column(db.Integer, primary_key=True) | ||
name = db.Column(db.String) | ||
comment = db.Column(db.String) | ||
user_id = db.Column( | ||
db.Integer, | ||
db.ForeignKey('user.id') | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
# -=- encoding: utf-8 -=- | ||
from flask import request | ||
|
||
from flask.ext.login import current_user | ||
from flask.ext.restful import fields, marshal_with | ||
|
||
from jeto import db | ||
|
||
from jeto.models.api import APIKeys | ||
from jeto.services import RestrictedResource # , adminAuthenticate | ||
from jeto.services.users import user_fields | ||
from uuid import uuid4 | ||
|
||
|
||
json_headers = {'Content-Type': 'application/json', | ||
'Accept': 'application/json'} | ||
|
||
api_key_fields = { | ||
'id': fields.Integer, | ||
'name': fields.String, | ||
'user': fields.Nested(user_fields), | ||
} | ||
|
||
|
||
class APIKeyApi(RestrictedResource): | ||
@marshal_with(api_key_fields, envelope='keys') | ||
def get(self, id=None): | ||
"""Retrieve a list of API keys""" | ||
if id is not None: | ||
return APIKeys.query.get(id) | ||
marsh = APIKeys.query.all() | ||
return marsh | ||
|
||
def post(self): | ||
query = request.args | ||
comment = query.get('comment') | ||
user = current_user | ||
api_key = APIKeys() | ||
api_key.name = unicode(uuid4()) | ||
api_key.user = user | ||
api_key.name = comment or "Random API Key" | ||
db.session.add(api_key) | ||
db.session.commit() | ||
|
||
def delete(self, id): | ||
"""delete API Key""" | ||
key = APIKeys.query.get(id) | ||
db.session.delete(key) | ||
db.session.commit() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
"""empty message | ||
Revision ID: 12edd6e32e34 | ||
Revises: 3c70b82ce4e8 | ||
Create Date: 2015-09-15 20:49:55.501088 | ||
""" | ||
|
||
# revision identifiers, used by Alembic. | ||
revision = '12edd6e32e34' | ||
down_revision = '3c70b82ce4e8' | ||
|
||
from alembic import op | ||
import sqlalchemy as sa | ||
|
||
|
||
def upgrade(): | ||
### commands auto generated by Alembic - please adjust! ### | ||
op.create_table('ssl_keys', | ||
sa.Column('id', sa.Integer(), nullable=False), | ||
sa.Column('name', sa.String(length=255), nullable=True), | ||
sa.Column('domaincontroller_id', sa.Integer(), nullable=True), | ||
sa.ForeignKeyConstraint(['domaincontroller_id'], ['domain_controller.id'], ), | ||
sa.PrimaryKeyConstraint('id'), | ||
sa.UniqueConstraint('name', 'domaincontroller_id', name='_ssl_dc_uc') | ||
) | ||
### end Alembic commands ### | ||
|
||
|
||
def downgrade(): | ||
### commands auto generated by Alembic - please adjust! ### | ||
op.drop_table('ssl_keys') | ||
### end Alembic commands ### |
6 changes: 3 additions & 3 deletions
6
migrations/versions/40c2706bfd53_.py → ...ns/versions/40c2706bfd53_websockets_dc.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters