Merge branch 'master' into umask
This commit is contained in:
yackob03
commit
b1b315d86c
14 changed files with 416 additions and 17 deletions
|
|
@ -166,6 +166,7 @@ class EmailConfirmation(BaseModel):
|
|||
code = CharField(default=random_string_generator(), unique=True, index=True)
|
||||
user = ForeignKeyField(User)
|
||||
pw_reset = BooleanField(default=False)
|
||||
new_email = CharField(null=True)
|
||||
email_confirm = BooleanField(default=False)
|
||||
created = DateTimeField(default=datetime.now)
|
||||
|
||||
|
|
|
|||
|
|
@ -337,8 +337,12 @@ def list_federated_logins(user):
|
|||
FederatedLogin.user == user)
|
||||
|
||||
|
||||
def create_confirm_email_code(user):
|
||||
code = EmailConfirmation.create(user=user, email_confirm=True)
|
||||
def create_confirm_email_code(user, new_email=None):
|
||||
if new_email:
|
||||
if not validate_email(new_email):
|
||||
raise InvalidEmailAddressException('Invalid email address: %s' % new_email)
|
||||
|
||||
code = EmailConfirmation.create(user=user, email_confirm=True, new_email=new_email)
|
||||
return code
|
||||
|
||||
|
||||
|
|
@ -347,15 +351,23 @@ def confirm_user_email(code):
|
|||
code = EmailConfirmation.get(EmailConfirmation.code == code,
|
||||
EmailConfirmation.email_confirm == True)
|
||||
except EmailConfirmation.DoesNotExist:
|
||||
raise DataModelException('Invalid email confirmation code.')
|
||||
raise DataModelException('Invalid email confirmation code.')
|
||||
|
||||
user = code.user
|
||||
user.verified = True
|
||||
|
||||
new_email = code.new_email
|
||||
if new_email:
|
||||
if find_user_by_email(new_email):
|
||||
raise DataModelException('E-mail address already used.')
|
||||
|
||||
user.email = new_email
|
||||
|
||||
user.save()
|
||||
|
||||
code.delete_instance()
|
||||
|
||||
return user
|
||||
return user, new_email
|
||||
|
||||
|
||||
def create_reset_password_email_code(email):
|
||||
|
|
@ -384,6 +396,13 @@ def validate_reset_code(code):
|
|||
return user
|
||||
|
||||
|
||||
def find_user_by_email(email):
|
||||
try:
|
||||
return User.get(User.email == email)
|
||||
except User.DoesNotExist:
|
||||
return None
|
||||
|
||||
|
||||
def get_user(username):
|
||||
try:
|
||||
return User.get(User.username == username, User.organization == False)
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ from data import model
|
|||
from data.queue import dockerfile_build_queue
|
||||
from data.plans import PLANS, get_plan
|
||||
from app import app
|
||||
from util.email import send_confirmation_email, send_recovery_email
|
||||
from util.email import send_confirmation_email, send_recovery_email, send_change_email
|
||||
from util.names import parse_repository_name, format_robot_username
|
||||
from util.gravatar import compute_hash
|
||||
|
||||
|
|
@ -264,6 +264,20 @@ def change_user_details():
|
|||
logger.debug('Changing invoice_email for user: %s', user.username)
|
||||
model.change_invoice_email(user, user_data['invoice_email'])
|
||||
|
||||
if 'email' in user_data and user_data['email'] != user.email:
|
||||
new_email = user_data['email']
|
||||
if model.find_user_by_email(new_email):
|
||||
# Email already used.
|
||||
error_resp = jsonify({
|
||||
'message': 'E-mail address already used'
|
||||
})
|
||||
error_resp.status_code = 400
|
||||
return error_resp
|
||||
|
||||
logger.debug('Sending email to change email address for user: %s', user.username)
|
||||
code = model.create_confirm_email_code(user, new_email=new_email)
|
||||
send_change_email(user.username, user_data['email'], code.code)
|
||||
|
||||
except model.InvalidPasswordException, ex:
|
||||
error_resp = jsonify({
|
||||
'message': ex.message,
|
||||
|
|
@ -508,7 +522,20 @@ def change_organization_details(orgname):
|
|||
if 'invoice_email' in org_data:
|
||||
logger.debug('Changing invoice_email for organization: %s', org.username)
|
||||
model.change_invoice_email(org, org_data['invoice_email'])
|
||||
|
||||
|
||||
if 'email' in org_data and org_data['email'] != org.email:
|
||||
new_email = org_data['email']
|
||||
if model.find_user_by_email(new_email):
|
||||
# Email already used.
|
||||
error_resp = jsonify({
|
||||
'message': 'E-mail address already used'
|
||||
})
|
||||
error_resp.status_code = 400
|
||||
return error_resp
|
||||
|
||||
logger.debug('Changing email address for organization: %s', org.username)
|
||||
model.update_email(org, new_email)
|
||||
|
||||
teams = model.get_teams_within_org(org)
|
||||
return jsonify(org_view(org, teams))
|
||||
|
||||
|
|
|
|||
|
|
@ -255,15 +255,17 @@ def github_oauth_attach():
|
|||
@app.route('/confirm', methods=['GET'])
|
||||
def confirm_email():
|
||||
code = request.values['code']
|
||||
user = None
|
||||
new_email = None
|
||||
|
||||
try:
|
||||
user = model.confirm_user_email(code)
|
||||
user, new_email = model.confirm_user_email(code)
|
||||
except model.DataModelException as ex:
|
||||
return redirect(url_for('signin'))
|
||||
|
||||
return render_page_template('confirmerror.html', error_message=ex.message)
|
||||
|
||||
common_login(user)
|
||||
|
||||
return redirect(url_for('index'))
|
||||
return redirect(url_for('user', tab='email') if new_email else url_for('index'))
|
||||
|
||||
|
||||
@app.route('/recovery', methods=['GET'])
|
||||
|
|
|
|||
|
|
@ -1850,6 +1850,12 @@ p.editable:hover i {
|
|||
text-align: center;
|
||||
}
|
||||
|
||||
.panel-setting-content {
|
||||
margin-left: 16px;
|
||||
margin-top: 16px;
|
||||
font-family: monospace;
|
||||
}
|
||||
|
||||
.user-admin .plan-description {
|
||||
font-size: 1.2em;
|
||||
margin-bottom: 10px;
|
||||
|
|
@ -1860,7 +1866,7 @@ p.editable:hover i {
|
|||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.user-admin .form-change-pw input {
|
||||
.user-admin .form-change input {
|
||||
margin-top: 12px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ function getMarkedDown(string) {
|
|||
}
|
||||
|
||||
// Start the application code itself.
|
||||
quayApp = angular.module('quay', ['ngRoute', 'chieffancypants.loadingBar', 'restangular', 'angularMoment', 'angulartics', /*'angulartics.google.analytics',*/ 'angulartics.mixpanel', '$strap.directives', 'ngCookies', 'ngSanitize'], function($provide, cfpLoadingBarProvider) {
|
||||
quayApp = angular.module('quay', ['ngRoute', 'chieffancypants.loadingBar', 'restangular', 'angularMoment', 'angulartics', /*'angulartics.google.analytics',*/ 'angulartics.mixpanel', '$strap.directives', 'ngCookies', 'ngSanitize', 'angular-md5'], function($provide, cfpLoadingBarProvider) {
|
||||
cfpLoadingBarProvider.includeSpinner = false;
|
||||
|
||||
$provide.factory('UtilService', ['$sanitize', function($sanitize) {
|
||||
|
|
|
|||
|
|
@ -622,6 +622,7 @@ function RepoAdminCtrl($scope, Restangular, ApiService, $routeParams, $rootScope
|
|||
|
||||
$scope.permissions = {'team': [], 'user': []};
|
||||
$scope.logsShown = 0;
|
||||
$scope.deleting = false;
|
||||
|
||||
$scope.loadLogs = function() {
|
||||
$scope.logsShown++;
|
||||
|
|
@ -777,6 +778,7 @@ function RepoAdminCtrl($scope, Restangular, ApiService, $routeParams, $rootScope
|
|||
'repository': namespace + '/' + name
|
||||
};
|
||||
|
||||
$scope.deleting = true;
|
||||
ApiService.deleteRepository(null, params).then(function() {
|
||||
$scope.repo = null;
|
||||
|
||||
|
|
@ -784,6 +786,7 @@ function RepoAdminCtrl($scope, Restangular, ApiService, $routeParams, $rootScope
|
|||
document.location = '/repository/';
|
||||
}, 1000);
|
||||
}, function() {
|
||||
$scope.deleting = true;
|
||||
$('#cannotchangeModal').modal({});
|
||||
});
|
||||
};
|
||||
|
|
@ -906,12 +909,13 @@ function UserAdminCtrl($scope, $timeout, $location, ApiService, PlanService, Use
|
|||
$scope.loading = true;
|
||||
$scope.updatingUser = false;
|
||||
$scope.changePasswordSuccess = false;
|
||||
$scope.changeEmailSent = false;
|
||||
$scope.convertStep = 0;
|
||||
$scope.org = {};
|
||||
$scope.githubRedirectUri = KeyService.githubRedirectUri;
|
||||
$scope.githubClientId = KeyService.githubClientId;
|
||||
|
||||
$('.form-change-pw').popover();
|
||||
$('.form-change').popover();
|
||||
|
||||
$scope.logsShown = 0;
|
||||
$scope.invoicesShown = 0;
|
||||
|
|
@ -970,8 +974,31 @@ function UserAdminCtrl($scope, $timeout, $location, ApiService, PlanService, Use
|
|||
});
|
||||
};
|
||||
|
||||
$scope.changeEmail = function() {
|
||||
$('#changeEmailForm').popover('hide');
|
||||
$scope.updatingUser = true;
|
||||
$scope.changeEmailSent = false;
|
||||
|
||||
ApiService.changeUserDetails($scope.cuser).then(function() {
|
||||
$scope.updatingUser = false;
|
||||
$scope.changeEmailSent = true;
|
||||
$scope.sentEmail = $scope.cuser.email;
|
||||
|
||||
// Reset the form.
|
||||
$scope.cuser.repeatEmail = '';
|
||||
$scope.changeEmailForm.$setPristine();
|
||||
}, function(result) {
|
||||
$scope.updatingUser = false;
|
||||
|
||||
$scope.changeEmailError = result.data.message;
|
||||
$timeout(function() {
|
||||
$('#changeEmailForm').popover('show');
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
$scope.changePassword = function() {
|
||||
$('.form-change-pw').popover('hide');
|
||||
$('#changePasswordForm').popover('hide');
|
||||
$scope.updatingUser = true;
|
||||
$scope.changePasswordSuccess = false;
|
||||
|
||||
|
|
@ -991,7 +1018,7 @@ function UserAdminCtrl($scope, $timeout, $location, ApiService, PlanService, Use
|
|||
|
||||
$scope.changePasswordError = result.data.message;
|
||||
$timeout(function() {
|
||||
$('.form-change-pw').popover('show');
|
||||
$('#changePasswordForm').popover('show');
|
||||
});
|
||||
});
|
||||
};
|
||||
|
|
@ -1426,6 +1453,7 @@ function OrgAdminCtrl($rootScope, $scope, Restangular, $routeParams, UserService
|
|||
$scope.invoiceLoading = true;
|
||||
$scope.logsShown = 0;
|
||||
$scope.invoicesShown = 0;
|
||||
$scope.changingOrganization = false;
|
||||
|
||||
$scope.loadLogs = function() {
|
||||
$scope.logsShown++;
|
||||
|
|
@ -1439,6 +1467,29 @@ function OrgAdminCtrl($rootScope, $scope, Restangular, $routeParams, UserService
|
|||
$scope.hasPaidPlan = plan && plan.price > 0;
|
||||
};
|
||||
|
||||
$scope.changeEmail = function() {
|
||||
$scope.changingOrganization = true;
|
||||
var params = {
|
||||
'orgname': orgname
|
||||
};
|
||||
|
||||
var data = {
|
||||
'email': $scope.organizationEmail
|
||||
};
|
||||
|
||||
ApiService.changeOrganizationDetails(data, params).then(function(org) {
|
||||
$scope.changingOrganization = false;
|
||||
$scope.changeEmailForm.$setPristine();
|
||||
$scope.organization = org;
|
||||
}, function(resp) {
|
||||
$scope.changingOrganization = false;
|
||||
$scope.changeEmailError = result.data.message;
|
||||
$timeout(function() {
|
||||
$('#changeEmailForm').popover('show');
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
$scope.loadMembers = function() {
|
||||
if ($scope.membersFound) { return; }
|
||||
$scope.membersLoading = true;
|
||||
|
|
@ -1464,6 +1515,7 @@ function OrgAdminCtrl($rootScope, $scope, Restangular, $routeParams, UserService
|
|||
$scope.orgResource = ApiService.getOrganizationAsResource({'orgname': orgname}).get(function(org) {
|
||||
if (org && org.is_admin) {
|
||||
$scope.organization = org;
|
||||
$scope.organizationEmail = org.email;
|
||||
$rootScope.title = orgname + ' (Admin)';
|
||||
$rootScope.description = 'Administration page for organization ' + orgname;
|
||||
}
|
||||
|
|
|
|||
200
static/lib/angular-md5.js
vendored
Normal file
200
static/lib/angular-md5.js
vendored
Normal file
|
|
@ -0,0 +1,200 @@
|
|||
/*
|
||||
angular-md5 - v0.1.7
|
||||
2014-01-20
|
||||
*/
|
||||
(function(window, angular, undefined) {
|
||||
angular.module("angular-md5", [ "gdi2290.md5" ]);
|
||||
angular.module("ngMd5", [ "gdi2290.md5" ]);
|
||||
angular.module("gdi2290.md5", [ "gdi2290.gravatar-filter", "gdi2290.md5-service", "gdi2290.md5-filter" ]);
|
||||
"use strict";
|
||||
angular.module("gdi2290.gravatar-filter", []).filter("gravatar", [ "md5", function(md5) {
|
||||
var cache = {};
|
||||
return function(text, defaultText) {
|
||||
if (!cache[text]) {
|
||||
defaultText = defaultText ? md5.createHash(defaultText.toString().toLowerCase()) : "";
|
||||
cache[text] = text ? md5.createHash(text.toString().toLowerCase()) : defaultText;
|
||||
}
|
||||
return cache[text];
|
||||
};
|
||||
} ]);
|
||||
"use strict";
|
||||
angular.module("gdi2290.md5-filter", []).filter("md5", [ "md5", function(md5) {
|
||||
return function(text) {
|
||||
return text ? md5.createHash(text.toString().toLowerCase()) : text;
|
||||
};
|
||||
} ]);
|
||||
"use strict";
|
||||
angular.module("gdi2290.md5-service", []).factory("md5", [ function() {
|
||||
var md5 = {
|
||||
createHash: function(str) {
|
||||
var xl;
|
||||
var rotateLeft = function(lValue, iShiftBits) {
|
||||
return lValue << iShiftBits | lValue >>> 32 - iShiftBits;
|
||||
};
|
||||
var addUnsigned = function(lX, lY) {
|
||||
var lX4, lY4, lX8, lY8, lResult;
|
||||
lX8 = lX & 2147483648;
|
||||
lY8 = lY & 2147483648;
|
||||
lX4 = lX & 1073741824;
|
||||
lY4 = lY & 1073741824;
|
||||
lResult = (lX & 1073741823) + (lY & 1073741823);
|
||||
if (lX4 & lY4) {
|
||||
return lResult ^ 2147483648 ^ lX8 ^ lY8;
|
||||
}
|
||||
if (lX4 | lY4) {
|
||||
if (lResult & 1073741824) {
|
||||
return lResult ^ 3221225472 ^ lX8 ^ lY8;
|
||||
} else {
|
||||
return lResult ^ 1073741824 ^ lX8 ^ lY8;
|
||||
}
|
||||
} else {
|
||||
return lResult ^ lX8 ^ lY8;
|
||||
}
|
||||
};
|
||||
var _F = function(x, y, z) {
|
||||
return x & y | ~x & z;
|
||||
};
|
||||
var _G = function(x, y, z) {
|
||||
return x & z | y & ~z;
|
||||
};
|
||||
var _H = function(x, y, z) {
|
||||
return x ^ y ^ z;
|
||||
};
|
||||
var _I = function(x, y, z) {
|
||||
return y ^ (x | ~z);
|
||||
};
|
||||
var _FF = function(a, b, c, d, x, s, ac) {
|
||||
a = addUnsigned(a, addUnsigned(addUnsigned(_F(b, c, d), x), ac));
|
||||
return addUnsigned(rotateLeft(a, s), b);
|
||||
};
|
||||
var _GG = function(a, b, c, d, x, s, ac) {
|
||||
a = addUnsigned(a, addUnsigned(addUnsigned(_G(b, c, d), x), ac));
|
||||
return addUnsigned(rotateLeft(a, s), b);
|
||||
};
|
||||
var _HH = function(a, b, c, d, x, s, ac) {
|
||||
a = addUnsigned(a, addUnsigned(addUnsigned(_H(b, c, d), x), ac));
|
||||
return addUnsigned(rotateLeft(a, s), b);
|
||||
};
|
||||
var _II = function(a, b, c, d, x, s, ac) {
|
||||
a = addUnsigned(a, addUnsigned(addUnsigned(_I(b, c, d), x), ac));
|
||||
return addUnsigned(rotateLeft(a, s), b);
|
||||
};
|
||||
var convertToWordArray = function(str) {
|
||||
var lWordCount;
|
||||
var lMessageLength = str.length;
|
||||
var lNumberOfWords_temp1 = lMessageLength + 8;
|
||||
var lNumberOfWords_temp2 = (lNumberOfWords_temp1 - lNumberOfWords_temp1 % 64) / 64;
|
||||
var lNumberOfWords = (lNumberOfWords_temp2 + 1) * 16;
|
||||
var lWordArray = new Array(lNumberOfWords - 1);
|
||||
var lBytePosition = 0;
|
||||
var lByteCount = 0;
|
||||
while (lByteCount < lMessageLength) {
|
||||
lWordCount = (lByteCount - lByteCount % 4) / 4;
|
||||
lBytePosition = lByteCount % 4 * 8;
|
||||
lWordArray[lWordCount] = lWordArray[lWordCount] | str.charCodeAt(lByteCount) << lBytePosition;
|
||||
lByteCount++;
|
||||
}
|
||||
lWordCount = (lByteCount - lByteCount % 4) / 4;
|
||||
lBytePosition = lByteCount % 4 * 8;
|
||||
lWordArray[lWordCount] = lWordArray[lWordCount] | 128 << lBytePosition;
|
||||
lWordArray[lNumberOfWords - 2] = lMessageLength << 3;
|
||||
lWordArray[lNumberOfWords - 1] = lMessageLength >>> 29;
|
||||
return lWordArray;
|
||||
};
|
||||
var wordToHex = function(lValue) {
|
||||
var wordToHexValue = "", wordToHexValue_temp = "", lByte, lCount;
|
||||
for (lCount = 0; lCount <= 3; lCount++) {
|
||||
lByte = lValue >>> lCount * 8 & 255;
|
||||
wordToHexValue_temp = "0" + lByte.toString(16);
|
||||
wordToHexValue = wordToHexValue + wordToHexValue_temp.substr(wordToHexValue_temp.length - 2, 2);
|
||||
}
|
||||
return wordToHexValue;
|
||||
};
|
||||
var x = [], k, AA, BB, CC, DD, a, b, c, d, S11 = 7, S12 = 12, S13 = 17, S14 = 22, S21 = 5, S22 = 9, S23 = 14, S24 = 20, S31 = 4, S32 = 11, S33 = 16, S34 = 23, S41 = 6, S42 = 10, S43 = 15, S44 = 21;
|
||||
x = convertToWordArray(str);
|
||||
a = 1732584193;
|
||||
b = 4023233417;
|
||||
c = 2562383102;
|
||||
d = 271733878;
|
||||
xl = x.length;
|
||||
for (k = 0; k < xl; k += 16) {
|
||||
AA = a;
|
||||
BB = b;
|
||||
CC = c;
|
||||
DD = d;
|
||||
a = _FF(a, b, c, d, x[k + 0], S11, 3614090360);
|
||||
d = _FF(d, a, b, c, x[k + 1], S12, 3905402710);
|
||||
c = _FF(c, d, a, b, x[k + 2], S13, 606105819);
|
||||
b = _FF(b, c, d, a, x[k + 3], S14, 3250441966);
|
||||
a = _FF(a, b, c, d, x[k + 4], S11, 4118548399);
|
||||
d = _FF(d, a, b, c, x[k + 5], S12, 1200080426);
|
||||
c = _FF(c, d, a, b, x[k + 6], S13, 2821735955);
|
||||
b = _FF(b, c, d, a, x[k + 7], S14, 4249261313);
|
||||
a = _FF(a, b, c, d, x[k + 8], S11, 1770035416);
|
||||
d = _FF(d, a, b, c, x[k + 9], S12, 2336552879);
|
||||
c = _FF(c, d, a, b, x[k + 10], S13, 4294925233);
|
||||
b = _FF(b, c, d, a, x[k + 11], S14, 2304563134);
|
||||
a = _FF(a, b, c, d, x[k + 12], S11, 1804603682);
|
||||
d = _FF(d, a, b, c, x[k + 13], S12, 4254626195);
|
||||
c = _FF(c, d, a, b, x[k + 14], S13, 2792965006);
|
||||
b = _FF(b, c, d, a, x[k + 15], S14, 1236535329);
|
||||
a = _GG(a, b, c, d, x[k + 1], S21, 4129170786);
|
||||
d = _GG(d, a, b, c, x[k + 6], S22, 3225465664);
|
||||
c = _GG(c, d, a, b, x[k + 11], S23, 643717713);
|
||||
b = _GG(b, c, d, a, x[k + 0], S24, 3921069994);
|
||||
a = _GG(a, b, c, d, x[k + 5], S21, 3593408605);
|
||||
d = _GG(d, a, b, c, x[k + 10], S22, 38016083);
|
||||
c = _GG(c, d, a, b, x[k + 15], S23, 3634488961);
|
||||
b = _GG(b, c, d, a, x[k + 4], S24, 3889429448);
|
||||
a = _GG(a, b, c, d, x[k + 9], S21, 568446438);
|
||||
d = _GG(d, a, b, c, x[k + 14], S22, 3275163606);
|
||||
c = _GG(c, d, a, b, x[k + 3], S23, 4107603335);
|
||||
b = _GG(b, c, d, a, x[k + 8], S24, 1163531501);
|
||||
a = _GG(a, b, c, d, x[k + 13], S21, 2850285829);
|
||||
d = _GG(d, a, b, c, x[k + 2], S22, 4243563512);
|
||||
c = _GG(c, d, a, b, x[k + 7], S23, 1735328473);
|
||||
b = _GG(b, c, d, a, x[k + 12], S24, 2368359562);
|
||||
a = _HH(a, b, c, d, x[k + 5], S31, 4294588738);
|
||||
d = _HH(d, a, b, c, x[k + 8], S32, 2272392833);
|
||||
c = _HH(c, d, a, b, x[k + 11], S33, 1839030562);
|
||||
b = _HH(b, c, d, a, x[k + 14], S34, 4259657740);
|
||||
a = _HH(a, b, c, d, x[k + 1], S31, 2763975236);
|
||||
d = _HH(d, a, b, c, x[k + 4], S32, 1272893353);
|
||||
c = _HH(c, d, a, b, x[k + 7], S33, 4139469664);
|
||||
b = _HH(b, c, d, a, x[k + 10], S34, 3200236656);
|
||||
a = _HH(a, b, c, d, x[k + 13], S31, 681279174);
|
||||
d = _HH(d, a, b, c, x[k + 0], S32, 3936430074);
|
||||
c = _HH(c, d, a, b, x[k + 3], S33, 3572445317);
|
||||
b = _HH(b, c, d, a, x[k + 6], S34, 76029189);
|
||||
a = _HH(a, b, c, d, x[k + 9], S31, 3654602809);
|
||||
d = _HH(d, a, b, c, x[k + 12], S32, 3873151461);
|
||||
c = _HH(c, d, a, b, x[k + 15], S33, 530742520);
|
||||
b = _HH(b, c, d, a, x[k + 2], S34, 3299628645);
|
||||
a = _II(a, b, c, d, x[k + 0], S41, 4096336452);
|
||||
d = _II(d, a, b, c, x[k + 7], S42, 1126891415);
|
||||
c = _II(c, d, a, b, x[k + 14], S43, 2878612391);
|
||||
b = _II(b, c, d, a, x[k + 5], S44, 4237533241);
|
||||
a = _II(a, b, c, d, x[k + 12], S41, 1700485571);
|
||||
d = _II(d, a, b, c, x[k + 3], S42, 2399980690);
|
||||
c = _II(c, d, a, b, x[k + 10], S43, 4293915773);
|
||||
b = _II(b, c, d, a, x[k + 1], S44, 2240044497);
|
||||
a = _II(a, b, c, d, x[k + 8], S41, 1873313359);
|
||||
d = _II(d, a, b, c, x[k + 15], S42, 4264355552);
|
||||
c = _II(c, d, a, b, x[k + 6], S43, 2734768916);
|
||||
b = _II(b, c, d, a, x[k + 13], S44, 1309151649);
|
||||
a = _II(a, b, c, d, x[k + 4], S41, 4149444226);
|
||||
d = _II(d, a, b, c, x[k + 11], S42, 3174756917);
|
||||
c = _II(c, d, a, b, x[k + 2], S43, 718787259);
|
||||
b = _II(b, c, d, a, x[k + 9], S44, 3951481745);
|
||||
a = addUnsigned(a, AA);
|
||||
b = addUnsigned(b, BB);
|
||||
c = addUnsigned(c, CC);
|
||||
d = addUnsigned(d, DD);
|
||||
}
|
||||
var temp = wordToHex(a) + wordToHex(b) + wordToHex(c) + wordToHex(d);
|
||||
return temp.toLowerCase();
|
||||
}
|
||||
};
|
||||
return md5;
|
||||
} ]);
|
||||
})(this, this.angular, void 0);
|
||||
|
|
@ -7,6 +7,7 @@
|
|||
<div class="col-md-2">
|
||||
<ul class="nav nav-pills nav-stacked">
|
||||
<li class="active"><a href="javascript:void(0)" data-toggle="tab" data-target="#plan">Plan and Usage</a></li>
|
||||
<li><a href="javascript:void(0)" data-toggle="tab" data-target="#settings">Organization Settings</a></li>
|
||||
<li><a href="javascript:void(0)" data-toggle="tab" data-target="#logs" ng-click="loadLogs()">Usage Logs</a></li>
|
||||
<li><a href="javascript:void(0)" data-toggle="tab" data-target="#members" ng-click="loadMembers()">Members</a></li>
|
||||
<li><a href="javascript:void(0)" data-toggle="tab" data-target="#robots">Robot Accounts</a></li>
|
||||
|
|
@ -23,6 +24,26 @@
|
|||
<div class="plan-manager" organization="orgname" plan-changed="planChanged(plan)"></div>
|
||||
</div>
|
||||
|
||||
<!-- Organiaztion settings tab -->
|
||||
<div id="settings" class="tab-pane">
|
||||
<div class="quay-spinner" ng-show="changingOrganization"></div>
|
||||
|
||||
<div class="panel" ng-show="!changingOrganization">
|
||||
<div class="panel-title">Organization's e-mail address</div>
|
||||
<div class="panel-content" style="padding-left: 20px; margin-top: 10px;">
|
||||
<form class="form-change" id="changeEmailForm" name="changeEmailForm" ng-submit="changeEmail()" data-trigger="manual"
|
||||
data-content="{{ changeEmailError }}" data-placement="right" ng-show="!updatingOrganization">
|
||||
<img src="//www.gravatar.com/avatar/{{ organizationEmail | gravatar }}?s=24&d=identicon">
|
||||
<input type="email" class="form-control" ng-model="organizationEmail"
|
||||
style="margin-left: 10px; margin-right: 10px; width: 400px; display: inline-block;" required>
|
||||
<button class="btn btn-primary" type="submit" ng-disabled="changeEmailForm.$invalid || organizationEmail == organization.email">
|
||||
Save
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Robot accounts tab -->
|
||||
<div id="robots" class="tab-pane">
|
||||
<div class="robots-manager" organization="organization"></div>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<div class="container" ng-show="deleting"><div class="quay-spinner"></div></div>
|
||||
<div class="resource-view" resource="repository" error-message="'No repository found'"></div>
|
||||
<div class="container repo repo-admin" ng-show="repo">
|
||||
<div class="container repo repo-admin" ng-show="repo && !deleting">
|
||||
<div class="header row">
|
||||
<a href="{{ '/repository/' + repo.namespace + '/' + repo.name }}" class="back"><i class="fa fa-chevron-left"></i></a>
|
||||
<h3>
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@
|
|||
<li ng-show="hasPaidPlan"><a href="javascript:void(0)" data-toggle="tab" data-target="#billingoptions">Billing Options</a></li>
|
||||
<li ng-show="hasPaidBusinessPlan"><a href="javascript:void(0)" data-toggle="tab" data-target="#billing" ng-click="loadInvoices()">Billing History</a></li>
|
||||
<li><a href="javascript:void(0)" data-toggle="tab" data-target="#robots">Robot Accounts</a></li>
|
||||
<li><a href="javascript:void(0)" data-toggle="tab" data-target="#email">Account E-mail</a></li>
|
||||
<li><a href="javascript:void(0)" data-toggle="tab" data-target="#password">Change Password</a></li>
|
||||
<li><a href="javascript:void(0)" data-toggle="tab" data-target="#github">GitHub Login</a></li>
|
||||
<li ng-show="hasPaidBusinessPlan"><a href="javascript:void(0)" data-toggle="tab" data-target="#logs" ng-click="loadLogs()">Usage Logs</a></li>
|
||||
|
|
@ -50,6 +51,36 @@
|
|||
<div class="plan-manager" user="user.username" ready-for-plan="readyForPlan()" plan-changed="planChanged(plan)"></div>
|
||||
</div>
|
||||
|
||||
<!-- E-mail address tab -->
|
||||
<div id="email" class="tab-pane">
|
||||
<div class="row">
|
||||
<div class="alert alert-success" ng-show="changeEmailSent">An e-mail has been sent to {{ sentEmail }} to verify the change.</div>
|
||||
|
||||
<div class="loading" ng-show="updatingUser">
|
||||
<div class="quay-spinner 3x"></div>
|
||||
</div>
|
||||
|
||||
<div class="panel" ng-show="!updatingUser">
|
||||
<div class="panel-title">Account e-mail address</div>
|
||||
<div class="panel-setting-content">
|
||||
{{ user.email }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="panel" ng-show="!updatingUser" >
|
||||
<div class="panel-title">Change e-mail address</div>
|
||||
|
||||
<div class="panel-body">
|
||||
<form class="form-change col-md-6" id="changeEmailForm" name="changeEmailForm" ng-submit="changeEmail()" data-trigger="manual"
|
||||
data-content="{{ changeEmailError }}" data-placement="right" ng-show="!awaitingConfirmation && !registering">
|
||||
<input type="email" class="form-control" placeholder="Your new e-mail address" ng-model="cuser.email" required>
|
||||
<button class="btn btn-primary" ng-disabled="changeEmailForm.$invalid || cuser.email == user.email" type="submit">Change E-mail Address</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Change password tab -->
|
||||
<div id="password" class="tab-pane">
|
||||
<div class="loading" ng-show="updatingUser">
|
||||
|
|
@ -62,7 +93,7 @@
|
|||
<span class="help-block" ng-show="changePasswordSuccess">Password changed successfully</span>
|
||||
|
||||
<div ng-show="!updatingUser" class="panel-body">
|
||||
<form class="form-change-pw col-md-6" name="changePasswordForm" ng-submit="changePassword()" data-trigger="manual"
|
||||
<form class="form-change col-md-6" id="changePasswordForm" name="changePasswordForm" ng-submit="changePassword()" data-trigger="manual"
|
||||
data-content="{{ changePasswordError }}" data-placement="right" ng-show="!awaitingConfirmation && !registering">
|
||||
<input type="password" class="form-control" placeholder="Your new password" ng-model="cuser.password" required>
|
||||
<input type="password" class="form-control" placeholder="Verify your new password" ng-model="cuser.repeatPassword"
|
||||
|
|
@ -75,6 +106,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Github tab -->
|
||||
<div id="github" class="tab-pane">
|
||||
<div class="loading" ng-show="!cuser">
|
||||
<div class="quay-spinner 3x"></div>
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@
|
|||
<script src="static/lib/angulartics.js"></script>
|
||||
<script src="static/lib/angulartics-mixpanel.js"></script>
|
||||
<script src="static/lib/angulartics-google-analytics.js"></script>
|
||||
<script src="static/lib/angular-md5.js"></script>
|
||||
|
||||
<script src="static/lib/angular-moment.min.js"></script>
|
||||
<script src="static/lib/angular-cookies.min.js"></script>
|
||||
|
|
|
|||
20
templates/confirmerror.html
Normal file
20
templates/confirmerror.html
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}
|
||||
<title>Confirmation error · Quay.io</title>
|
||||
{% endblock %}
|
||||
|
||||
{% block body_content %}
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<h2>There was an error confirming your e-mail address.</h2>
|
||||
|
||||
{% if error_message %}
|
||||
<div class="alert alert-danger">{{ error_message }}</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
@ -12,6 +12,15 @@ To confirm this email address, please click the following link:<br>
|
|||
"""
|
||||
|
||||
|
||||
CHANGE_MESSAGE = """
|
||||
This email address was recently asked to become the new e-mail address for username '%s'
|
||||
at <a href="https://quay.io">Quay.io</a>.<br>
|
||||
<br>
|
||||
To confirm this email address, please click the following link:<br>
|
||||
<a href="https://quay.io/confirm?code=%s">https://quay.io/confirm?code=%s</a>
|
||||
"""
|
||||
|
||||
|
||||
RECOVERY_MESSAGE = """
|
||||
A user at <a href="https://quay.io">Quay.io</a> has attempted to recover their account
|
||||
using this email.<br>
|
||||
|
|
@ -25,6 +34,14 @@ not given access. Please disregard this email.<br>
|
|||
"""
|
||||
|
||||
|
||||
def send_change_email(username, email, token):
|
||||
msg = Message('Quay.io email change. Please confirm your email.',
|
||||
sender='support@quay.io', # Why do I need this?
|
||||
recipients=[email])
|
||||
msg.html = CHANGE_MESSAGE % (username, token, token)
|
||||
mail.send(msg)
|
||||
|
||||
|
||||
def send_confirmation_email(username, email, token):
|
||||
msg = Message('Welcome to Quay.io! Please confirm your email.',
|
||||
sender='support@quay.io', # Why do I need this?
|
||||
|
|
|
|||
Reference in a new issue