Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 33 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,47 @@
#CHANGELOG

## v2.4.1

2013-02-09

Issue [#43](https://github.com/qiniu/nodejs-sdk/pull/43):

- imageMogr bugfix: auto-orient
- auth.UploadToken, auth.DownloadToken 改为 auth.PutPolicy, auth.GetPolicy
- auth.UploadToken.generateToken() 改为 auth.PutPolicy.token()
- auth.DownloadToken.generateToken() 改为 auth.GetPolicy.token()
- auth.DownloadToken.pattern 改为 auth.GetPolicy.scope


## v2.4.0

2013-01-23

Issue [#36](https://github.com/qiniu/nodejs-sdk/pull/36):

- 增加 auth.DownloadToken 类
- auth.UploadToken 增加:escape、asyncOps 成员,generateSignature 改名为 generateToken
- 增加 rs.copy, rs.move, rs.batchGet, rs.batchStat, rs.batchDelete, rs.batchCopy, rs.batchMove
- 增加 Travis-CI 的支持

Issue [#32](https://github.com/qiniu/nodejs-sdk/pull/32):

- auth.UploadToken.generateSignature 各个参数调整为可选
- uploadWithToken 非兼容调整: rs.uploadWithToken(uploadToken, stream, key, mimeType, customMeta, callbackParams, crc32, onret)
- generateActionString 非兼容调整: action = util.generateActionString(bucket, key, mimeType, customMeta, crc32)


## v2.3.2

2012-12-31

updated:

- 修复crc32编码
- 修复使用UploadToken方式上传时流式上传bug,流式上传不检查crc32


## v2.3.0

2012-11-23

updated:

- 启用新的 uploadToken(上传凭证)上传方式,可由客户方业务服务器生成上传凭证。上传前无需请求七牛云存储,减少http请求。

101 changes: 0 additions & 101 deletions demo/img_demo.js

This file was deleted.

79 changes: 0 additions & 79 deletions demo/rs_demo.js

This file was deleted.

21 changes: 11 additions & 10 deletions lib/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ var crypto = require('crypto');
var config = require("./conf.js");
var util = require('./util.js');

exports.UploadToken = UploadToken;
exports.DownloadToken = DownloadToken;
exports.PutPolicy = PutPolicy;
exports.GetPolicy = GetPolicy;

// ------------------------------------------------------------------------------------------
// func generateSignature
Expand Down Expand Up @@ -33,9 +33,9 @@ function generateToken(params) {
}

// ------------------------------------------------------------------------------------------
// type UploadToken
// type PutPolicy

function UploadToken(opts) {
function PutPolicy(opts) {
this.scope = opts.scope || null;
this.expires = opts.expires || 3600;
this.callbackUrl = opts.callbackUrl || null;
Expand All @@ -45,7 +45,7 @@ function UploadToken(opts) {
this.asyncOps = opts.asyncOps || null;
}

UploadToken.prototype.generateToken = function() {
PutPolicy.prototype.token = function() {
var params = {
"deadline": this.expires + Math.floor(Date.now() / 1000),
"escape": this.excape,
Expand All @@ -69,19 +69,20 @@ UploadToken.prototype.generateToken = function() {
};

// ------------------------------------------------------------------------------------------
// type DownloadToken
// type GetPolicy

function DownloadToken(opts) {
function GetPolicy(opts) {
this.expires = opts.expires || 3600;
this.pattern = opts.pattern || "*/*";
this.scope = opts.scope || "*/*";
}

DownloadToken.prototype.generateToken = function() {
GetPolicy.prototype.token = function() {
var params = {
S: this.pattern,
S: this.scope,
E: this.expires + Math.floor(Date.now() / 1000),
};
return generateToken(params);
};

// ------------------------------------------------------------------------------------------

4 changes: 2 additions & 2 deletions test/rs.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,8 @@ describe('rs.test.js', function () {
callbackBodyType: null,
customer: null
};
var token = new qiniu.auth.UploadToken(opts);
upToken = token.generateToken();
var policy = new qiniu.auth.PutPolicy(opts);
upToken = policy.token();
done();
});

Expand Down