header : bodyPartHeaders.entrySet()) {
+ os.write((header.getKey() + ": " + header.getValue() + "\r\n").getBytes());
+ }
+ }
+
+ os.write("\r\n".getBytes());
+ if (bodyPart instanceof MultipartPayload) {
+ getPayload((MultipartPayload) bodyPart).writeTo(os);
+ } else if (bodyPart instanceof ByteArrayBodyPartPayload) {
+ final ByteArrayBodyPartPayload byteArrayBodyPart = (ByteArrayBodyPartPayload) bodyPart;
+ os.write(byteArrayBodyPart.getPayload(), byteArrayBodyPart.getOff(), byteArrayBodyPart.getLen());
+ } else {
+ throw new AssertionError(bodyPart.getClass());
+ }
+ os.write("\r\n".getBytes()); //CRLF for the next (starting or closing) boundary
+ }
+
+ os.write(("--" + boundary + "--").getBytes());
+ final String epilogue = multipartPayload.getEpilogue();
+ if (epilogue != null) {
+ os.write(("\r\n" + epilogue).getBytes());
+ }
+
+ }
+ return os;
+ }
+}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/java8/Base64.java b/scribejava-core/src/main/java/com/github/scribejava/core/java8/Base64.java
deleted file mode 100644
index 7e599c6e5..000000000
--- a/scribejava-core/src/main/java/com/github/scribejava/core/java8/Base64.java
+++ /dev/null
@@ -1,977 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.github.scribejava.core.java8;
-
-import java.io.FilterOutputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Objects;
-
-/**
- * This class consists exclusively of static methods for obtaining encoders and decoders for the Base64 encoding scheme.
- * The implementation of this class supports the following types of Base64 as specified in
- * RFC 4648 and
- * RFC 2045.
- *
- *
- * - Basic
- *
- * Uses "The Base64 Alphabet" as specified in Table 1 of RFC 4648 and RFC 2045 for encoding and decoding operation. The
- * encoder does not add any line feed (line separator) character. The decoder rejects data that contains characters
- * outside the base64 alphabet.
- *
- * - URL and Filename safe
- *
- * Uses the "URL and Filename safe Base64 Alphabet" as specified in Table 2 of RFC 4648 for encoding and decoding. The
- * encoder does not add any line feed (line separator) character. The decoder rejects data that contains characters
- * outside the base64 alphabet.
- *
- * - MIME
- *
- * Uses the "The Base64 Alphabet" as specified in Table 1 of RFC 2045 for encoding and decoding operation. The encoded
- * output must be represented in lines of no more than 76 characters each and uses a carriage return {@code '\r'}
- * followed immediately by a linefeed {@code '\n'} as the line separator. No line separator is added to the end of the
- * encoded output. All line separators or other characters not found in the base64 alphabet table are ignored in
- * decoding operation.
- *
- *
- *
- * Unless otherwise noted, passing a {@code null} argument to a method of this class will cause a {@link java.lang.NullPointerException
- * NullPointerException} to be thrown.
- *
- * @author Xueming Shen
- * @since 1.8
- */
-public class Base64 {
-
- private Base64() {
- }
-
- /**
- * Returns a {@link Encoder} that encodes using the
- * Basic type base64 encoding scheme.
- *
- * @return A Base64 encoder.
- */
- public static Encoder getEncoder() {
- return Encoder.RFC4648;
- }
-
- /**
- * Returns a {@link Encoder} that encodes using the
- * URL and Filename safe type base64 encoding scheme.
- *
- * @return A Base64 encoder.
- */
- public static Encoder getUrlEncoder() {
- return Encoder.RFC4648_URLSAFE;
- }
-
- /**
- * Returns a {@link Encoder} that encodes using the
- * MIME type base64 encoding scheme.
- *
- * @return A Base64 encoder.
- */
- public static Encoder getMimeEncoder() {
- return Encoder.RFC2045;
- }
-
- /**
- * Returns a {@link Encoder} that encodes using the
- * MIME type base64 encoding scheme with specified line length and line separators.
- *
- * @param lineLength the length of each output line (rounded down to nearest multiple of 4). If
- * {@code lineLength <= 0} the output will not be separated in lines
- * @param lineSeparator the line separator for each output line
- *
- * @return A Base64 encoder.
- *
- * @throws IllegalArgumentException if {@code lineSeparator} includes any character of "The Base64 Alphabet" as
- * specified in Table 1 of RFC 2045.
- */
- public static Encoder getMimeEncoder(int lineLength, byte[] lineSeparator) {
- Objects.requireNonNull(lineSeparator);
- int[] base64 = Decoder.FROM_BASE_64;
- for (byte b : lineSeparator) {
- if (base64[b & 0xff] != -1) {
- throw new IllegalArgumentException(
- "Illegal base64 line separator character 0x" + Integer.toString(b, 16));
- }
- }
- if (lineLength <= 0) {
- return Encoder.RFC4648;
- }
- return new Encoder(false, lineSeparator, lineLength >> 2 << 2, true);
- }
-
- /**
- * Returns a {@link Decoder} that decodes using the
- * Basic type base64 encoding scheme.
- *
- * @return A Base64 decoder.
- */
- public static Decoder getDecoder() {
- return Decoder.RFC4648;
- }
-
- /**
- * Returns a {@link Decoder} that decodes using the
- * URL and Filename safe type base64 encoding scheme.
- *
- * @return A Base64 decoder.
- */
- public static Decoder getUrlDecoder() {
- return Decoder.RFC4648_URLSAFE;
- }
-
- /**
- * Returns a {@link Decoder} that decodes using the
- * MIME type base64 decoding scheme.
- *
- * @return A Base64 decoder.
- */
- public static Decoder getMimeDecoder() {
- return Decoder.RFC2045;
- }
-
- /**
- * This class implements an encoder for encoding byte data using the Base64 encoding scheme as specified in RFC 4648
- * and RFC 2045.
- *
- *
- * Instances of {@link Encoder} class are safe for use by multiple concurrent threads.
- *
- *
- * Unless otherwise noted, passing a {@code null} argument to a method of this class will cause a
- * {@link java.lang.NullPointerException NullPointerException} to be thrown.
- *
- * @see Decoder
- * @since 1.8
- */
- public static class Encoder {
-
- private final byte[] newline;
- private final int linemax;
- private final boolean isURL;
- private final boolean doPadding;
-
- /**
- * This array is a lookup table that translates 6-bit positive integer index values into their "Base64 Alphabet"
- * equivalents as specified in "Table 1: The Base64 Alphabet" of RFC 2045 (and RFC 4648).
- */
- private static final char[] TO_BASE_64 = {
- 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
- 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
- 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
- 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
- '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/'
- };
-
- /**
- * It's the lookup table for "URL and Filename safe Base64" as specified in Table 2 of the RFC 4648, with the
- * '+' and '/' changed to '-' and '_'. This table is used when BASE64_URL is specified.
- */
- private static final char[] TO_BASE_64_URL = {
- 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
- 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
- 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
- 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
- '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '_'
- };
-
- private static final int MIMELINEMAX = 76;
- private static final byte[] CRLF = new byte[]{'\r', '\n'};
-
- static final Encoder RFC4648 = new Encoder(false, null, -1, true);
- static final Encoder RFC4648_URLSAFE = new Encoder(true, null, -1, true);
- static final Encoder RFC2045 = new Encoder(false, CRLF, MIMELINEMAX, true);
-
- private Encoder(boolean isURL, byte[] newline, int linemax, boolean doPadding) {
- this.isURL = isURL;
- this.newline = newline;
- this.linemax = linemax;
- this.doPadding = doPadding;
- }
-
- private int outLength(int srclen) {
- int len;
- if (doPadding) {
- len = 4 * ((srclen + 2) / 3);
- } else {
- int n = srclen % 3;
- len = 4 * (srclen / 3) + (n == 0 ? 0 : n + 1);
- }
- if (linemax > 0) // line separators
- {
- len += (len - 1) / linemax * newline.length;
- }
- return len;
- }
-
- /**
- * Encodes all bytes from the specified byte array into a newly-allocated byte array using the {@link Base64}
- * encoding scheme. The returned byte array is of the length of the resulting bytes.
- *
- * @param src the byte array to encode
- * @return A newly-allocated byte array containing the resulting encoded bytes.
- */
- public byte[] encode(byte[] src) {
- int len = outLength(src.length); // dst array size
- byte[] dst = new byte[len];
- int ret = encode0(src, 0, src.length, dst);
- if (ret != dst.length) {
- return Arrays.copyOf(dst, ret);
- }
- return dst;
- }
-
- /**
- * Encodes all bytes from the specified byte array using the {@link Base64} encoding scheme, writing the
- * resulting bytes to the given output byte array, starting at offset 0.
- *
- *
- * It is the responsibility of the invoker of this method to make sure the output byte array {@code dst} has
- * enough space for encoding all bytes from the input byte array. No bytes will be written to the output byte
- * array if the output byte array is not big enough.
- *
- * @param src the byte array to encode
- * @param dst the output byte array
- * @return The number of bytes written to the output byte array
- *
- * @throws IllegalArgumentException if {@code dst} does not have enough space for encoding all input bytes.
- */
- public int encode(byte[] src, byte[] dst) {
- int len = outLength(src.length); // dst array size
- if (dst.length < len) {
- throw new IllegalArgumentException(
- "Output byte array is too small for encoding all input bytes");
- }
- return encode0(src, 0, src.length, dst);
- }
-
- /**
- * Encodes the specified byte array into a String using the {@link Base64} encoding scheme.
- *
- *
- * This method first encodes all input bytes into a base64 encoded byte array and then constructs a new String
- * by using the encoded byte array and the {@link java.nio.charset.StandardCharsets#ISO_8859_1
- * ISO-8859-1} charset.
- *
- *
- * In other words, an invocation of this method has exactly the same effect as invoking
- * {@code new String(encode(src), StandardCharsets.ISO_8859_1)}.
- *
- * @param src the byte array to encode
- * @return A String containing the resulting Base64 encoded characters
- */
- @SuppressWarnings("deprecation")
- public String encodeToString(byte[] src) {
- byte[] encoded = encode(src);
- return new String(encoded, 0, 0, encoded.length);
- }
-
- /**
- * Encodes all remaining bytes from the specified byte buffer into a newly-allocated ByteBuffer using the
- * {@link Base64} encoding scheme.
- *
- * Upon return, the source buffer's position will be updated to its limit; its limit will not have been changed.
- * The returned output buffer's position will be zero and its limit will be the number of resulting encoded
- * bytes.
- *
- * @param buffer the source ByteBuffer to encode
- * @return A newly-allocated byte buffer containing the encoded bytes.
- */
- public ByteBuffer encode(ByteBuffer buffer) {
- int len = outLength(buffer.remaining());
- byte[] dst = new byte[len];
- int ret;
- if (buffer.hasArray()) {
- ret = encode0(buffer.array(),
- buffer.arrayOffset() + buffer.position(),
- buffer.arrayOffset() + buffer.limit(),
- dst);
- buffer.position(buffer.limit());
- } else {
- byte[] src = new byte[buffer.remaining()];
- buffer.get(src);
- ret = encode0(src, 0, src.length, dst);
- }
- if (ret != dst.length) {
- dst = Arrays.copyOf(dst, ret);
- }
- return ByteBuffer.wrap(dst);
- }
-
- /**
- * Wraps an output stream for encoding byte data using the {@link Base64} encoding scheme.
- *
- *
- * It is recommended to promptly close the returned output stream after use, during which it will flush all
- * possible leftover bytes to the underlying output stream. Closing the returned output stream will close the
- * underlying output stream.
- *
- * @param os the output stream.
- * @return the output stream for encoding the byte data into the specified Base64 encoded format
- */
- public OutputStream wrap(OutputStream os) {
- Objects.requireNonNull(os);
- return new EncOutputStream(os, isURL ? TO_BASE_64_URL : TO_BASE_64,
- newline, linemax, doPadding);
- }
-
- /**
- * Returns an encoder instance that encodes equivalently to this one, but without adding any padding character
- * at the end of the encoded byte data.
- *
- *
- * The encoding scheme of this encoder instance is unaffected by this invocation. The returned encoder instance
- * should be used for non-padding encoding operation.
- *
- * @return an equivalent encoder that encodes without adding any padding character at the end
- */
- public Encoder withoutPadding() {
- if (!doPadding) {
- return this;
- }
- return new Encoder(isURL, newline, linemax, false);
- }
-
- private int encode0(byte[] src, int off, int end, byte[] dst) {
- char[] base64 = isURL ? TO_BASE_64_URL : TO_BASE_64;
- int sp = off;
- int slen = (end - off) / 3 * 3;
- int sl = off + slen;
- if (linemax > 0 && slen > linemax / 4 * 3) {
- slen = linemax / 4 * 3;
- }
- int dp = 0;
- while (sp < sl) {
- int sl0 = Math.min(sp + slen, sl);
- for (int sp0 = sp, dp0 = dp; sp0 < sl0;) {
- int bits = (src[sp0++] & 0xff) << 16
- | (src[sp0++] & 0xff) << 8
- | (src[sp0++] & 0xff);
- dst[dp0++] = (byte) base64[(bits >>> 18) & 0x3f];
- dst[dp0++] = (byte) base64[(bits >>> 12) & 0x3f];
- dst[dp0++] = (byte) base64[(bits >>> 6) & 0x3f];
- dst[dp0++] = (byte) base64[bits & 0x3f];
- }
- int dlen = (sl0 - sp) / 3 * 4;
- dp += dlen;
- sp = sl0;
- if (dlen == linemax && sp < end) {
- for (byte b : newline) {
- dst[dp++] = b;
- }
- }
- }
- if (sp < end) { // 1 or 2 leftover bytes
- int b0 = src[sp++] & 0xff;
- dst[dp++] = (byte) base64[b0 >> 2];
- if (sp == end) {
- dst[dp++] = (byte) base64[(b0 << 4) & 0x3f];
- if (doPadding) {
- dst[dp++] = '=';
- dst[dp++] = '=';
- }
- } else {
- int b1 = src[sp++] & 0xff;
- dst[dp++] = (byte) base64[(b0 << 4) & 0x3f | (b1 >> 4)];
- dst[dp++] = (byte) base64[(b1 << 2) & 0x3f];
- if (doPadding) {
- dst[dp++] = '=';
- }
- }
- }
- return dp;
- }
- }
-
- /**
- * This class implements a decoder for decoding byte data using the Base64 encoding scheme as specified in RFC 4648
- * and RFC 2045.
- *
- *
- * The Base64 padding character {@code '='} is accepted and interpreted as the end of the encoded byte data, but is
- * not required. So if the final unit of the encoded byte data only has two or three Base64 characters (without the
- * corresponding padding character(s) padded), they are decoded as if followed by padding character(s). If there is
- * a padding character present in the final unit, the correct number of padding character(s) must be present,
- * otherwise {@code IllegalArgumentException} ( {@code IOException} when reading from a Base64 stream) is thrown
- * during decoding.
- *
- *
- * Instances of {@link Decoder} class are safe for use by multiple concurrent threads.
- *
- *
- * Unless otherwise noted, passing a {@code null} argument to a method of this class will cause a
- * {@link java.lang.NullPointerException NullPointerException} to be thrown.
- *
- * @see Encoder
- * @since 1.8
- */
- public static class Decoder {
-
- private final boolean isURL;
- private final boolean isMIME;
-
- /**
- * Lookup table for decoding unicode characters drawn from the "Base64 Alphabet" (as specified in Table 1 of RFC
- * 2045) into their 6-bit positive integer equivalents. Characters that are not in the Base64 alphabet but fall
- * within the bounds of the array are encoded to -1.
- *
- */
- private static final int[] FROM_BASE_64 = new int[256];
- static {
- Arrays.fill(FROM_BASE_64, -1);
- for (int i = 0; i < Encoder.TO_BASE_64.length; i++) {
- FROM_BASE_64[Encoder.TO_BASE_64[i]] = i;
- }
- FROM_BASE_64['='] = -2;
- }
-
- /**
- * Lookup table for decoding "URL and Filename safe Base64 Alphabet" as specified in Table2 of the RFC 4648.
- */
- private static final int[] FROM_BASE_64_URL = new int[256];
- static {
- Arrays.fill(FROM_BASE_64_URL, -1);
- for (int i = 0; i < Encoder.TO_BASE_64_URL.length; i++) {
- FROM_BASE_64_URL[Encoder.TO_BASE_64_URL[i]] = i;
- }
- FROM_BASE_64_URL['='] = -2;
- }
-
- static final Decoder RFC4648 = new Decoder(false, false);
- static final Decoder RFC4648_URLSAFE = new Decoder(true, false);
- static final Decoder RFC2045 = new Decoder(false, true);
-
- private Decoder(boolean isURL, boolean isMIME) {
- this.isURL = isURL;
- this.isMIME = isMIME;
- }
-
- /**
- * Decodes all bytes from the input byte array using the {@link Base64} encoding scheme, writing the results
- * into a newly-allocated output byte array. The returned byte array is of the length of the resulting bytes.
- *
- * @param src the byte array to decode
- *
- * @return A newly-allocated byte array containing the decoded bytes.
- *
- * @throws IllegalArgumentException if {@code src} is not in valid Base64 scheme
- */
- public byte[] decode(byte[] src) {
- byte[] dst = new byte[outLength(src, 0, src.length)];
- int ret = decode0(src, 0, src.length, dst);
- if (ret != dst.length) {
- dst = Arrays.copyOf(dst, ret);
- }
- return dst;
- }
-
- /**
- * Decodes a Base64 encoded String into a newly-allocated byte array using the {@link Base64} encoding scheme.
- *
- *
- * An invocation of this method has exactly the same effect as invoking
- * {@code decode(src.getBytes(StandardCharsets.ISO_8859_1))}
- *
- * @param src the string to decode
- *
- * @return A newly-allocated byte array containing the decoded bytes.
- *
- * @throws IllegalArgumentException if {@code src} is not in valid Base64 scheme
- */
- public byte[] decode(String src) {
- return decode(src.getBytes(StandardCharsets.ISO_8859_1));
- }
-
- /**
- * Decodes all bytes from the input byte array using the {@link Base64} encoding scheme, writing the results
- * into the given output byte array, starting at offset 0.
- *
- *
- * It is the responsibility of the invoker of this method to make sure the output byte array {@code dst} has
- * enough space for decoding all bytes from the input byte array. No bytes will be be written to the output byte
- * array if the output byte array is not big enough.
- *
- *
- * If the input byte array is not in valid Base64 encoding scheme then some bytes may have been written to the
- * output byte array before IllegalargumentException is thrown.
- *
- * @param src the byte array to decode
- * @param dst the output byte array
- *
- * @return The number of bytes written to the output byte array
- *
- * @throws IllegalArgumentException if {@code src} is not in valid Base64 scheme, or {@code dst} does not have
- * enough space for decoding all input bytes.
- */
- public int decode(byte[] src, byte[] dst) {
- int len = outLength(src, 0, src.length);
- if (dst.length < len) {
- throw new IllegalArgumentException(
- "Output byte array is too small for decoding all input bytes");
- }
- return decode0(src, 0, src.length, dst);
- }
-
- /**
- * Decodes all bytes from the input byte buffer using the {@link Base64} encoding scheme, writing the results
- * into a newly-allocated ByteBuffer.
- *
- *
- * Upon return, the source buffer's position will be updated to its limit; its limit will not have been changed.
- * The returned output buffer's position will be zero and its limit will be the number of resulting decoded
- * bytes
- *
- *
- * {@code IllegalArgumentException} is thrown if the input buffer is not in valid Base64 encoding scheme. The
- * position of the input buffer will not be advanced in this case.
- *
- * @param buffer the ByteBuffer to decode
- *
- * @return A newly-allocated byte buffer containing the decoded bytes
- *
- * @throws IllegalArgumentException if {@code src} is not in valid Base64 scheme.
- */
- public ByteBuffer decode(ByteBuffer buffer) {
- int pos0 = buffer.position();
- try {
- byte[] src;
- int sp, sl;
- if (buffer.hasArray()) {
- src = buffer.array();
- sp = buffer.arrayOffset() + buffer.position();
- sl = buffer.arrayOffset() + buffer.limit();
- buffer.position(buffer.limit());
- } else {
- src = new byte[buffer.remaining()];
- buffer.get(src);
- sp = 0;
- sl = src.length;
- }
- byte[] dst = new byte[outLength(src, sp, sl)];
- return ByteBuffer.wrap(dst, 0, decode0(src, sp, sl, dst));
- } catch (IllegalArgumentException iae) {
- buffer.position(pos0);
- throw iae;
- }
- }
-
- /**
- * Returns an input stream for decoding {@link Base64} encoded byte stream.
- *
- *
- * The {@code read} methods of the returned {@code InputStream} will throw {@code IOException} when reading
- * bytes that cannot be decoded.
- *
- *
- * Closing the returned input stream will close the underlying input stream.
- *
- * @param is the input stream
- *
- * @return the input stream for decoding the specified Base64 encoded byte stream
- */
- public InputStream wrap(InputStream is) {
- Objects.requireNonNull(is);
- return new DecInputStream(is, isURL ? FROM_BASE_64_URL : FROM_BASE_64, isMIME);
- }
-
- private int outLength(byte[] src, int sp, int sl) {
- int[] base64 = isURL ? FROM_BASE_64_URL : FROM_BASE_64;
- int paddings = 0;
- int len = sl - sp;
- if (len == 0) {
- return 0;
- }
- if (len < 2) {
- if (isMIME && base64[0] == -1) {
- return 0;
- }
- throw new IllegalArgumentException(
- "Input byte[] should at least have 2 bytes for base64 bytes");
- }
- if (isMIME) {
- // scan all bytes to fill out all non-alphabet. a performance
- // trade-off of pre-scan or Arrays.copyOf
- int n = 0;
- while (sp < sl) {
- int b = src[sp++] & 0xff;
- if (b == '=') {
- len -= (sl - sp + 1);
- break;
- }
- if ((b = base64[b]) == -1) {
- n++;
- }
- }
- len -= n;
- } else {
- if (src[sl - 1] == '=') {
- paddings++;
- if (src[sl - 2] == '=') {
- paddings++;
- }
- }
- }
- if (paddings == 0 && (len & 0x3) != 0) {
- paddings = 4 - (len & 0x3);
- }
- return 3 * ((len + 3) / 4) - paddings;
- }
-
- private int decode0(byte[] src, int sp, int sl, byte[] dst) {
- int[] base64 = isURL ? FROM_BASE_64_URL : FROM_BASE_64;
- int dp = 0;
- int bits = 0;
- int shiftto = 18; // pos of first byte of 4-byte atom
- while (sp < sl) {
- int b = src[sp++] & 0xff;
- if ((b = base64[b]) < 0) {
- if (b == -2) { // padding byte '='
- // = shiftto==18 unnecessary padding
- // x= shiftto==12 a dangling single x
- // x to be handled together with non-padding case
- // xx= shiftto==6&&sp==sl missing last =
- // xx=y shiftto==6 last is not =
- if (shiftto == 6 && (sp == sl || src[sp++] != '=')
- || shiftto == 18) {
- throw new IllegalArgumentException(
- "Input byte array has wrong 4-byte ending unit");
- }
- break;
- }
- if (isMIME) // skip if for rfc2045
- {
- continue;
- } else {
- throw new IllegalArgumentException(
- "Illegal base64 character "
- + Integer.toString(src[sp - 1], 16));
- }
- }
- bits |= b << shiftto;
- shiftto -= 6;
- if (shiftto < 0) {
- dst[dp++] = (byte) (bits >> 16);
- dst[dp++] = (byte) (bits >> 8);
- dst[dp++] = (byte) (bits);
- shiftto = 18;
- bits = 0;
- }
- }
- // reached end of byte array or hit padding '=' characters.
- if (shiftto == 6) {
- dst[dp++] = (byte) (bits >> 16);
- } else if (shiftto == 0) {
- dst[dp++] = (byte) (bits >> 16);
- dst[dp++] = (byte) (bits >> 8);
- } else if (shiftto == 12) {
- // dangling single "x", incorrectly encoded.
- throw new IllegalArgumentException(
- "Last unit does not have enough valid bits");
- }
- // anything left is invalid, if is not MIME.
- // if MIME, ignore all non-base64 character
- while (sp < sl) {
- if (isMIME && base64[src[sp++]] < 0) {
- continue;
- }
- throw new IllegalArgumentException(
- "Input byte array has incorrect ending byte at " + sp);
- }
- return dp;
- }
- }
-
- /*
- * An output stream for encoding bytes into the Base64.
- */
- private static class EncOutputStream extends FilterOutputStream {
-
- private int leftover;
- private int b0, b1, b2;
- private boolean closed;
-
- private final char[] base64; // byte->base64 mapping
- private final byte[] newline; // line separator, if needed
- private final int linemax;
- private final boolean doPadding;// whether or not to pad
- private int linepos;
-
- EncOutputStream(OutputStream os, char[] base64,
- byte[] newline, int linemax, boolean doPadding) {
- super(os);
- this.base64 = base64;
- this.newline = newline;
- this.linemax = linemax;
- this.doPadding = doPadding;
- }
-
- @Override
- public void write(int b) throws IOException {
- byte[] buf = new byte[1];
- buf[0] = (byte) (b & 0xff);
- write(buf, 0, 1);
- }
-
- private void checkNewline() throws IOException {
- if (linepos == linemax) {
- out.write(newline);
- linepos = 0;
- }
- }
-
- @Override
- public void write(byte[] b, int off, int len) throws IOException {
- if (closed) {
- throw new IOException("Stream is closed");
- }
- if (off < 0 || len < 0 || off + len > b.length) {
- throw new ArrayIndexOutOfBoundsException();
- }
- if (len == 0) {
- return;
- }
- if (leftover != 0) {
- if (leftover == 1) {
- b1 = b[off++] & 0xff;
- len--;
- if (len == 0) {
- leftover++;
- return;
- }
- }
- b2 = b[off++] & 0xff;
- len--;
- checkNewline();
- out.write(base64[b0 >> 2]);
- out.write(base64[(b0 << 4) & 0x3f | (b1 >> 4)]);
- out.write(base64[(b1 << 2) & 0x3f | (b2 >> 6)]);
- out.write(base64[b2 & 0x3f]);
- linepos += 4;
- }
- int nBits24 = len / 3;
- leftover = len - (nBits24 * 3);
- while (nBits24-- > 0) {
- checkNewline();
- int bits = (b[off++] & 0xff) << 16
- | (b[off++] & 0xff) << 8
- | (b[off++] & 0xff);
- out.write(base64[(bits >>> 18) & 0x3f]);
- out.write(base64[(bits >>> 12) & 0x3f]);
- out.write(base64[(bits >>> 6) & 0x3f]);
- out.write(base64[bits & 0x3f]);
- linepos += 4;
- }
- if (leftover == 1) {
- b0 = b[off++] & 0xff;
- } else if (leftover == 2) {
- b0 = b[off++] & 0xff;
- b1 = b[off++] & 0xff;
- }
- }
-
- @Override
- public void close() throws IOException {
- if (!closed) {
- closed = true;
- if (leftover == 1) {
- checkNewline();
- out.write(base64[b0 >> 2]);
- out.write(base64[(b0 << 4) & 0x3f]);
- if (doPadding) {
- out.write('=');
- out.write('=');
- }
- } else if (leftover == 2) {
- checkNewline();
- out.write(base64[b0 >> 2]);
- out.write(base64[(b0 << 4) & 0x3f | (b1 >> 4)]);
- out.write(base64[(b1 << 2) & 0x3f]);
- if (doPadding) {
- out.write('=');
- }
- }
- leftover = 0;
- out.close();
- }
- }
- }
-
- /*
- * An input stream for decoding Base64 bytes
- */
- private static class DecInputStream extends InputStream {
-
- private final InputStream is;
- private final boolean isMIME;
- private final int[] base64; // base64 -> byte mapping
- private int bits; // 24-bit buffer for decoding
- private int nextin = 18; // next available "off" in "bits" for input;
- // -> 18, 12, 6, 0
- private int nextout = -8; // next available "off" in "bits" for output;
- // -> 8, 0, -8 (no byte for output)
- private boolean eof;
- private boolean closed;
-
- private final byte[] sbBuf = new byte[1];
-
- DecInputStream(InputStream is, int[] base64, boolean isMIME) {
- this.is = is;
- this.base64 = base64;
- this.isMIME = isMIME;
- }
-
- @Override
- public int read() throws IOException {
- return read(sbBuf, 0, 1) == -1 ? -1 : sbBuf[0] & 0xff;
- }
-
- @Override
- public int read(byte[] b, int off, int len) throws IOException {
- if (closed) {
- throw new IOException("Stream is closed");
- }
- if (eof && nextout < 0) // eof and no leftover
- {
- return -1;
- }
- if (off < 0 || len < 0 || len > b.length - off) {
- throw new IndexOutOfBoundsException();
- }
- int oldOff = off;
- if (nextout >= 0) { // leftover output byte(s) in bits buf
- do {
- if (len == 0) {
- return off - oldOff;
- }
- b[off++] = (byte) (bits >> nextout);
- len--;
- nextout -= 8;
- } while (nextout >= 0);
- bits = 0;
- }
- while (len > 0) {
- int v = is.read();
- if (v == -1) {
- eof = true;
- if (nextin != 18) {
- if (nextin == 12) {
- throw new IOException("Base64 stream has one un-decoded dangling byte.");
- }
- // treat ending xx/xxx without padding character legal.
- // same logic as v == '=' below
- b[off++] = (byte) (bits >> (16));
- len--;
- if (nextin == 0) { // only one padding byte
- if (len == 0) { // no enough output space
- bits >>= 8; // shift to lowest byte
- nextout = 0;
- } else {
- b[off++] = (byte) (bits >> 8);
- }
- }
- }
- if (off == oldOff) {
- return -1;
- } else {
- return off - oldOff;
- }
- }
- if (v == '=') { // padding byte(s)
- // = shiftto==18 unnecessary padding
- // x= shiftto==12 dangling x, invalid unit
- // xx= shiftto==6 && missing last '='
- // xx=y or last is not '='
- if (nextin == 18 || nextin == 12
- || nextin == 6 && is.read() != '=') {
- throw new IOException("Illegal base64 ending sequence:" + nextin);
- }
- b[off++] = (byte) (bits >> (16));
- len--;
- if (nextin == 0) { // only one padding byte
- if (len == 0) { // no enough output space
- bits >>= 8; // shift to lowest byte
- nextout = 0;
- } else {
- b[off++] = (byte) (bits >> 8);
- }
- }
- eof = true;
- break;
- }
- if ((v = base64[v]) == -1) {
- if (isMIME) // skip if for rfc2045
- {
- continue;
- } else {
- throw new IOException("Illegal base64 character "
- + Integer.toString(v, 16));
- }
- }
- bits |= v << nextin;
- if (nextin == 0) {
- nextin = 18; // clear for next
- nextout = 16;
- while (nextout >= 0) {
- b[off++] = (byte) (bits >> nextout);
- len--;
- nextout -= 8;
- if (len == 0 && nextout >= 0) { // don't clean "bits"
- return off - oldOff;
- }
- }
- bits = 0;
- } else {
- nextin -= 6;
- }
- }
- return off - oldOff;
- }
-
- @Override
- public int available() throws IOException {
- if (closed) {
- throw new IOException("Stream is closed");
- }
- return is.available(); // TBD:
- }
-
- @Override
- public void close() throws IOException {
- if (!closed) {
- closed = true;
- is.close();
- }
- }
- }
-}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/java8/Consumer.java b/scribejava-core/src/main/java/com/github/scribejava/core/java8/Consumer.java
deleted file mode 100644
index 83306b7be..000000000
--- a/scribejava-core/src/main/java/com/github/scribejava/core/java8/Consumer.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.github.scribejava.core.java8;
-
-/**
- * Represents an operation that accepts a single input argument and returns no result. Unlike most other functional
- * interfaces, {@code Consumer} is expected to operate via side-effects.
- *
- *
- * This is a functional interface
- * whose functional method is {@link #accept(Object)}.
- *
- * @param the type of the input to the operation
- *
- * @since 1.8
- */
-public interface Consumer {
-
- /**
- * Performs this operation on the given argument.
- *
- * @param t the input argument
- */
- void accept(T t);
-}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/DeviceAuthorization.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/DeviceAuthorization.java
new file mode 100644
index 000000000..dfdc42c36
--- /dev/null
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/model/DeviceAuthorization.java
@@ -0,0 +1,105 @@
+package com.github.scribejava.core.model;
+
+/**
+ * Device Authorization Response
+ *
+ * @see rfc8628
+ */
+public class DeviceAuthorization {
+
+ /**
+ * device_code
+ *
+ * REQUIRED. The device verification code.
+ */
+ private final String deviceCode;
+
+ /**
+ * user_code
+ *
+ * REQUIRED. The end-user verification code.
+ */
+ private final String userCode;
+
+ /**
+ * verification_uri
+ *
+ * REQUIRED. The end-user verification URI on the authorization server. The URI should be short and easy to remember
+ * as end users will be asked to manually type it into their user agent.
+ */
+ private final String verificationUri;
+
+ /**
+ * verification_uri_complete
+ *
+ * OPTIONAL. A verification URI that includes the "user_code" (or other information with the same function as the
+ * "user_code"), which is designed for non-textual transmission.
+ */
+ private String verificationUriComplete;
+
+ /**
+ * expires_in
+ *
+ * REQUIRED. The lifetime in seconds of the "device_code" and "user_code".
+ */
+ private final int expiresInSeconds;
+
+ /**
+ * interval
+ *
+ * OPTIONAL. The minimum amount of time in seconds that the client SHOULD wait between polling requests to the token
+ * endpoint. If no value is provided, clients MUST use 5 as the default.
+ */
+ private int intervalSeconds = 5;
+
+ public DeviceAuthorization(String deviceCode, String userCode, String verificationUri, int expiresInSeconds) {
+ this.deviceCode = deviceCode;
+ this.userCode = userCode;
+ this.verificationUri = verificationUri;
+ this.expiresInSeconds = expiresInSeconds;
+ }
+
+ public void setVerificationUriComplete(String verificationUriComplete) {
+ this.verificationUriComplete = verificationUriComplete;
+ }
+
+ public void setIntervalSeconds(int intervalSeconds) {
+ this.intervalSeconds = intervalSeconds;
+ }
+
+ public String getDeviceCode() {
+ return deviceCode;
+ }
+
+ public String getUserCode() {
+ return userCode;
+ }
+
+ public String getVerificationUri() {
+ return verificationUri;
+ }
+
+ public String getVerificationUriComplete() {
+ return verificationUriComplete;
+ }
+
+ public long getExpiresInSeconds() {
+ return expiresInSeconds;
+ }
+
+ public int getIntervalSeconds() {
+ return intervalSeconds;
+ }
+
+ @Override
+ public String toString() {
+ return "DeviceAuthorization{"
+ + "'deviceCode'='" + deviceCode
+ + "', 'userCode'='" + userCode
+ + "', 'verificationUri'='" + verificationUri
+ + "', 'verificationUriComplete'='" + verificationUriComplete
+ + "', 'expiresInSeconds'='" + expiresInSeconds
+ + "', 'intervalSeconds'='" + intervalSeconds + "'}";
+ }
+
+}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth2AccessToken.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth2AccessToken.java
index 37b951f13..f02bc57c6 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth2AccessToken.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth2AccessToken.java
@@ -5,10 +5,9 @@
/**
* Represents an OAuth 2 Access token.
- *
* http://tools.ietf.org/html/rfc6749#section-5.1
*
- * @see OAuth 2 Access Token Specification
+ * @see OAuth 2 Access Token Specification
*/
public class OAuth2AccessToken extends Token {
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth2AccessTokenErrorResponse.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth2AccessTokenErrorResponse.java
index 86ca38d88..5c4a65a19 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth2AccessTokenErrorResponse.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth2AccessTokenErrorResponse.java
@@ -1,40 +1,31 @@
package com.github.scribejava.core.model;
-import com.github.scribejava.core.exceptions.OAuthException;
+import com.github.scribejava.core.oauth2.OAuth2Error;
+import java.io.IOException;
import java.net.URI;
/**
* Representing "5.2. Error Response"
*/
-public class OAuth2AccessTokenErrorResponse extends OAuthException {
+public class OAuth2AccessTokenErrorResponse extends OAuthResponseException {
private static final long serialVersionUID = 2309424849700276816L;
- public enum ErrorCode {
- invalid_request, invalid_client, invalid_grant, unauthorized_client, unsupported_grant_type, invalid_scope,
- /**
- * @see RFC 7009, 2.2.1. Error Response
- */
- unsupported_token_type
- }
-
- private final ErrorCode errorCode;
+ private final OAuth2Error error;
private final String errorDescription;
private final URI errorUri;
- private final String rawResponse;
- public OAuth2AccessTokenErrorResponse(ErrorCode errorCode, String errorDescription, URI errorUri,
- String rawResponse) {
+ public OAuth2AccessTokenErrorResponse(OAuth2Error error, String errorDescription, URI errorUri,
+ Response rawResponse) throws IOException {
super(rawResponse);
- this.errorCode = errorCode;
+ this.error = error;
this.errorDescription = errorDescription;
this.errorUri = errorUri;
- this.rawResponse = rawResponse;
}
- public ErrorCode getErrorCode() {
- return errorCode;
+ public OAuth2Error getError() {
+ return error;
}
public String getErrorDescription() {
@@ -45,7 +36,4 @@ public URI getErrorUri() {
return errorUri;
}
- public String getRawResponse() {
- return rawResponse;
- }
}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthAsyncRequestCallback.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthAsyncRequestCallback.java
index 10f398fc4..7719314d2 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthAsyncRequestCallback.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthAsyncRequestCallback.java
@@ -2,6 +2,11 @@
public interface OAuthAsyncRequestCallback {
+ /**
+ * Implementations of this method should close provided response in case it implements {@link java.io.Closeable}
+ *
+ * @param response response
+ */
void onCompleted(T response);
void onThrowable(Throwable t);
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthRequest.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthRequest.java
index a33ac7d72..ccf26157c 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthRequest.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthRequest.java
@@ -1,7 +1,8 @@
package com.github.scribejava.core.model;
import com.github.scribejava.core.exceptions.OAuthException;
-import com.github.scribejava.core.httpclient.MultipartPayload;
+import com.github.scribejava.core.httpclient.multipart.BodyPartPayload;
+import com.github.scribejava.core.httpclient.multipart.MultipartPayload;
import java.io.File;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -10,6 +11,7 @@
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.Map;
+import java.util.TreeMap;
/**
* The representation of an OAuth HttpRequest.
@@ -22,7 +24,7 @@ public class OAuthRequest {
private final Verb verb;
private final ParameterList querystringParams = new ParameterList();
private final ParameterList bodyParams = new ParameterList();
- private final Map headers = new HashMap<>();
+ private final Map headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
private String charset;
@@ -95,7 +97,7 @@ public String getCompleteUrl() {
* @param value the header value
*/
public void addHeader(String key, String value) {
- this.headers.put(key, value);
+ headers.put(key, value);
}
/**
@@ -105,7 +107,7 @@ public void addHeader(String key, String value) {
* @param value the parameter value
*/
public void addBodyParameter(String key, String value) {
- this.bodyParams.add(key, value);
+ bodyParams.add(key, value);
}
/**
@@ -115,7 +117,7 @@ public void addBodyParameter(String key, String value) {
* @param value the parameter value
*/
public void addQuerystringParameter(String key, String value) {
- this.querystringParams.add(key, value);
+ querystringParams.add(key, value);
}
public void addParameter(String key, String value) {
@@ -126,41 +128,45 @@ public void addParameter(String key, String value) {
}
}
- /**
- * Set boundary of multipart request
- *
- * @param boundary can be any string
- */
- public void initMultipartBoundary(String boundary) {
- multipartPayload = new MultipartPayload(boundary == null
- ? Long.toString(System.currentTimeMillis())
- : boundary);
+ public MultipartPayload getMultipartPayload() {
+ return multipartPayload;
}
- /**
- * init boundary of multipart request with default boundary
- */
- public void initMultipartBoundary() {
- initMultipartBoundary(null);
+ public void setMultipartPayload(MultipartPayload multipartPayload) {
+ this.multipartPayload = multipartPayload;
}
- /**
- * you can invoke {@link #initMultipartBoundary(java.lang.String) } to set custom boundary
- */
- public void addMultipartPayload(String contentDisposition, String contentType, byte[] payload) {
- if (multipartPayload == null) {
- initMultipartBoundary();
- }
- multipartPayload.addMultipartPayload(contentDisposition, contentType, payload);
+ public void initMultipartPayload() {
+ this.multipartPayload = new MultipartPayload();
+ }
+
+ public void initMultipartPayload(String boundary) {
+ this.multipartPayload = new MultipartPayload(boundary);
}
- public void setMultipartPayload(String contentDisposition, String contentType, byte[] payload) {
- setMultipartPayload(null, contentDisposition, contentType, payload);
+ public void initMultipartPayload(String subtype, String boundary) {
+ this.multipartPayload = new MultipartPayload(subtype, boundary);
}
- public void setMultipartPayload(String boundary, String contentDisposition, String contentType, byte[] payload) {
- initMultipartBoundary(boundary);
- multipartPayload.addMultipartPayload(contentDisposition, contentType, payload);
+ public void initMultipartPayload(Map headers) {
+ this.multipartPayload = new MultipartPayload(headers);
+ }
+
+ public void initMultipartPayload(String boundary, Map headers) {
+ this.multipartPayload = new MultipartPayload(boundary, headers);
+ }
+
+ public void initMultipartPayload(String subtype, String boundary, Map headers) {
+ this.multipartPayload = new MultipartPayload(subtype, boundary, headers);
+ }
+
+ public void setBodyPartPayloadInMultipartPayload(BodyPartPayload bodyPartPayload) {
+ initMultipartPayload();
+ addBodyPartPayloadInMultipartPayload(bodyPartPayload);
+ }
+
+ public void addBodyPartPayloadInMultipartPayload(BodyPartPayload bodyPartPayload) {
+ multipartPayload.addBodyPart(bodyPartPayload);
}
/**
@@ -277,10 +283,6 @@ public byte[] getByteArrayPayload() {
}
}
- public MultipartPayload getMultipartPayloads() {
- return multipartPayload;
- }
-
public File getFilePayload() {
return filePayload;
}
@@ -313,6 +315,15 @@ public void setCharset(String charsetName) {
public interface ResponseConverter {
+ /**
+ * Implementations of this method should close provided Response in case response is not included in the return
+ * Object of type <T> Then responsibility to close response is in on the
+ * {@link com.github.scribejava.core.model.OAuthAsyncRequestCallback#onCompleted(java.lang.Object) }
+ *
+ * @param response response
+ * @return T
+ * @throws IOException IOException
+ */
T convert(Response response) throws IOException;
}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthResponseException.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthResponseException.java
new file mode 100644
index 000000000..5b6da25cf
--- /dev/null
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthResponseException.java
@@ -0,0 +1,44 @@
+package com.github.scribejava.core.model;
+
+import com.github.scribejava.core.exceptions.OAuthException;
+import java.io.IOException;
+import java.util.Objects;
+
+public class OAuthResponseException extends OAuthException {
+
+ private static final long serialVersionUID = 1309424849700276816L;
+
+ private final transient Response response;
+
+ public OAuthResponseException(Response rawResponse) throws IOException {
+ super(rawResponse.getBody());
+ this.response = rawResponse;
+ }
+
+ public Response getResponse() {
+ return response;
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 5;
+ hash = 29 * hash + Objects.hashCode(response);
+ return hash;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final OAuthResponseException other = (OAuthResponseException) obj;
+ return Objects.equals(this.response, other.response);
+ }
+
+}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/Response.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/Response.java
index 4a84c76ef..553c6cda5 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/model/Response.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/model/Response.java
@@ -4,14 +4,24 @@
import java.io.InputStream;
import java.util.Map;
import com.github.scribejava.core.utils.StreamUtils;
+import java.io.Closeable;
-public class Response {
+/**
+ * An HTTP response.
+ *
+ *
+ * This response may contain a non-null body stream of the HttpUrlConnection. If so, this body must be closed to avoid
+ * leaking resources. Use either {@link #getBody()} or {@link #close()} to close the body.
+ */
+public class Response implements Closeable {
private final int code;
private final String message;
private final Map headers;
private String body;
private InputStream stream;
+ private Closeable[] closeables;
+ private boolean closed;
private Response(int code, String message, Map headers) {
this.code = code;
@@ -19,9 +29,11 @@ private Response(int code, String message, Map headers) {
this.headers = headers;
}
- public Response(int code, String message, Map headers, InputStream stream) {
+ public Response(int code, String message, Map headers, InputStream stream,
+ Closeable... closeables) {
this(code, message, headers);
this.stream = stream;
+ this.closeables = closeables;
}
public Response(int code, String message, Map headers, String body) {
@@ -45,6 +57,12 @@ public boolean isSuccessful() {
return code >= 200 && code < 400;
}
+ /**
+ * Returns the response body as a string, closing the stream that backs it. Idempotent.
+ *
+ * @return body as string
+ * @throws IOException IO Exception
+ */
public String getBody() throws IOException {
return body == null ? parseBodyContents() : body;
}
@@ -100,11 +118,37 @@ public String getHeader(String name) {
@Override
public String toString() {
- return "Response{" +
- "code=" + code +
- ", message='" + message + '\'' +
- ", body='" + body + '\'' +
- ", headers=" + headers +
- '}';
+ return "Response{"
+ + "code=" + code
+ + ", message='" + message + '\''
+ + ", body='" + body + '\''
+ + ", headers=" + headers
+ + '}';
+ }
+
+ @Override
+ public void close() throws IOException {
+ if (closed) {
+ return;
+ }
+ IOException ioException = null;
+ if (closeables != null) {
+ for (Closeable closeable : closeables) {
+ if (closeable == null) {
+ continue;
+ }
+ try {
+ closeable.close();
+ } catch (IOException ioE) {
+ if (ioException != null) {
+ ioException = ioE;
+ }
+ }
+ }
+ }
+ if (ioException != null) {
+ throw ioException;
+ }
+ closed = true;
}
}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/oauth/AccessTokenRequestParams.java b/scribejava-core/src/main/java/com/github/scribejava/core/oauth/AccessTokenRequestParams.java
new file mode 100644
index 000000000..d45377a56
--- /dev/null
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/oauth/AccessTokenRequestParams.java
@@ -0,0 +1,79 @@
+package com.github.scribejava.core.oauth;
+
+import com.github.scribejava.core.builder.ScopeBuilder;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * not thread safe
+ */
+public class AccessTokenRequestParams {
+
+ private final String code;
+ private String pkceCodeVerifier;
+ private String scope;
+ private Map extraParameters;
+
+ public AccessTokenRequestParams(String code) {
+ this.code = code;
+ }
+
+ public static AccessTokenRequestParams create(String code) {
+ return new AccessTokenRequestParams(code);
+ }
+
+ public AccessTokenRequestParams pkceCodeVerifier(String pkceCodeVerifier) {
+ this.pkceCodeVerifier = pkceCodeVerifier;
+ return this;
+ }
+
+ public AccessTokenRequestParams scope(String scope) {
+ this.scope = scope;
+ return this;
+ }
+
+ public AccessTokenRequestParams scope(ScopeBuilder scope) {
+ this.scope = scope.build();
+ return this;
+ }
+
+ public AccessTokenRequestParams addExtraParameters(Map extraParameters) {
+ if (extraParameters == null || extraParameters.isEmpty()) {
+ return this;
+ }
+ if (this.extraParameters == null) {
+ extraParameters = new HashMap<>();
+ }
+ this.extraParameters.putAll(extraParameters);
+ return this;
+ }
+
+ public AccessTokenRequestParams addExtraParameter(String name, String value) {
+ if (this.extraParameters == null) {
+ extraParameters = new HashMap<>();
+ }
+ this.extraParameters.put(name, value);
+ return this;
+ }
+
+ public AccessTokenRequestParams setExtraParameters(Map extraParameters) {
+ this.extraParameters = extraParameters;
+ return this;
+ }
+
+ public Map getExtraParameters() {
+ return extraParameters;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public String getPkceCodeVerifier() {
+ return pkceCodeVerifier;
+ }
+
+ public String getScope() {
+ return scope;
+ }
+}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/oauth/AuthorizationUrlBuilder.java b/scribejava-core/src/main/java/com/github/scribejava/core/oauth/AuthorizationUrlBuilder.java
new file mode 100644
index 000000000..fd02f60dd
--- /dev/null
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/oauth/AuthorizationUrlBuilder.java
@@ -0,0 +1,61 @@
+package com.github.scribejava.core.oauth;
+
+import com.github.scribejava.core.pkce.PKCE;
+import com.github.scribejava.core.pkce.PKCEService;
+import java.util.HashMap;
+import java.util.Map;
+
+public class AuthorizationUrlBuilder {
+
+ private final OAuth20Service oauth20Service;
+
+ private String state;
+ private Map additionalParams;
+ private PKCE pkce;
+ private String scope;
+
+ public AuthorizationUrlBuilder(OAuth20Service oauth20Service) {
+ this.oauth20Service = oauth20Service;
+ }
+
+ public AuthorizationUrlBuilder state(String state) {
+ this.state = state;
+ return this;
+ }
+
+ public AuthorizationUrlBuilder additionalParams(Map additionalParams) {
+ this.additionalParams = additionalParams;
+ return this;
+ }
+
+ public AuthorizationUrlBuilder pkce(PKCE pkce) {
+ this.pkce = pkce;
+ return this;
+ }
+
+ public AuthorizationUrlBuilder initPKCE() {
+ this.pkce = PKCEService.defaultInstance().generatePKCE();
+ return this;
+ }
+
+ public AuthorizationUrlBuilder scope(String scope) {
+ this.scope = scope;
+ return this;
+ }
+
+ public PKCE getPkce() {
+ return pkce;
+ }
+
+ public String build() {
+ final Map params;
+ if (pkce == null) {
+ params = additionalParams;
+ } else {
+ params = additionalParams == null ? new HashMap() : new HashMap<>(additionalParams);
+ params.putAll(pkce.getAuthorizationUrlParams());
+ }
+ return oauth20Service.getApi().getAuthorizationUrl(oauth20Service.getResponseType(), oauth20Service.getApiKey(),
+ oauth20Service.getCallback(), scope == null ? oauth20Service.getDefaultScope() : scope, state, params);
+ }
+}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuth10aService.java b/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuth10aService.java
index b168a9f2c..f48308b2e 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuth10aService.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuth10aService.java
@@ -22,27 +22,31 @@
public class OAuth10aService extends OAuthService {
private static final String VERSION = "1.0";
- private final OutputStream debugStream;
private final DefaultApi10a api;
+ private final String scope;
public OAuth10aService(DefaultApi10a api, String apiKey, String apiSecret, String callback, String scope,
OutputStream debugStream, String userAgent, HttpClientConfig httpClientConfig, HttpClient httpClient) {
- super(apiKey, apiSecret, callback, scope, userAgent, httpClientConfig, httpClient);
- this.debugStream = debugStream;
+ super(apiKey, apiSecret, callback, debugStream, userAgent, httpClientConfig, httpClient);
this.api = api;
+ this.scope = scope;
}
public OAuth1RequestToken getRequestToken() throws IOException, InterruptedException, ExecutionException {
- log("obtaining request token from %s", api.getRequestTokenEndpoint());
+ if (isDebug()) {
+ log("obtaining request token from %s", api.getRequestTokenEndpoint());
+ }
final OAuthRequest request = prepareRequestTokenRequest();
log("sending request...");
- final Response response = execute(request);
- final String body = response.getBody();
-
- log("response status code: %s", response.getCode());
- log("response body: %s", body);
- return api.getRequestTokenExtractor().extract(response);
+ try ( Response response = execute(request)) {
+ if (isDebug()) {
+ final String body = response.getBody();
+ log("response status code: %s", response.getCode());
+ log("response body: %s", body);
+ }
+ return api.getRequestTokenExtractor().extract(response);
+ }
}
public Future getRequestTokenAsync() {
@@ -50,12 +54,16 @@ public Future getRequestTokenAsync() {
}
public Future getRequestTokenAsync(OAuthAsyncRequestCallback callback) {
- log("async obtaining request token from %s", api.getRequestTokenEndpoint());
+ if (isDebug()) {
+ log("async obtaining request token from %s", api.getRequestTokenEndpoint());
+ }
final OAuthRequest request = prepareRequestTokenRequest();
return execute(request, callback, new OAuthRequest.ResponseConverter() {
@Override
public OAuth1RequestToken convert(Response response) throws IOException {
- return getApi().getRequestTokenExtractor().extract(response);
+ final OAuth1RequestToken token = getApi().getRequestTokenExtractor().extract(response);
+ response.close();
+ return token;
}
});
}
@@ -66,7 +74,9 @@ protected OAuthRequest prepareRequestTokenRequest() {
if (callback == null) {
callback = OAuthConstants.OOB;
}
- log("setting oauth_callback to %s", callback);
+ if (isDebug()) {
+ log("setting oauth_callback to %s", callback);
+ }
request.addOAuthParameter(OAuthConstants.CALLBACK, callback);
addOAuthParams(request, "");
appendSignature(request);
@@ -79,21 +89,25 @@ protected void addOAuthParams(OAuthRequest request, String tokenSecret) {
request.addOAuthParameter(OAuthConstants.CONSUMER_KEY, getApiKey());
request.addOAuthParameter(OAuthConstants.SIGN_METHOD, api.getSignatureService().getSignatureMethod());
request.addOAuthParameter(OAuthConstants.VERSION, getVersion());
- final String scope = getScope();
if (scope != null) {
request.addOAuthParameter(OAuthConstants.SCOPE, scope);
}
request.addOAuthParameter(OAuthConstants.SIGNATURE, getSignature(request, tokenSecret));
- log("appended additional OAuth parameters: %s", request.getOauthParameters());
+ if (isDebug()) {
+ log("appended additional OAuth parameters: %s", request.getOauthParameters());
+ }
}
public OAuth1AccessToken getAccessToken(OAuth1RequestToken requestToken, String oauthVerifier)
throws IOException, InterruptedException, ExecutionException {
- log("obtaining access token from %s", api.getAccessTokenEndpoint());
+ if (isDebug()) {
+ log("obtaining access token from %s", api.getAccessTokenEndpoint());
+ }
final OAuthRequest request = prepareAccessTokenRequest(requestToken, oauthVerifier);
- final Response response = execute(request);
- return api.getAccessTokenExtractor().extract(response);
+ try ( Response response = execute(request)) {
+ return api.getAccessTokenExtractor().extract(response);
+ }
}
public Future getAccessTokenAsync(OAuth1RequestToken requestToken, String oauthVerifier) {
@@ -111,12 +125,16 @@ public Future getAccessTokenAsync(OAuth1RequestToken requestT
*/
public Future getAccessTokenAsync(OAuth1RequestToken requestToken, String oauthVerifier,
OAuthAsyncRequestCallback callback) {
- log("async obtaining access token from %s", api.getAccessTokenEndpoint());
+ if (isDebug()) {
+ log("async obtaining access token from %s", api.getAccessTokenEndpoint());
+ }
final OAuthRequest request = prepareAccessTokenRequest(requestToken, oauthVerifier);
return execute(request, callback, new OAuthRequest.ResponseConverter() {
@Override
public OAuth1AccessToken convert(Response response) throws IOException {
- return getApi().getAccessTokenExtractor().extract(response);
+ final OAuth1AccessToken token = getApi().getAccessTokenExtractor().extract(response);
+ response.close();
+ return token;
}
});
}
@@ -125,19 +143,25 @@ protected OAuthRequest prepareAccessTokenRequest(OAuth1RequestToken requestToken
final OAuthRequest request = new OAuthRequest(api.getAccessTokenVerb(), api.getAccessTokenEndpoint());
request.addOAuthParameter(OAuthConstants.TOKEN, requestToken.getToken());
request.addOAuthParameter(OAuthConstants.VERIFIER, oauthVerifier);
- log("setting token to: %s and verifier to: %s", requestToken, oauthVerifier);
+ if (isDebug()) {
+ log("setting token to: %s and verifier to: %s", requestToken, oauthVerifier);
+ }
addOAuthParams(request, requestToken.getTokenSecret());
appendSignature(request);
return request;
}
public void signRequest(OAuth1AccessToken token, OAuthRequest request) {
- log("signing request: %s", request.getCompleteUrl());
+ if (isDebug()) {
+ log("signing request: %s", request.getCompleteUrl());
+ }
if (!token.isEmpty() || api.isEmptyOAuthTokenParamIsRequired()) {
request.addOAuthParameter(OAuthConstants.TOKEN, token.getToken());
}
- log("setting token to: %s", token);
+ if (isDebug()) {
+ log("setting token to: %s", token);
+ }
addOAuthParams(request, token.getTokenSecret());
appendSignature(request);
}
@@ -162,21 +186,23 @@ private String getSignature(OAuthRequest request, String tokenSecret) {
final String baseString = api.getBaseStringExtractor().extract(request);
final String signature = api.getSignatureService().getSignature(baseString, getApiSecret(), tokenSecret);
- log("base string is: %s", baseString);
- log("signature is: %s", signature);
+ if (isDebug()) {
+ log("base string is: %s", baseString);
+ log("signature is: %s", signature);
+ }
return signature;
}
protected void appendSignature(OAuthRequest request) {
final OAuth1SignatureType signatureType = api.getSignatureType();
switch (signatureType) {
- case Header:
+ case HEADER:
log("using Http Header signature");
final String oauthHeader = api.getHeaderExtractor().extract(request);
request.addHeader(OAuthConstants.HEADER, oauthHeader);
break;
- case QueryString:
+ case QUERY_STRING:
log("using Querystring signature");
for (Map.Entry oauthParameter : request.getOauthParameters().entrySet()) {
@@ -191,15 +217,4 @@ protected void appendSignature(OAuthRequest request) {
public DefaultApi10a getApi() {
return api;
}
-
- public void log(String messagePattern, Object... params) {
- if (debugStream != null) {
- final String message = String.format(messagePattern, params) + '\n';
- try {
- debugStream.write(message.getBytes("UTF8"));
- } catch (IOException | RuntimeException e) {
- throw new RuntimeException("there were problems while writting to the debug stream", e);
- }
- }
- }
}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuth20Service.java b/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuth20Service.java
index 5b10849af..82052e351 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuth20Service.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuth20Service.java
@@ -1,149 +1,262 @@
package com.github.scribejava.core.oauth;
-import java.io.IOException;
-import java.util.concurrent.Future;
import com.github.scribejava.core.builder.api.DefaultApi20;
import com.github.scribejava.core.extractors.OAuth2AccessTokenJsonExtractor;
import com.github.scribejava.core.httpclient.HttpClient;
import com.github.scribejava.core.httpclient.HttpClientConfig;
+import com.github.scribejava.core.model.DeviceAuthorization;
import com.github.scribejava.core.model.OAuth2AccessToken;
+import com.github.scribejava.core.model.OAuth2AccessTokenErrorResponse;
import com.github.scribejava.core.model.OAuth2Authorization;
import com.github.scribejava.core.model.OAuthAsyncRequestCallback;
import com.github.scribejava.core.model.OAuthConstants;
import com.github.scribejava.core.model.OAuthRequest;
import com.github.scribejava.core.model.Response;
import com.github.scribejava.core.model.Verb;
-import com.github.scribejava.core.pkce.AuthorizationUrlWithPKCE;
+import com.github.scribejava.core.oauth2.OAuth2Error;
import com.github.scribejava.core.pkce.PKCE;
-import com.github.scribejava.core.pkce.PKCEService;
-import java.util.HashMap;
+import com.github.scribejava.core.revoke.TokenTypeHint;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
import java.util.Map;
import java.util.concurrent.ExecutionException;
-import com.github.scribejava.core.revoke.TokenTypeHint;
+import java.util.concurrent.Future;
public class OAuth20Service extends OAuthService {
private static final String VERSION = "2.0";
- private static final PKCEService PKCE_SERVICE = new PKCEService();
private final DefaultApi20 api;
private final String responseType;
- private final String state;
+ private final String defaultScope;
- public OAuth20Service(DefaultApi20 api, String apiKey, String apiSecret, String callback, String scope,
- String state, String responseType, String userAgent, HttpClientConfig httpClientConfig,
+ public OAuth20Service(DefaultApi20 api, String apiKey, String apiSecret, String callback, String defaultScope,
+ String responseType, OutputStream debugStream, String userAgent, HttpClientConfig httpClientConfig,
HttpClient httpClient) {
- super(apiKey, apiSecret, callback, scope, userAgent, httpClientConfig, httpClient);
+ super(apiKey, apiSecret, callback, debugStream, userAgent, httpClientConfig, httpClient);
this.responseType = responseType;
- this.state = state;
this.api = api;
+ this.defaultScope = defaultScope;
}
- //protected to facilitate mocking
- protected OAuth2AccessToken sendAccessTokenRequestSync(OAuthRequest request)
- throws IOException, InterruptedException, ExecutionException {
- return api.getAccessTokenExtractor().extract(execute(request));
+ // ===== common OAuth methods =====
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getVersion() {
+ return VERSION;
}
- //protected to facilitate mocking
- protected Future sendAccessTokenRequestAsync(OAuthRequest request) {
- return sendAccessTokenRequestAsync(request, null);
+ public void signRequest(String accessToken, OAuthRequest request) {
+ api.getBearerSignature().signRequest(accessToken, request);
}
- //protected to facilitate mocking
- protected Future sendAccessTokenRequestAsync(OAuthRequest request,
- OAuthAsyncRequestCallback callback) {
+ public void signRequest(OAuth2AccessToken accessToken, OAuthRequest request) {
+ signRequest(accessToken == null ? null : accessToken.getAccessToken(), request);
+ }
- return execute(request, callback, new OAuthRequest.ResponseConverter() {
- @Override
- public OAuth2AccessToken convert(Response response) throws IOException {
- return getApi().getAccessTokenExtractor().extract(response);
+ /**
+ * Returns the URL where you should redirect your users to authenticate your application.
+ *
+ * @return the URL where you should redirect your users
+ */
+ public String getAuthorizationUrl() {
+ return createAuthorizationUrlBuilder().build();
+ }
+
+ public String getAuthorizationUrl(String state) {
+ return createAuthorizationUrlBuilder()
+ .state(state)
+ .build();
+ }
+
+ /**
+ * Returns the URL where you should redirect your users to authenticate your application.
+ *
+ * @param additionalParams any additional GET params to add to the URL
+ * @return the URL where you should redirect your users
+ */
+ public String getAuthorizationUrl(Map additionalParams) {
+ return createAuthorizationUrlBuilder()
+ .additionalParams(additionalParams)
+ .build();
+ }
+
+ public String getAuthorizationUrl(PKCE pkce) {
+ return createAuthorizationUrlBuilder()
+ .pkce(pkce)
+ .build();
+ }
+
+ public AuthorizationUrlBuilder createAuthorizationUrlBuilder() {
+ return new AuthorizationUrlBuilder(this);
+ }
+
+ public DefaultApi20 getApi() {
+ return api;
+ }
+
+ public OAuth2Authorization extractAuthorization(String redirectLocation) {
+ final OAuth2Authorization authorization = new OAuth2Authorization();
+ int end = redirectLocation.indexOf('#');
+ if (end == -1) {
+ end = redirectLocation.length();
+ }
+ for (String param : redirectLocation.substring(redirectLocation.indexOf('?') + 1, end).split("&")) {
+ final String[] keyValue = param.split("=");
+ if (keyValue.length == 2) {
+ try {
+ switch (keyValue[0]) {
+ case "code":
+ authorization.setCode(URLDecoder.decode(keyValue[1], "UTF-8"));
+ break;
+ case "state":
+ authorization.setState(URLDecoder.decode(keyValue[1], "UTF-8"));
+ break;
+ default: //just ignore any other param;
+ }
+ } catch (UnsupportedEncodingException ueE) {
+ throw new IllegalStateException("jvm without UTF-8, really?", ueE);
+ }
}
- });
+ }
+ return authorization;
}
- public Future getAccessTokenAsync(String code) {
- return getAccessToken(code, null, null);
+ public String getResponseType() {
+ return responseType;
}
- public Future getAccessTokenAsync(String code, String pkceCodeVerifier) {
- return getAccessToken(code, null, pkceCodeVerifier);
+ public String getDefaultScope() {
+ return defaultScope;
}
- public OAuth2AccessToken getAccessToken(String code) throws IOException, InterruptedException, ExecutionException {
- return getAccessToken(code, (String) null);
+ protected void logRequestWithParams(String requestDescription, OAuthRequest request) {
+ if (isDebug()) {
+ log("created " + requestDescription + " request with body params [%s], query string params [%s]",
+ request.getBodyParams().asFormUrlEncodedString(),
+ request.getQueryStringParams().asFormUrlEncodedString());
+ }
}
- public OAuth2AccessToken getAccessToken(String code, String pkceCodeVerifier)
+ // ===== common AccessToken request methods =====
+ //protected to facilitate mocking
+ protected OAuth2AccessToken sendAccessTokenRequestSync(OAuthRequest request)
throws IOException, InterruptedException, ExecutionException {
- final OAuthRequest request = createAccessTokenRequest(code, pkceCodeVerifier);
+ if (isDebug()) {
+ log("send request for access token synchronously to %s", request.getCompleteUrl());
+ }
+ try (Response response = execute(request)) {
+ if (isDebug()) {
+ log("response status code: %s", response.getCode());
+ log("response body: %s", response.getBody());
+ }
- return sendAccessTokenRequestSync(request);
+ return api.getAccessTokenExtractor().extract(response);
+ }
}
- /**
- * Start the request to retrieve the access token. The optionally provided callback will be called with the Token
- * when it is available.
- *
- * @param code code
- * @param callback optional callback
- * @param pkceCodeVerifier pkce Code Verifier
- * @return Future
- */
- public Future getAccessToken(String code, OAuthAsyncRequestCallback callback,
- String pkceCodeVerifier) {
- final OAuthRequest request = createAccessTokenRequest(code, pkceCodeVerifier);
-
- return sendAccessTokenRequestAsync(request, callback);
+ //protected to facilitate mocking
+ protected Future sendAccessTokenRequestAsync(OAuthRequest request) {
+ return sendAccessTokenRequestAsync(request, null);
}
- public Future getAccessToken(String code,
+ //protected to facilitate mocking
+ protected Future sendAccessTokenRequestAsync(OAuthRequest request,
OAuthAsyncRequestCallback callback) {
+ if (isDebug()) {
+ log("send request for access token asynchronously to %s", request.getCompleteUrl());
+ }
- return getAccessToken(code, callback, null);
+ return execute(request, callback, new OAuthRequest.ResponseConverter() {
+ @Override
+ public OAuth2AccessToken convert(Response response) throws IOException {
+ log("received response for access token");
+ if (isDebug()) {
+ log("response status code: %s", response.getCode());
+ log("response body: %s", response.getBody());
+ }
+ final OAuth2AccessToken token = api.getAccessTokenExtractor().extract(response);
+ response.close();
+ return token;
+ }
+ });
}
- protected OAuthRequest createAccessTokenRequest(String code) {
+ // ===== get AccessToken authorisation code flow methods =====
+ protected OAuthRequest createAccessTokenRequest(AccessTokenRequestParams params) {
final OAuthRequest request = new OAuthRequest(api.getAccessTokenVerb(), api.getAccessTokenEndpoint());
api.getClientAuthentication().addClientAuthentication(request, getApiKey(), getApiSecret());
- request.addParameter(OAuthConstants.CODE, code);
- request.addParameter(OAuthConstants.REDIRECT_URI, getCallback());
- final String scope = getScope();
+ request.addParameter(OAuthConstants.CODE, params.getCode());
+ final String callback = getCallback();
+ if (callback != null) {
+ request.addParameter(OAuthConstants.REDIRECT_URI, callback);
+ }
+ final String scope = params.getScope();
if (scope != null) {
request.addParameter(OAuthConstants.SCOPE, scope);
+ } else if (defaultScope != null) {
+ request.addParameter(OAuthConstants.SCOPE, defaultScope);
}
request.addParameter(OAuthConstants.GRANT_TYPE, OAuthConstants.AUTHORIZATION_CODE);
- return request;
- }
- protected OAuthRequest createAccessTokenRequest(String code, String pkceCodeVerifier) {
- final OAuthRequest request = createAccessTokenRequest(code);
+ final String pkceCodeVerifier = params.getPkceCodeVerifier();
if (pkceCodeVerifier != null) {
request.addParameter(PKCE.PKCE_CODE_VERIFIER_PARAM, pkceCodeVerifier);
}
+
+ final Map extraParameters = params.getExtraParameters();
+ if (extraParameters != null && !extraParameters.isEmpty()) {
+ for (Map.Entry extraParameter : extraParameters.entrySet()) {
+ request.addParameter(extraParameter.getKey(), extraParameter.getValue());
+ }
+ }
+
+ logRequestWithParams("access token", request);
return request;
}
- public Future refreshAccessTokenAsync(String refreshToken) {
- return refreshAccessToken(refreshToken, null);
+ public Future getAccessTokenAsync(String code) {
+ return getAccessToken(AccessTokenRequestParams.create(code), null);
}
- public OAuth2AccessToken refreshAccessToken(String refreshToken)
- throws IOException, InterruptedException, ExecutionException {
- final OAuthRequest request = createRefreshTokenRequest(refreshToken);
+ public Future getAccessTokenAsync(AccessTokenRequestParams params) {
+ return getAccessToken(params, null);
+ }
- return sendAccessTokenRequestSync(request);
+ public OAuth2AccessToken getAccessToken(String code) throws IOException, InterruptedException, ExecutionException {
+ return getAccessToken(AccessTokenRequestParams.create(code));
}
- public Future refreshAccessToken(String refreshToken,
+ public OAuth2AccessToken getAccessToken(AccessTokenRequestParams params)
+ throws IOException, InterruptedException, ExecutionException {
+ return sendAccessTokenRequestSync(createAccessTokenRequest(params));
+ }
+
+ /**
+ * Start the request to retrieve the access token. The optionally provided callback will be called with the Token
+ * when it is available.
+ *
+ * @param params params
+ * @param callback optional callback
+ * @return Future
+ */
+ public Future getAccessToken(AccessTokenRequestParams params,
OAuthAsyncRequestCallback callback) {
- final OAuthRequest request = createRefreshTokenRequest(refreshToken);
+ return sendAccessTokenRequestAsync(createAccessTokenRequest(params), callback);
+ }
- return sendAccessTokenRequestAsync(request, callback);
+ public Future getAccessToken(String code,
+ OAuthAsyncRequestCallback callback) {
+ return getAccessToken(AccessTokenRequestParams.create(code), callback);
}
- protected OAuthRequest createRefreshTokenRequest(String refreshToken) {
+ // ===== refresh AccessToken methods =====
+ protected OAuthRequest createRefreshTokenRequest(String refreshToken, String scope) {
if (refreshToken == null || refreshToken.isEmpty()) {
throw new IllegalArgumentException("The refreshToken cannot be null or empty");
}
@@ -151,160 +264,182 @@ protected OAuthRequest createRefreshTokenRequest(String refreshToken) {
api.getClientAuthentication().addClientAuthentication(request, getApiKey(), getApiSecret());
- final String scope = getScope();
if (scope != null) {
request.addParameter(OAuthConstants.SCOPE, scope);
+ } else if (defaultScope != null) {
+ request.addParameter(OAuthConstants.SCOPE, defaultScope);
}
request.addParameter(OAuthConstants.REFRESH_TOKEN, refreshToken);
request.addParameter(OAuthConstants.GRANT_TYPE, OAuthConstants.REFRESH_TOKEN);
+
+ logRequestWithParams("refresh token", request);
+
return request;
}
- public OAuth2AccessToken getAccessTokenPasswordGrant(String uname, String password)
+ public Future refreshAccessTokenAsync(String refreshToken) {
+ return refreshAccessToken(refreshToken, (OAuthAsyncRequestCallback) null);
+ }
+
+ public Future refreshAccessTokenAsync(String refreshToken, String scope) {
+ return refreshAccessToken(refreshToken, scope, null);
+ }
+
+ public OAuth2AccessToken refreshAccessToken(String refreshToken)
throws IOException, InterruptedException, ExecutionException {
- final OAuthRequest request = createAccessTokenPasswordGrantRequest(uname, password);
+ return refreshAccessToken(refreshToken, (String) null);
+ }
+
+ public OAuth2AccessToken refreshAccessToken(String refreshToken, String scope)
+ throws IOException, InterruptedException, ExecutionException {
+ final OAuthRequest request = createRefreshTokenRequest(refreshToken, scope);
return sendAccessTokenRequestSync(request);
}
- public Future getAccessTokenPasswordGrantAsync(String uname, String password) {
- return getAccessTokenPasswordGrantAsync(uname, password, null);
+ public Future refreshAccessToken(String refreshToken,
+ OAuthAsyncRequestCallback callback) {
+ final OAuthRequest request = createRefreshTokenRequest(refreshToken, null);
+
+ return sendAccessTokenRequestAsync(request, callback);
}
- /**
- * Request Access Token Password Grant async version
- *
- * @param uname User name
- * @param password User password
- * @param callback Optional callback
- * @return Future
- */
- public Future getAccessTokenPasswordGrantAsync(String uname, String password,
+ public Future refreshAccessToken(String refreshToken, String scope,
OAuthAsyncRequestCallback callback) {
- final OAuthRequest request = createAccessTokenPasswordGrantRequest(uname, password);
+ final OAuthRequest request = createRefreshTokenRequest(refreshToken, scope);
return sendAccessTokenRequestAsync(request, callback);
}
- protected OAuthRequest createAccessTokenPasswordGrantRequest(String username, String password) {
+ // ===== get AccessToken password grant flow methods =====
+ protected OAuthRequest createAccessTokenPasswordGrantRequest(String username, String password, String scope) {
final OAuthRequest request = new OAuthRequest(api.getAccessTokenVerb(), api.getAccessTokenEndpoint());
request.addParameter(OAuthConstants.USERNAME, username);
request.addParameter(OAuthConstants.PASSWORD, password);
- final String scope = getScope();
if (scope != null) {
request.addParameter(OAuthConstants.SCOPE, scope);
+ } else if (defaultScope != null) {
+ request.addParameter(OAuthConstants.SCOPE, defaultScope);
}
request.addParameter(OAuthConstants.GRANT_TYPE, OAuthConstants.PASSWORD);
api.getClientAuthentication().addClientAuthentication(request, getApiKey(), getApiSecret());
+ logRequestWithParams("access token password grant", request);
+
return request;
}
- public Future getAccessTokenClientCredentialsGrantAsync() {
- return getAccessTokenClientCredentialsGrant(null);
+ public OAuth2AccessToken getAccessTokenPasswordGrant(String username, String password)
+ throws IOException, InterruptedException, ExecutionException {
+ final OAuthRequest request = createAccessTokenPasswordGrantRequest(username, password, null);
+
+ return sendAccessTokenRequestSync(request);
}
- public OAuth2AccessToken getAccessTokenClientCredentialsGrant()
+ public OAuth2AccessToken getAccessTokenPasswordGrant(String username, String password, String scope)
throws IOException, InterruptedException, ExecutionException {
- final OAuthRequest request = createAccessTokenClientCredentialsGrantRequest();
+ final OAuthRequest request = createAccessTokenPasswordGrantRequest(username, password, scope);
return sendAccessTokenRequestSync(request);
}
+ public Future getAccessTokenPasswordGrantAsync(String username, String password) {
+ return getAccessTokenPasswordGrantAsync(username, password,
+ (OAuthAsyncRequestCallback) null);
+ }
+
+ public Future getAccessTokenPasswordGrantAsync(String username, String password, String scope) {
+ return getAccessTokenPasswordGrantAsync(username, password, scope, null);
+ }
+
/**
- * Start the request to retrieve the access token using client-credentials grant. The optionally provided callback
- * will be called with the Token when it is available.
+ * Request Access Token Password Grant async version
*
- * @param callback optional callback
+ * @param username User name
+ * @param password User password
+ * @param callback Optional callback
* @return Future
*/
- public Future getAccessTokenClientCredentialsGrant(
+ public Future getAccessTokenPasswordGrantAsync(String username, String password,
+ OAuthAsyncRequestCallback callback) {
+ final OAuthRequest request = createAccessTokenPasswordGrantRequest(username, password, null);
+
+ return sendAccessTokenRequestAsync(request, callback);
+ }
+
+ public Future getAccessTokenPasswordGrantAsync(String username, String password, String scope,
OAuthAsyncRequestCallback callback) {
- final OAuthRequest request = createAccessTokenClientCredentialsGrantRequest();
+ final OAuthRequest request = createAccessTokenPasswordGrantRequest(username, password, scope);
return sendAccessTokenRequestAsync(request, callback);
}
- protected OAuthRequest createAccessTokenClientCredentialsGrantRequest() {
+ // ===== get AccessToken client credentials flow methods =====
+ protected OAuthRequest createAccessTokenClientCredentialsGrantRequest(String scope) {
final OAuthRequest request = new OAuthRequest(api.getAccessTokenVerb(), api.getAccessTokenEndpoint());
api.getClientAuthentication().addClientAuthentication(request, getApiKey(), getApiSecret());
- final String scope = getScope();
if (scope != null) {
request.addParameter(OAuthConstants.SCOPE, scope);
+ } else if (defaultScope != null) {
+ request.addParameter(OAuthConstants.SCOPE, defaultScope);
}
request.addParameter(OAuthConstants.GRANT_TYPE, OAuthConstants.CLIENT_CREDENTIALS);
+
+ logRequestWithParams("access token client credentials grant", request);
+
return request;
}
- /**
- * {@inheritDoc}
- */
- @Override
- public String getVersion() {
- return VERSION;
+ public Future getAccessTokenClientCredentialsGrantAsync() {
+ return getAccessTokenClientCredentialsGrant((OAuthAsyncRequestCallback) null);
}
- public void signRequest(String accessToken, OAuthRequest request) {
- api.getSignatureType().signRequest(accessToken, request);
+ public Future getAccessTokenClientCredentialsGrantAsync(String scope) {
+ return getAccessTokenClientCredentialsGrant(scope, null);
}
- public void signRequest(OAuth2AccessToken accessToken, OAuthRequest request) {
- signRequest(accessToken == null ? null : accessToken.getAccessToken(), request);
- }
+ public OAuth2AccessToken getAccessTokenClientCredentialsGrant()
+ throws IOException, InterruptedException, ExecutionException {
+ final OAuthRequest request = createAccessTokenClientCredentialsGrantRequest(null);
- public AuthorizationUrlWithPKCE getAuthorizationUrlWithPKCE() {
- return getAuthorizationUrlWithPKCE(null);
+ return sendAccessTokenRequestSync(request);
}
- public AuthorizationUrlWithPKCE getAuthorizationUrlWithPKCE(Map additionalParams) {
- final PKCE pkce = PKCE_SERVICE.generatePKCE();
- return new AuthorizationUrlWithPKCE(pkce, getAuthorizationUrl(additionalParams, pkce));
- }
+ public OAuth2AccessToken getAccessTokenClientCredentialsGrant(String scope)
+ throws IOException, InterruptedException, ExecutionException {
+ final OAuthRequest request = createAccessTokenClientCredentialsGrantRequest(scope);
- /**
- * Returns the URL where you should redirect your users to authenticate your application.
- *
- * @return the URL where you should redirect your users
- */
- public String getAuthorizationUrl() {
- return getAuthorizationUrl(null, null);
+ return sendAccessTokenRequestSync(request);
}
/**
- * Returns the URL where you should redirect your users to authenticate your application.
+ * Start the request to retrieve the access token using client-credentials grant. The optionally provided callback
+ * will be called with the Token when it is available.
*
- * @param additionalParams any additional GET params to add to the URL
- * @return the URL where you should redirect your users
+ * @param callback optional callback
+ * @return Future
*/
- public String getAuthorizationUrl(Map additionalParams) {
- return getAuthorizationUrl(additionalParams, null);
- }
+ public Future getAccessTokenClientCredentialsGrant(
+ OAuthAsyncRequestCallback callback) {
+ final OAuthRequest request = createAccessTokenClientCredentialsGrantRequest(null);
- public String getAuthorizationUrl(PKCE pkce) {
- return getAuthorizationUrl(null, pkce);
+ return sendAccessTokenRequestAsync(request, callback);
}
- public String getAuthorizationUrl(Map additionalParams, PKCE pkce) {
- final Map params;
- if (pkce == null) {
- params = additionalParams;
- } else {
- params = additionalParams == null ? new HashMap() : new HashMap<>(additionalParams);
- params.putAll(pkce.getAuthorizationUrlParams());
- }
- return api.getAuthorizationUrl(getResponseType(), getApiKey(), getCallback(), getScope(), getState(), params);
- }
+ public Future getAccessTokenClientCredentialsGrant(String scope,
+ OAuthAsyncRequestCallback callback) {
+ final OAuthRequest request = createAccessTokenClientCredentialsGrantRequest(scope);
- public DefaultApi20 getApi() {
- return api;
+ return sendAccessTokenRequestAsync(request, callback);
}
+ // ===== revoke AccessToken methods =====
protected OAuthRequest createRevokeTokenRequest(String tokenToRevoke, TokenTypeHint tokenTypeHint) {
final OAuthRequest request = new OAuthRequest(Verb.POST, api.getRevokeTokenEndpoint());
@@ -312,8 +447,11 @@ protected OAuthRequest createRevokeTokenRequest(String tokenToRevoke, TokenTypeH
request.addParameter("token", tokenToRevoke);
if (tokenTypeHint != null) {
- request.addParameter("token_type_hint", tokenTypeHint.toString());
+ request.addParameter("token_type_hint", tokenTypeHint.getValue());
}
+
+ logRequestWithParams("revoke token", request);
+
return request;
}
@@ -333,7 +471,9 @@ public void revokeToken(String tokenToRevoke, TokenTypeHint tokenTypeHint)
throws IOException, InterruptedException, ExecutionException {
final OAuthRequest request = createRevokeTokenRequest(tokenToRevoke, tokenTypeHint);
- checkForErrorRevokeToken(execute(request));
+ try (Response response = execute(request)) {
+ checkForErrorRevokeToken(response);
+ }
}
public Future revokeToken(String tokenToRevoke, OAuthAsyncRequestCallback callback) {
@@ -348,6 +488,7 @@ public Future revokeToken(String tokenToRevoke, OAuthAsyncRequestCallback<
@Override
public Void convert(Response response) throws IOException {
checkForErrorRevokeToken(response);
+ response.close();
return null;
}
});
@@ -355,38 +496,181 @@ public Void convert(Response response) throws IOException {
private void checkForErrorRevokeToken(Response response) throws IOException {
if (response.getCode() != 200) {
- OAuth2AccessTokenJsonExtractor.instance().generateError(response.getBody());
+ OAuth2AccessTokenJsonExtractor.instance().generateError(response);
}
}
- public OAuth2Authorization extractAuthorization(String redirectLocation) {
- final OAuth2Authorization authorization = new OAuth2Authorization();
- int end = redirectLocation.indexOf('#');
- if (end == -1) {
- end = redirectLocation.length();
+ // ===== device Authorisation codes methods =====
+ protected OAuthRequest createDeviceAuthorizationCodesRequest(String scope) {
+ final OAuthRequest request = new OAuthRequest(Verb.POST, api.getDeviceAuthorizationEndpoint());
+ request.addParameter(OAuthConstants.CLIENT_ID, getApiKey());
+ if (scope != null) {
+ request.addParameter(OAuthConstants.SCOPE, scope);
+ } else if (defaultScope != null) {
+ request.addParameter(OAuthConstants.SCOPE, defaultScope);
}
- for (String param : redirectLocation.substring(redirectLocation.indexOf('?') + 1, end).split("&")) {
- final String[] keyValue = param.split("=");
- if (keyValue.length == 2) {
- switch (keyValue[0]) {
- case "code":
- authorization.setCode(keyValue[1]);
- break;
- case "state":
- authorization.setState(keyValue[1]);
- break;
- default: //just ignore any other param;
- }
+
+ logRequestWithParams("Device Authorization Codes", request);
+
+ return request;
+ }
+
+ /**
+ * Requests a set of verification codes from the authorization server with the default scope
+ *
+ * @see RFC 8628
+ *
+ * @return DeviceAuthorization
+ * @throws InterruptedException InterruptedException
+ * @throws ExecutionException ExecutionException
+ * @throws IOException IOException
+ */
+ public DeviceAuthorization getDeviceAuthorizationCodes()
+ throws InterruptedException, ExecutionException, IOException {
+ return getDeviceAuthorizationCodes((String) null);
+ }
+
+ /**
+ * Requests a set of verification codes from the authorization server
+ *
+ * @see RFC 8628
+ *
+ * @param scope scope
+ * @return DeviceAuthorization
+ * @throws InterruptedException InterruptedException
+ * @throws ExecutionException ExecutionException
+ * @throws IOException IOException
+ */
+ public DeviceAuthorization getDeviceAuthorizationCodes(String scope)
+ throws InterruptedException, ExecutionException, IOException {
+ final OAuthRequest request = createDeviceAuthorizationCodesRequest(scope);
+
+ try (Response response = execute(request)) {
+ if (isDebug()) {
+ log("got DeviceAuthorizationCodes response");
+ log("response status code: %s", response.getCode());
+ log("response body: %s", response.getBody());
}
+ return api.getDeviceAuthorizationExtractor().extract(response);
}
- return authorization;
}
- public String getResponseType() {
- return responseType;
+ public Future getDeviceAuthorizationCodes(
+ OAuthAsyncRequestCallback callback) {
+ return getDeviceAuthorizationCodes(null, callback);
}
- public String getState() {
- return state;
+ public Future getDeviceAuthorizationCodes(String scope,
+ OAuthAsyncRequestCallback callback) {
+ final OAuthRequest request = createDeviceAuthorizationCodesRequest(scope);
+
+ return execute(request, callback, new OAuthRequest.ResponseConverter() {
+ @Override
+ public DeviceAuthorization convert(Response response) throws IOException {
+ final DeviceAuthorization deviceAuthorization = api.getDeviceAuthorizationExtractor().extract(response);
+ response.close();
+ return deviceAuthorization;
+ }
+ });
+ }
+
+ public Future getDeviceAuthorizationCodesAsync() {
+ return getDeviceAuthorizationCodesAsync(null);
+ }
+
+ public Future getDeviceAuthorizationCodesAsync(String scope) {
+ return getDeviceAuthorizationCodes(scope, null);
+ }
+
+ // ===== get AccessToken Device Authorisation grant flow methods =====
+ protected OAuthRequest createAccessTokenDeviceAuthorizationGrantRequest(DeviceAuthorization deviceAuthorization) {
+ final OAuthRequest request = new OAuthRequest(api.getAccessTokenVerb(), api.getAccessTokenEndpoint());
+ request.addParameter(OAuthConstants.GRANT_TYPE, "urn:ietf:params:oauth:grant-type:device_code");
+ request.addParameter("device_code", deviceAuthorization.getDeviceCode());
+ api.getClientAuthentication().addClientAuthentication(request, getApiKey(), getApiSecret());
+ return request;
+ }
+
+ /**
+ * Attempts to get a token from a server.
+ *
+ * Function {@link #pollAccessTokenDeviceAuthorizationGrant(com.github.scribejava.core.model.DeviceAuthorization)}
+ * is usually used instead of this.
+ *
+ * @param deviceAuthorization deviceAuthorization
+ * @return token
+ *
+ * @throws java.lang.InterruptedException InterruptedException
+ * @throws java.util.concurrent.ExecutionException ExecutionException
+ * @throws java.io.IOException IOException
+ * @throws OAuth2AccessTokenErrorResponse If {@link OAuth2AccessTokenErrorResponse#getError()} is
+ * {@link com.github.scribejava.core.oauth2.OAuth2Error#AUTHORIZATION_PENDING} or
+ * {@link com.github.scribejava.core.oauth2.OAuth2Error#SLOW_DOWN}, another attempt should be made after a while.
+ *
+ * @see #getDeviceAuthorizationCodes()
+ */
+ public OAuth2AccessToken getAccessTokenDeviceAuthorizationGrant(DeviceAuthorization deviceAuthorization)
+ throws InterruptedException, ExecutionException, IOException {
+ final OAuthRequest request = createAccessTokenDeviceAuthorizationGrantRequest(deviceAuthorization);
+
+ try (Response response = execute(request)) {
+ if (isDebug()) {
+ log("got AccessTokenDeviceAuthorizationGrant response");
+ log("response status code: %s", response.getCode());
+ log("response body: %s", response.getBody());
+ }
+ return api.getAccessTokenExtractor().extract(response);
+ }
+ }
+
+ public Future getAccessTokenDeviceAuthorizationGrant(DeviceAuthorization deviceAuthorization,
+ OAuthAsyncRequestCallback callback) {
+ final OAuthRequest request = createAccessTokenDeviceAuthorizationGrantRequest(deviceAuthorization);
+
+ return execute(request, callback, new OAuthRequest.ResponseConverter() {
+ @Override
+ public OAuth2AccessToken convert(Response response) throws IOException {
+ final OAuth2AccessToken accessToken = api.getAccessTokenExtractor().extract(response);
+ response.close();
+ return accessToken;
+ }
+ });
+ }
+
+ public Future getAccessTokenDeviceAuthorizationGrantAsync(
+ DeviceAuthorization deviceAuthorization) {
+ return getAccessTokenDeviceAuthorizationGrant(deviceAuthorization, null);
+ }
+
+ /**
+ * Periodically tries to get a token from a server (waiting for the user to give consent). Sync only version. No
+ * Async variants yet, one should implement async scenarios themselves.
+ *
+ * @param deviceAuthorization deviceAuthorization
+ * @return token
+ * @throws java.lang.InterruptedException InterruptedException
+ * @throws java.util.concurrent.ExecutionException ExecutionException
+ * @throws java.io.IOException IOException
+ * @throws OAuth2AccessTokenErrorResponse Indicates OAuth error.
+ *
+ * @see #getDeviceAuthorizationCodes()
+ */
+ public OAuth2AccessToken pollAccessTokenDeviceAuthorizationGrant(DeviceAuthorization deviceAuthorization)
+ throws InterruptedException, ExecutionException, IOException {
+ long intervalMillis = deviceAuthorization.getIntervalSeconds() * 1000;
+ while (true) {
+ try {
+ return getAccessTokenDeviceAuthorizationGrant(deviceAuthorization);
+ } catch (OAuth2AccessTokenErrorResponse e) {
+ if (e.getError() != OAuth2Error.AUTHORIZATION_PENDING) {
+ if (e.getError() == OAuth2Error.SLOW_DOWN) {
+ intervalMillis += 5000;
+ } else {
+ throw e;
+ }
+ }
+ }
+ Thread.sleep(intervalMillis);
+ }
}
}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuthService.java b/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuthService.java
index 9f331a4ba..996abee6f 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuthService.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuthService.java
@@ -12,6 +12,7 @@
import java.io.File;
import java.io.IOException;
+import java.io.OutputStream;
import java.util.ServiceLoader;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
@@ -21,16 +22,16 @@ public abstract class OAuthService implements Closeable {
private final String apiKey;
private final String apiSecret;
private final String callback;
- private final String scope;
private final String userAgent;
private final HttpClient httpClient;
+ private final OutputStream debugStream;
- public OAuthService(String apiKey, String apiSecret, String callback, String scope, String userAgent,
- HttpClientConfig httpClientConfig, HttpClient httpClient) {
+ public OAuthService(String apiKey, String apiSecret, String callback, OutputStream debugStream,
+ String userAgent, HttpClientConfig httpClientConfig, HttpClient httpClient) {
this.apiKey = apiKey;
this.apiSecret = apiSecret;
this.callback = callback;
- this.scope = scope;
+ this.debugStream = debugStream;
this.userAgent = userAgent;
if (httpClientConfig == null && httpClient == null) {
@@ -67,10 +68,6 @@ public String getCallback() {
return callback;
}
- public String getScope() {
- return scope;
- }
-
/**
* Returns the OAuth version of the service.
*
@@ -110,12 +107,42 @@ public Response execute(OAuthRequest request) throws InterruptedException, Execu
} else if (request.getStringPayload() != null) {
return httpClient.execute(userAgent, request.getHeaders(), request.getVerb(), request.getCompleteUrl(),
request.getStringPayload());
- } else if (request.getMultipartPayloads() != null) {
+ } else if (request.getMultipartPayload() != null) {
return httpClient.execute(userAgent, request.getHeaders(), request.getVerb(), request.getCompleteUrl(),
- request.getMultipartPayloads());
+ request.getMultipartPayload());
} else {
return httpClient.execute(userAgent, request.getHeaders(), request.getVerb(), request.getCompleteUrl(),
request.getByteArrayPayload());
}
}
+
+ /**
+ * No need to wrap usages in {@link #isDebug()}.
+ *
+ * @param message message to log
+ */
+ public void log(String message) {
+ if (debugStream != null) {
+ log(message, (Object[]) null);
+ }
+ }
+
+ /**
+ * Wrap usages in {@link #isDebug()}. It was made for optimization - to not calculate "params" in production mode.
+ *
+ * @param messagePattern messagePattern
+ * @param params params
+ */
+ public void log(String messagePattern, Object... params) {
+ final String message = String.format(messagePattern, params) + '\n';
+ try {
+ debugStream.write(message.getBytes("UTF8"));
+ } catch (IOException | RuntimeException e) {
+ throw new RuntimeException("there were problems while writting to the debug stream", e);
+ }
+ }
+
+ protected boolean isDebug() {
+ return debugStream != null;
+ }
}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/oauth2/OAuth2Error.java b/scribejava-core/src/main/java/com/github/scribejava/core/oauth2/OAuth2Error.java
new file mode 100644
index 000000000..b1422bcae
--- /dev/null
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/oauth2/OAuth2Error.java
@@ -0,0 +1,108 @@
+package com.github.scribejava.core.oauth2;
+
+import java.util.EnumSet;
+import java.util.Set;
+
+public enum OAuth2Error {
+ /**
+ * @see RFC 6749, 4.1.2.1 Error Response
+ * @see RFC 6749, 4.2.2.1 Error Response
+ * @see RFC 6749, 5.2 Error Response
+ * @see RFC 6750, 6.2. OAuth Extensions Error
+ * Registration
+ */
+ INVALID_REQUEST("invalid_request"),
+ /**
+ * @see RFC 6749, 4.1.2.1 Error Response
+ * @see RFC 6749, 4.2.2.1 Error Response
+ * @see RFC 6749, 5.2 Error Response
+ */
+ UNAUTHORIZED_CLIENT("unauthorized_client"),
+ /**
+ * @see RFC 6749, 4.1.2.1 Error Response
+ * @see RFC 6749, 4.2.2.1 Error Response
+ * @see RFC 8628, 3.5. Device Access Token Response
+ */
+ ACCESS_DENIED("access_denied"),
+ /**
+ * @see RFC 6749, 4.1.2.1 Error Response
+ * @see RFC 6749, 4.2.2.1 Error Response
+ */
+ UNSUPPORTED_RESPONSE_TYPE("unsupported_response_type"),
+ /**
+ * @see RFC 6749, 4.1.2.1 Error Response
+ * @see RFC 6749, 4.2.2.1 Error Response
+ * @see RFC 6749, 5.2 Error Response
+ */
+ INVALID_SCOPE("invalid_scope"),
+ /**
+ * @see RFC 6749, 4.1.2.1 Error Response
+ * @see RFC 6749, 4.2.2.1 Error Response
+ */
+ SERVER_ERROR("server_error"),
+ /**
+ * @see RFC 6749, 4.1.2.1 Error Response
+ * @see RFC 6749, 4.2.2.1 Error Response
+ */
+ TEMPORARILY_UNAVAILABLE("temporarily_unavailable"),
+ /**
+ * @see RFC 6749, 5.2 Error Response
+ */
+ INVALID_CLIENT("invalid_client"),
+ /**
+ * @see RFC 6749, 5.2 Error Response
+ */
+ INVALID_GRANT("invalid_grant"),
+ /**
+ * @see RFC 6749, 5.2 Error Response
+ */
+ UNSUPPORTED_GRANT_TYPE("unsupported_grant_type"),
+ /**
+ * @see RFC 6750, 6.2. OAuth Extensions Error
+ * Registration
+ */
+ INVALID_TOKEN("invalid_token"),
+ /**
+ * @see RFC 6750, 6.2. OAuth Extensions Error
+ * Registration
+ */
+ INSUFFICIENT_SCOPE("insufficient_scope"),
+ /**
+ * @see RFC 7009, 4.1. OAuth Extensions Error
+ * Registration
+ */
+ UNSUPPORTED_TOKEN_TYPE("unsupported_token_type"),
+ /**
+ * @see RFC 8628, 3.5. Device Access Token Response
+ */
+ AUTHORIZATION_PENDING("authorization_pending"),
+ /**
+ * @see RFC 8628, 3.5. Device Access Token Response
+ */
+ SLOW_DOWN("slow_down"),
+ /**
+ * @see RFC 8628, 3.5. Device Access Token Response
+ */
+ EXPIRED_TOKEN("expired_token");
+
+ private static final Set VALUES = EnumSet.allOf(OAuth2Error.class);
+
+ private final String errorString;
+
+ OAuth2Error(String errorString) {
+ this.errorString = errorString;
+ }
+
+ public static OAuth2Error parseFrom(String errorString) {
+ for (OAuth2Error error : VALUES) {
+ if (error.errorString.equals(errorString)) {
+ return error;
+ }
+ }
+ throw new IllegalArgumentException("there is no knowlege about '" + errorString + "' Error");
+ }
+
+ public String getErrorString() {
+ return errorString;
+ }
+}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/oauth2/bearersignature/BearerSignature.java b/scribejava-core/src/main/java/com/github/scribejava/core/oauth2/bearersignature/BearerSignature.java
new file mode 100644
index 000000000..61739e93e
--- /dev/null
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/oauth2/bearersignature/BearerSignature.java
@@ -0,0 +1,12 @@
+package com.github.scribejava.core.oauth2.bearersignature;
+
+import com.github.scribejava.core.model.OAuthRequest;
+
+/**
+ * Represents
+ * 2. Authenticated Requests
+ * https://tools.ietf.org/html/rfc6750#section-2
+ */
+public interface BearerSignature {
+ void signRequest(String accessToken, OAuthRequest request);
+}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/oauth2/bearersignature/BearerSignatureAuthorizationRequestHeaderField.java b/scribejava-core/src/main/java/com/github/scribejava/core/oauth2/bearersignature/BearerSignatureAuthorizationRequestHeaderField.java
new file mode 100644
index 000000000..98196a708
--- /dev/null
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/oauth2/bearersignature/BearerSignatureAuthorizationRequestHeaderField.java
@@ -0,0 +1,29 @@
+package com.github.scribejava.core.oauth2.bearersignature;
+
+import com.github.scribejava.core.model.OAuthConstants;
+import com.github.scribejava.core.model.OAuthRequest;
+
+/**
+ * 2.1. Authorization Request Header Field
+ * https://tools.ietf.org/html/rfc6750#section-2.1
+ */
+public class BearerSignatureAuthorizationRequestHeaderField implements BearerSignature {
+
+ protected BearerSignatureAuthorizationRequestHeaderField() {
+ }
+
+ private static class InstanceHolder {
+
+ private static final BearerSignatureAuthorizationRequestHeaderField INSTANCE
+ = new BearerSignatureAuthorizationRequestHeaderField();
+ }
+
+ public static BearerSignatureAuthorizationRequestHeaderField instance() {
+ return InstanceHolder.INSTANCE;
+ }
+
+ @Override
+ public void signRequest(String accessToken, OAuthRequest request) {
+ request.addHeader(OAuthConstants.HEADER, "Bearer " + accessToken);
+ }
+}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/oauth2/bearersignature/BearerSignatureURIQueryParameter.java b/scribejava-core/src/main/java/com/github/scribejava/core/oauth2/bearersignature/BearerSignatureURIQueryParameter.java
new file mode 100644
index 000000000..72cc64b43
--- /dev/null
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/oauth2/bearersignature/BearerSignatureURIQueryParameter.java
@@ -0,0 +1,27 @@
+package com.github.scribejava.core.oauth2.bearersignature;
+
+import com.github.scribejava.core.model.OAuthConstants;
+import com.github.scribejava.core.model.OAuthRequest;
+
+/**
+ * 2.3. URI Query Parameter
+ * https://tools.ietf.org/html/rfc6750#section-2.3
+ */
+public class BearerSignatureURIQueryParameter implements BearerSignature {
+ protected BearerSignatureURIQueryParameter() {
+ }
+
+ private static class InstanceHolder {
+
+ private static final BearerSignatureURIQueryParameter INSTANCE = new BearerSignatureURIQueryParameter();
+ }
+
+ public static BearerSignatureURIQueryParameter instance() {
+ return InstanceHolder.INSTANCE;
+ }
+
+ @Override
+ public void signRequest(String accessToken, OAuthRequest request) {
+ request.addQuerystringParameter(OAuthConstants.ACCESS_TOKEN, accessToken);
+ }
+}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/oauth2/clientauthentication/HttpBasicAuthenticationScheme.java b/scribejava-core/src/main/java/com/github/scribejava/core/oauth2/clientauthentication/HttpBasicAuthenticationScheme.java
index 509869d51..3931f6f7b 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/oauth2/clientauthentication/HttpBasicAuthenticationScheme.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/oauth2/clientauthentication/HttpBasicAuthenticationScheme.java
@@ -1,6 +1,6 @@
package com.github.scribejava.core.oauth2.clientauthentication;
-import com.github.scribejava.core.java8.Base64;
+import com.github.scribejava.core.base64.Base64;
import com.github.scribejava.core.model.OAuthConstants;
import com.github.scribejava.core.model.OAuthRequest;
import java.nio.charset.Charset;
@@ -14,8 +14,6 @@
*/
public class HttpBasicAuthenticationScheme implements ClientAuthentication {
- private final Base64.Encoder base64Encoder = Base64.getEncoder();
-
protected HttpBasicAuthenticationScheme() {
}
@@ -32,8 +30,7 @@ public static HttpBasicAuthenticationScheme instance() {
public void addClientAuthentication(OAuthRequest request, String apiKey, String apiSecret) {
if (apiKey != null && apiSecret != null) {
request.addHeader(OAuthConstants.HEADER, OAuthConstants.BASIC + ' '
- + base64Encoder.encodeToString(
- String.format("%s:%s", apiKey, apiSecret).getBytes(Charset.forName("UTF-8"))));
+ + Base64.encode(String.format("%s:%s", apiKey, apiSecret).getBytes(Charset.forName("UTF-8"))));
}
}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/pkce/AuthorizationUrlWithPKCE.java b/scribejava-core/src/main/java/com/github/scribejava/core/pkce/AuthorizationUrlWithPKCE.java
deleted file mode 100644
index 101f82f10..000000000
--- a/scribejava-core/src/main/java/com/github/scribejava/core/pkce/AuthorizationUrlWithPKCE.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.github.scribejava.core.pkce;
-
-public class AuthorizationUrlWithPKCE {
-
- private final PKCE pkce;
- private final String authorizationUrl;
-
- public AuthorizationUrlWithPKCE(PKCE pkce, String authorizationUrl) {
- this.pkce = pkce;
- this.authorizationUrl = authorizationUrl;
- }
-
- public PKCE getPkce() {
- return pkce;
- }
-
- public String getAuthorizationUrl() {
- return authorizationUrl;
- }
-
-}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/pkce/PKCECodeChallengeMethod.java b/scribejava-core/src/main/java/com/github/scribejava/core/pkce/PKCECodeChallengeMethod.java
index 29648859c..374f80336 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/pkce/PKCECodeChallengeMethod.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/pkce/PKCECodeChallengeMethod.java
@@ -1,21 +1,19 @@
package com.github.scribejava.core.pkce;
-import com.github.scribejava.core.java8.Base64;
+import com.github.scribejava.core.base64.Base64;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
public enum PKCECodeChallengeMethod {
S256 {
- private final Base64.Encoder base64Encoder = Base64.getUrlEncoder().withoutPadding();
-
@Override
public String transform2CodeChallenge(String codeVerifier) throws NoSuchAlgorithmException {
- return base64Encoder.encodeToString(
+ return Base64.encodeUrlWithoutPadding(
MessageDigest.getInstance("SHA-256").digest(codeVerifier.getBytes(StandardCharsets.US_ASCII)));
}
},
- plain {
+ PLAIN {
@Override
public String transform2CodeChallenge(String codeVerifier) {
return codeVerifier;
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/pkce/PKCEService.java b/scribejava-core/src/main/java/com/github/scribejava/core/pkce/PKCEService.java
index 2af370a75..23a5347ec 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/pkce/PKCEService.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/pkce/PKCEService.java
@@ -1,6 +1,6 @@
package com.github.scribejava.core.pkce;
-import com.github.scribejava.core.java8.Base64;
+import com.github.scribejava.core.base64.Base64;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
@@ -11,7 +11,6 @@
public class PKCEService {
private static final SecureRandom RANDOM = new SecureRandom();
- private static final Base64.Encoder BASE_64_ENCODER = Base64.getUrlEncoder().withoutPadding();
/**
* number of octets to randomly generate.
*/
@@ -28,6 +27,15 @@ public PKCEService() {
this(32);
}
+ private static class DefaultInstanceHolder {
+
+ private static final PKCEService INSTANCE = new PKCEService();
+ }
+
+ public static PKCEService defaultInstance() {
+ return DefaultInstanceHolder.INSTANCE;
+ }
+
public PKCE generatePKCE() {
final byte[] bytes = new byte[numberOFOctets];
RANDOM.nextBytes(bytes);
@@ -35,16 +43,16 @@ public PKCE generatePKCE() {
}
public PKCE generatePKCE(byte[] randomBytes) {
- final String codeVerifier = BASE_64_ENCODER.encodeToString(randomBytes);
+ final String codeVerifier = Base64.encodeUrlWithoutPadding(randomBytes);
final PKCE pkce = new PKCE();
pkce.setCodeVerifier(codeVerifier);
try {
pkce.setCodeChallenge(pkce.getCodeChallengeMethod().transform2CodeChallenge(codeVerifier));
} catch (NoSuchAlgorithmException nsaE) {
- pkce.setCodeChallengeMethod(PKCECodeChallengeMethod.plain);
+ pkce.setCodeChallengeMethod(PKCECodeChallengeMethod.PLAIN);
try {
- pkce.setCodeChallenge(PKCECodeChallengeMethod.plain.transform2CodeChallenge(codeVerifier));
+ pkce.setCodeChallenge(PKCECodeChallengeMethod.PLAIN.transform2CodeChallenge(codeVerifier));
} catch (NoSuchAlgorithmException unrealE) {
throw new IllegalStateException("It's just cannot be", unrealE);
}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/revoke/OAuth2RevokeTokenResponseConverter.java b/scribejava-core/src/main/java/com/github/scribejava/core/revoke/OAuth2RevokeTokenResponseConverter.java
index b287d7868..dc595a410 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/revoke/OAuth2RevokeTokenResponseConverter.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/revoke/OAuth2RevokeTokenResponseConverter.java
@@ -8,7 +8,7 @@ public class OAuth2RevokeTokenResponseConverter {
public Void convert(Response response) throws IOException {
if (response.getCode() != 200) {
- OAuth2AccessTokenJsonExtractor.instance().generateError(response.getBody());
+ OAuth2AccessTokenJsonExtractor.instance().generateError(response);
}
return null;
}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/revoke/TokenTypeHint.java b/scribejava-core/src/main/java/com/github/scribejava/core/revoke/TokenTypeHint.java
index 55a95057e..79de78d26 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/revoke/TokenTypeHint.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/revoke/TokenTypeHint.java
@@ -8,5 +8,16 @@
* @see RFC 7009, 2.1. Revocation Request
*/
public enum TokenTypeHint {
- access_token, refresh_token
+ ACCESS_TOKEN("access_token"),
+ REFRESH_TOKEN("refresh_token");
+
+ private final String value;
+
+ TokenTypeHint(String value) {
+ this.value = value;
+ }
+
+ public String getValue() {
+ return value;
+ }
}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/services/HMACSha1SignatureService.java b/scribejava-core/src/main/java/com/github/scribejava/core/services/HMACSha1SignatureService.java
index 82d1135be..363011a13 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/services/HMACSha1SignatureService.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/services/HMACSha1SignatureService.java
@@ -1,5 +1,6 @@
package com.github.scribejava.core.services;
+import com.github.scribejava.core.base64.Base64;
import java.io.UnsupportedEncodingException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
@@ -10,8 +11,7 @@
import com.github.scribejava.core.utils.Preconditions;
/**
- * HMAC-SHA1 implementation of {@link SignatureService}
- * https://tools.ietf.org/html/rfc5849#section-3.4.2
+ * HMAC-SHA1 implementation of {@link SignatureService} https://tools.ietf.org/html/rfc5849#section-3.4.2
*/
public class HMACSha1SignatureService implements SignatureService {
@@ -27,8 +27,8 @@ public class HMACSha1SignatureService implements SignatureService {
@Override
public String getSignature(String baseString, String apiSecret, String tokenSecret) {
try {
- Preconditions.checkEmptyString(baseString, "Base string cant be null or empty string");
- Preconditions.checkEmptyString(apiSecret, "Api secret cant be null or empty string");
+ Preconditions.checkEmptyString(baseString, "Base string can't be null or empty string");
+ Preconditions.checkNotNull(apiSecret, "Api secret can't be null");
return doSign(baseString, OAuthEncoder.encode(apiSecret) + '&' + OAuthEncoder.encode(tokenSecret));
} catch (UnsupportedEncodingException | NoSuchAlgorithmException | InvalidKeyException | RuntimeException e) {
throw new OAuthSignatureException(baseString, e);
@@ -41,7 +41,7 @@ private String doSign(String toSign, String keyString) throws UnsupportedEncodin
final Mac mac = Mac.getInstance(HMAC_SHA1);
mac.init(key);
final byte[] bytes = mac.doFinal(toSign.getBytes(UTF8));
- return BASE_64_ENCODER.encodeToString(bytes).replace(CARRIAGE_RETURN, EMPTY_STRING);
+ return Base64.encode(bytes).replace(CARRIAGE_RETURN, EMPTY_STRING);
}
/**
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/services/PlaintextSignatureService.java b/scribejava-core/src/main/java/com/github/scribejava/core/services/PlaintextSignatureService.java
index 33661f10a..143348484 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/services/PlaintextSignatureService.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/services/PlaintextSignatureService.java
@@ -17,7 +17,7 @@ public class PlaintextSignatureService implements SignatureService {
@Override
public String getSignature(String baseString, String apiSecret, String tokenSecret) {
try {
- Preconditions.checkEmptyString(apiSecret, "Api secret cant be null or empty string");
+ Preconditions.checkNotNull(apiSecret, "Api secret can't be null");
return OAuthEncoder.encode(apiSecret) + '&' + OAuthEncoder.encode(tokenSecret);
} catch (Exception e) {
throw new OAuthSignatureException(baseString, e);
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/services/RSASha1SignatureService.java b/scribejava-core/src/main/java/com/github/scribejava/core/services/RSASha1SignatureService.java
index 9cb460e7b..dc16eace4 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/services/RSASha1SignatureService.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/services/RSASha1SignatureService.java
@@ -1,5 +1,6 @@
package com.github.scribejava.core.services;
+import com.github.scribejava.core.base64.Base64;
import java.security.PrivateKey;
import java.security.Signature;
import java.security.SignatureException;
@@ -32,9 +33,9 @@ public String getSignature(String baseString, String apiSecret, String tokenSecr
final Signature signature = Signature.getInstance(RSA_SHA1);
signature.initSign(privateKey);
signature.update(baseString.getBytes(UTF8));
- return BASE_64_ENCODER.encodeToString(signature.sign());
- } catch (NoSuchAlgorithmException | InvalidKeyException | SignatureException | UnsupportedEncodingException |
- RuntimeException e) {
+ return Base64.encode(signature.sign());
+ } catch (NoSuchAlgorithmException | InvalidKeyException | SignatureException | UnsupportedEncodingException
+ | RuntimeException e) {
throw new OAuthSignatureException(baseString, e);
}
}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/services/SignatureService.java b/scribejava-core/src/main/java/com/github/scribejava/core/services/SignatureService.java
index 8cd4f2372..10c50f3ae 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/services/SignatureService.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/services/SignatureService.java
@@ -1,13 +1,9 @@
package com.github.scribejava.core.services;
-import com.github.scribejava.core.java8.Base64;
-
/**
- * Signs a base string, returning the OAuth signature
- * https://tools.ietf.org/html/rfc5849#section-3.4
+ * Signs a base string, returning the OAuth signature https://tools.ietf.org/html/rfc5849#section-3.4
*/
public interface SignatureService {
- Base64.Encoder BASE_64_ENCODER = Base64.getEncoder();
/**
* Returns the signature
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/AbstractClientTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/AbstractClientTest.java
index 58c4664de..c1bc1967e 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/AbstractClientTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/AbstractClientTest.java
@@ -19,6 +19,8 @@
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
public abstract class AbstractClientTest {
@@ -44,7 +46,7 @@ public Response getResponse() {
@Before
public void setUp() {
- oAuthService = new OAuth20Service(null, "test", "test", null, null, null, null, null, null,
+ oAuthService = new OAuth20Service(null, "test", "test", null, null, null, System.out, null, null,
createNewClient());
}
@@ -66,9 +68,10 @@ public void shouldSendGetRequest() throws Exception {
final HttpUrl baseUrl = server.url("/testUrl");
final OAuthRequest request = new OAuthRequest(Verb.GET, baseUrl.toString());
- final Response response = oAuthService.execute(request, null).get(30, TimeUnit.SECONDS);
- assertEquals(expectedResponseBody, response.getBody());
+ try (Response response = oAuthService.execute(request, null).get(30, TimeUnit.SECONDS)) {
+ assertEquals(expectedResponseBody, response.getBody());
+ }
final RecordedRequest recordedRequest = server.takeRequest();
assertEquals("GET", recordedRequest.getMethod());
@@ -77,37 +80,122 @@ public void shouldSendGetRequest() throws Exception {
}
@Test
- public void shouldSendPostRequest() throws Exception {
+ public void shouldSendPostWithApplicationXWwwFormUrlencodedRequestContentTypeHeader() throws Exception {
+ final MockWebServer server = new MockWebServer();
+ server.enqueue(new MockResponse());
+ server.start();
+
+ final HttpUrl baseUrl = server.url("/testUrl");
+
+ final OAuthRequest request = new OAuthRequest(Verb.POST, baseUrl.toString());
+ oAuthService.execute(request, null).get(30, TimeUnit.SECONDS).close();
+
+ final RecordedRequest recordedRequest = server.takeRequest();
+ assertEquals("POST", recordedRequest.getMethod());
+ assertEquals(HttpClient.DEFAULT_CONTENT_TYPE, recordedRequest.getHeader(HttpClient.CONTENT_TYPE));
+
+ server.shutdown();
+ }
+
+ @Test
+ public void shouldSendPostRequestWithEmptyBody() throws Exception {
final String expectedResponseBody = "response body for test shouldSendPostRequest";
- final String expectedRequestBody = "request body";
+ final String expectedRequestBody = "";
final MockWebServer server = new MockWebServer();
server.enqueue(new MockResponse().setBody(expectedResponseBody));
+ server.start();
+
+ final HttpUrl baseUrl = server.url("/testUrl");
+
+ final OAuthRequest request = new OAuthRequest(Verb.POST, baseUrl.toString());
+ try (Response response = oAuthService.execute(request, null).get(30, TimeUnit.SECONDS)) {
+ assertEquals(expectedResponseBody, response.getBody());
+ }
+
+ final RecordedRequest recordedRequest = server.takeRequest();
+ assertEquals("POST", recordedRequest.getMethod());
+ assertEquals(expectedRequestBody, recordedRequest.getBody().readUtf8());
+ assertEquals(HttpClient.DEFAULT_CONTENT_TYPE, recordedRequest.getHeader(HttpClient.CONTENT_TYPE));
+
+ server.shutdown();
+ }
+
+ @Test
+ public void shouldSendPostRequestWithStringBody() throws Exception {
+ final String expectedResponseBody = "response body for test shouldSendPostRequest";
+ final String expectedRequestBody = "request body";
+
+ final MockWebServer server = new MockWebServer();
server.enqueue(new MockResponse().setBody(expectedResponseBody));
server.start();
final HttpUrl baseUrl = server.url("/testUrl");
- // request with body
- OAuthRequest request = new OAuthRequest(Verb.POST, baseUrl.toString());
+ final OAuthRequest request = new OAuthRequest(Verb.POST, baseUrl.toString());
request.setPayload(expectedRequestBody);
- Response response = oAuthService.execute(request, null).get(30, TimeUnit.SECONDS);
+ try (Response response = oAuthService.execute(request, null).get(30, TimeUnit.SECONDS)) {
+ assertEquals(expectedResponseBody, response.getBody());
+ }
+
+ final RecordedRequest recordedRequest = server.takeRequest();
+ assertEquals("POST", recordedRequest.getMethod());
+ assertEquals(expectedRequestBody, recordedRequest.getBody().readUtf8());
+ final String contentTypeHeader = recordedRequest.getHeader(HttpClient.CONTENT_TYPE);
+ assertNotNull(contentTypeHeader);
+ assertTrue(contentTypeHeader.startsWith(HttpClient.DEFAULT_CONTENT_TYPE));
+
+ server.shutdown();
+ }
+
+ @Test
+ public void shouldSendPostRequestWithByteBodyBody() throws Exception {
+ final String expectedResponseBody = "response body for test shouldSendPostRequest";
+ final String expectedRequestBody = "request body";
- assertEquals(expectedResponseBody, response.getBody());
+ final MockWebServer server = new MockWebServer();
+ server.enqueue(new MockResponse().setBody(expectedResponseBody));
+ server.start();
- RecordedRequest recordedRequest = server.takeRequest();
+ final HttpUrl baseUrl = server.url("/testUrl");
+
+ final OAuthRequest request = new OAuthRequest(Verb.POST, baseUrl.toString());
+ request.setPayload(expectedRequestBody.getBytes());
+ try (Response response = oAuthService.execute(request, null).get(30, TimeUnit.SECONDS)) {
+ assertEquals(expectedResponseBody, response.getBody());
+ }
+
+ final RecordedRequest recordedRequest = server.takeRequest();
assertEquals("POST", recordedRequest.getMethod());
assertEquals(expectedRequestBody, recordedRequest.getBody().readUtf8());
+ assertEquals(HttpClient.DEFAULT_CONTENT_TYPE, recordedRequest.getHeader(HttpClient.CONTENT_TYPE));
- // request with empty body
- request = new OAuthRequest(Verb.POST, baseUrl.toString());
- response = oAuthService.execute(request, null).get(30, TimeUnit.SECONDS);
+ server.shutdown();
+ }
- assertEquals(expectedResponseBody, response.getBody());
+ @Test
+ public void shouldSendPostRequestWithBodyParamsBody() throws Exception {
+ final String expectedResponseBody = "response body for test shouldSendPostRequest";
+ final String expectedRequestBodyParamName = "request_body_param_name";
+ final String expectedRequestBodyParamValue = "request_body_param_value";
+ final String expectedRequestBody = expectedRequestBodyParamName + '=' + expectedRequestBodyParamValue;
- recordedRequest = server.takeRequest();
+ final MockWebServer server = new MockWebServer();
+ server.enqueue(new MockResponse().setBody(expectedResponseBody));
+ server.start();
+
+ final HttpUrl baseUrl = server.url("/testUrl");
+
+ final OAuthRequest request = new OAuthRequest(Verb.POST, baseUrl.toString());
+ request.addBodyParameter(expectedRequestBodyParamName, expectedRequestBodyParamValue);
+ try (Response response = oAuthService.execute(request, null).get(30, TimeUnit.SECONDS)) {
+ assertEquals(expectedResponseBody, response.getBody());
+ }
+
+ final RecordedRequest recordedRequest = server.takeRequest();
assertEquals("POST", recordedRequest.getMethod());
- assertEquals("", recordedRequest.getBody().readUtf8());
+ assertEquals(expectedRequestBody, recordedRequest.getBody().readUtf8());
+ assertEquals(HttpClient.DEFAULT_CONTENT_TYPE, recordedRequest.getHeader(HttpClient.CONTENT_TYPE));
server.shutdown();
}
@@ -123,9 +211,9 @@ public void shouldReadResponseStream() throws Exception {
final HttpUrl baseUrl = server.url("/testUrl");
final OAuthRequest request = new OAuthRequest(Verb.GET, baseUrl.toString());
- final Response response = oAuthService.execute(request, null).get(30, TimeUnit.SECONDS);
-
- assertEquals(expectedResponseBody, StreamUtils.getStreamContents(response.getStream()));
+ try (Response response = oAuthService.execute(request, null).get(30, TimeUnit.SECONDS)) {
+ assertEquals(expectedResponseBody, StreamUtils.getStreamContents(response.getStream()));
+ }
final RecordedRequest recordedRequest = server.takeRequest();
assertEquals("GET", recordedRequest.getMethod());
@@ -165,10 +253,11 @@ public void shouldPassErrors() throws Exception {
final OAuthRequest request = new OAuthRequest(Verb.GET, baseUrl.toString());
final TestCallback callback = new TestCallback();
- final Response response = oAuthService.execute(request, callback).get();
+ try (Response response = oAuthService.execute(request, callback).get()) {
- assertEquals(500, response.getCode());
- assertEquals(500, callback.getResponse().getCode());
+ assertEquals(500, response.getCode());
+ assertEquals(500, callback.getResponse().getCode());
+ }
server.shutdown();
}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/base64/Base64Test.java b/scribejava-core/src/test/java/com/github/scribejava/core/base64/Base64Test.java
new file mode 100644
index 000000000..4d345b77d
--- /dev/null
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/base64/Base64Test.java
@@ -0,0 +1,213 @@
+package com.github.scribejava.core.base64;
+
+import java.io.UnsupportedEncodingException;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+
+public class Base64Test {
+
+ private Base64 java8Base64;
+ private Base64 commonsCodecBase64;
+ private Base64 jaxbBase64;
+ private Base64 jaxb230Base64;
+ private byte[] helloWorldBytes;
+ private byte[] helloWorldTwoLinesBytes;
+ private byte[] helloWorldTwoLinesAndNewLineBytes;
+ private byte[] helloWorldDifferentCharsBytes;
+ private byte[] bytes;
+ private byte[] allBytes;
+
+ @Before
+ public void setUp() throws UnsupportedEncodingException {
+ helloWorldBytes = "Hello World".getBytes("UTF-8");
+ helloWorldTwoLinesBytes = "Hello World\r\nNew Line2".getBytes("UTF-8");
+ helloWorldTwoLinesAndNewLineBytes = "Hello World\r\nSecond Line\r\n".getBytes("UTF-8");
+ helloWorldDifferentCharsBytes = ("`1234567890-=~!@#$%^&*()_+ёЁ\"№;:?qwertyuiop[]asdfghjkl;'zxcvbnm,./QWERTYUIOP"
+ + "{}|ASDFGHJKL:ZXCVBNM<>?йфяцычувскамепинртгоьшлбщдюзж.хэъ\\ЙФЯЦЫЧУВСКАМЕПИНРТГОЬШЛБЩДЮЗЖ,ХЭЪ/\r\t\f\'"
+ + "\b\n").getBytes("UTF-8");
+ bytes = new byte[]{48, -126, 2, 118, 2, 1, 0, 48, 13, 6, 9, 42, -122, 72, -122, -9, 13, 1, 1, 1, 5, 0, 4, -126,
+ 2, 96, 48, -126, 2, 92, 2, 1, 0, 2, -127, -127, 0, -61, -48, -28, 16, -116, -58, 85, 42, -39, 54, 50, -119,
+ 18, 40, 17, 75, 51, -24, 113, -109, 38, 17, -18, 106, -60, -74, -97, 29, 82, 123, -128, -88, -34, 92, 112,
+ -57, 43, -101, 85, -47, 99, -16, 11, -95, 28, -46, 82, -104, -101, -29, -106, -106, -45, -80, 99, -93, 45,
+ -102, 107, 31, 32, -60, 13, -46, 102, 127, 81, 94, -98, -56, 117, 50, 21, 39, 5, -98, 26, -18, -30, -21,
+ 102, -78, -77, 20, 113, -55, 117, -87, -105, -10, -100, 90, -92, 31, 61, -68, -73, -121, -108, 42, 45, -10,
+ 21, 87, 118, -74, 71, -100, -37, 96, -24, 87, 102, 68, -95, -1, -14, 6, -20, -14, 32, -14, 33, -84, -123,
+ -65, 54, 3, 2, 3, 1, 0, 1, 2, -127, -128, 62, 115, -45, 41, 76, 28, -67, 113, 11, 17, -12, 16, 47, -112, 67,
+ -29, -66, 76, 118, 92, -66, 25, -99, -10, -61, -126, -109, 64, -32, -37, -82, -17, 44, -20, 66, -77, -29,
+ 62, -119, -94, 92, -61, 100, -110, 32, 5, 28, 126, -69, -55, 92, 112, 2, 88, 17, -113, 43, -82, 66, 88, 13,
+ 53, 58, 74, -65, 36, 45, 93, -63, -15, 125, -7, -44, -45, -51, -76, 86, 97, 54, -36, -49, -117, -18, 56, 54,
+ 78, 80, 119, -6, -75, 39, 16, 57, -125, -68, 42, 50, -114, 92, 6, 13, 30, -91, 53, -66, -19, -20, 88, 32,
+ -38, 36, 126, -119, -86, 47, -46, 37, 115, -49, -23, 125, -61, 75, 37, 70, 92, -122, -79, 2, 65, 0, -11,
+ -105, 91, 105, -73, 54, 97, 96, -87, -16, -15, -73, 15, 31, -80, -96, -74, -53, -54, 53, -17, -9, 39, 62,
+ 58, 51, 68, 107, 86, 111, -62, -48, -125, 117, 66, 111, -55, 27, 56, 81, -50, 96, -47, -102, -50, -83, -52,
+ -17, -20, 3, -42, -94, 11, 23, 104, 127, 29, -25, 32, 43, -41, -112, -83, -99, 2, 65, 0, -52, 29, 122, 9,
+ 49, -14, -118, 110, -79, 107, 76, -88, 4, -49, 40, 32, 59, 88, 45, -71, 62, 78, 93, -121, -123, 123, 3, 4,
+ 111, -112, 27, 12, -115, -123, 125, 39, 54, 96, -2, -46, 30, 40, -4, -119, 13, -121, 118, -23, 1, -83, -76,
+ -26, -117, -86, -79, -121, 113, -26, 33, 30, 124, 35, -16, 31, 2, 65, 0, -47, -113, 111, -81, 75, 104, -103,
+ -69, 20, 7, -57, 25, -65, 75, -7, 57, -118, 1, 102, -16, -109, 108, -64, 13, -73, 55, -37, -32, 3, -121,
+ -90, 34, -86, -87, -70, 33, 12, -25, -81, 45, 14, -1, 74, -101, -32, 84, 41, -107, 104, 60, -10, 62, -101,
+ 92, 68, 12, -124, 5, -98, 76, 10, -53, 39, 121, 2, 64, 7, 106, 102, -67, -96, -57, -20, 9, -101, 126, -121,
+ 121, 111, 59, 75, 124, -24, 75, 10, -42, 57, 18, 69, -55, -97, -86, -39, 112, 54, -47, 104, 122, 43, 70, 23,
+ 70, -18, 109, -43, -76, 50, -114, 80, -90, 118, 12, 94, -32, -106, 68, 6, 87, 125, -23, -124, -85, -92, 18,
+ -75, 79, 83, 57, 71, 7, 2, 64, 73, -64, -3, 78, -90, -122, -64, -99, -29, -71, 75, 21, -74, -24, -43, -37,
+ 116, -89, 31, -115, -30, 50, 8, 23, 79, -71, -68, -39, 36, -23, 60, 102, -90, -42, 19, -33, -102, -85, -74,
+ 103, 73, -30, 120, -15, 104, -9, 110, -24, -127, 14, -57, -44, 67, 9, 80, 120, 42, 94, 107, -81, -109, 101,
+ -1, 91};
+
+ allBytes = new byte[]{-128, -127, -126, -125, -124, -123, -122, -121, -120, -119, -118, -117, -116, -115, -114,
+ -113, -112, -111, -110, -109, -108, -107, -106, -105, -104, -103, -102, -101, -100, -99, -98, -97, -96, -95,
+ -94, -93, -92, -91, -90, -89, -88, -87, -86, -85, -84, -83, -82, -81, -80, -79, -78, -77, -76, -75, -74,
+ -73, -72, -71, -70, -69, -68, -67, -66, -65, -64, -63, -62, -61, -60, -59, -58, -57, -56, -55, -54, -53,
+ -52, -51, -50, -49, -48, -47, -46, -45, -44, -43, -42, -41, -40, -39, -38, -37, -36, -35, -34, -33, -32,
+ -31, -30, -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17, -16, -15, -14, -13, -12, -11,
+ -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
+ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
+ 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
+ 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120,
+ 121, 122, 123, 124, 125, 126, 127};
+
+ java8Base64 = new Java8Base64();
+ commonsCodecBase64 = new CommonsCodecBase64();
+ jaxbBase64 = new JaxbBase64();
+ jaxb230Base64 = new Jaxb230Base64();
+ }
+
+ @Test
+ public void allImplementationsAreAvailable() {
+ assertTrue(Java8Base64.isAvailable());
+ assertTrue(CommonsCodecBase64.isAvailable());
+ assertTrue(JaxbBase64.isAvailable());
+ assertTrue(Jaxb230Base64.isAvailable());
+ }
+
+ @Test
+ public void testEncode() {
+ final String helloWorldEncoded = "SGVsbG8gV29ybGQ=";
+ final String helloWorldTwoLinesEncoded = "SGVsbG8gV29ybGQNCk5ldyBMaW5lMg==";
+ final String helloWorldTwoLinesAndNewLineEncoded = "SGVsbG8gV29ybGQNClNlY29uZCBMaW5lDQo=";
+ final String helloWorldDifferentCharsEncoded = "YDEyMzQ1Njc4OTAtPX4hQCMkJV4mKigpXyvRkdCBIuKEljs6P3F3ZXJ0eXVpb3B"
+ + "bXWFzZGZnaGprbDsnenhjdmJubSwuL1FXRVJUWVVJT1B7fXxBU0RGR0hKS0w6WlhDVkJOTTw+P9C50YTRj9GG0YvRh9GD0LLRgdC"
+ + "60LDQvNC10L/QuNC90YDRgtCz0L7RjNGI0LvQsdGJ0LTRjtC30LYu0YXRjdGKXNCZ0KTQr9Cm0KvQp9Cj0JLQodCa0JDQnNCV0J/"
+ + "QmNCd0KDQotCT0J7QrNCo0JvQkdCp0JTQrtCX0JYs0KXQrdCqLw0JDCcICg==";
+ final String str = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMPQ5BCMxlUq2TYy"
+ + "iRIoEUsz6HGTJhHuasS2nx1Se4Co3lxwxyubVdFj8AuhHNJSmJvjlpbTsGOjLZpr"
+ + "HyDEDdJmf1Fensh1MhUnBZ4a7uLrZrKzFHHJdamX9pxapB89vLeHlCot9hVXdrZH"
+ + "nNtg6FdmRKH/8gbs8iDyIayFvzYDAgMBAAECgYA+c9MpTBy9cQsR9BAvkEPjvkx2"
+ + "XL4ZnfbDgpNA4Nuu7yzsQrPjPomiXMNkkiAFHH67yVxwAlgRjyuuQlgNNTpKvyQt"
+ + "XcHxffnU0820VmE23M+L7jg2TlB3+rUnEDmDvCoyjlwGDR6lNb7t7Fgg2iR+iaov"
+ + "0iVzz+l9w0slRlyGsQJBAPWXW2m3NmFgqfDxtw8fsKC2y8o17/cnPjozRGtWb8LQ"
+ + "g3VCb8kbOFHOYNGazq3M7+wD1qILF2h/HecgK9eQrZ0CQQDMHXoJMfKKbrFrTKgE"
+ + "zyggO1gtuT5OXYeFewMEb5AbDI2FfSc2YP7SHij8iQ2HdukBrbTmi6qxh3HmIR58"
+ + "I/AfAkEA0Y9vr0tombsUB8cZv0v5OYoBZvCTbMANtzfb4AOHpiKqqbohDOevLQ7/"
+ + "SpvgVCmVaDz2PptcRAyEBZ5MCssneQJAB2pmvaDH7Ambfod5bztLfOhLCtY5EkXJ"
+ + "n6rZcDbRaHorRhdG7m3VtDKOUKZ2DF7glkQGV33phKukErVPUzlHBwJAScD9TqaG"
+ + "wJ3juUsVtujV23SnH43iMggXT7m82STpPGam1hPfmqu2Z0niePFo927ogQ7H1EMJ"
+ + "UHgqXmuvk2X/Ww==";
+
+ final String allBytesStr = "gIGCg4SFhoeIiYqLjI2Oj5CRkpOUlZaXmJmam5ydnp+goaKjpKWmp6ipqqusra6vsLGys7S1tre4ubq7vL2"
+ + "+v8DBwsPExcbHyMnKy8zNzs/Q0dLT1NXW19jZ2tvc3d7f4OHi4+Tl5ufo6err7O3u7/Dx8vP09fb3+Pn6+/z9/v8AAQIDBAUGBwg"
+ + "JCgsMDQ4PEBESExQVFhcYGRobHB0eHyAhIiMkJSYnKCkqKywtLi8wMTIzNDU2Nzg5Ojs8PT4/QEFCQ0RFRkdISUpLTE1OT1BRUlN"
+ + "UVVZXWFlaW1xdXl9gYWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXp7fH1+fw==";
+
+ assertEquals(helloWorldEncoded, java8Base64.internalEncode(helloWorldBytes));
+ assertEquals(helloWorldTwoLinesEncoded, java8Base64.internalEncode(helloWorldTwoLinesBytes));
+ assertEquals(helloWorldTwoLinesAndNewLineEncoded,
+ java8Base64.internalEncode(helloWorldTwoLinesAndNewLineBytes));
+ assertEquals(helloWorldDifferentCharsEncoded, java8Base64.internalEncode(helloWorldDifferentCharsBytes));
+ assertEquals(str, java8Base64.internalEncode(bytes));
+ assertEquals(allBytesStr, java8Base64.internalEncode(allBytes));
+
+ assertEquals(helloWorldEncoded, commonsCodecBase64.internalEncode(helloWorldBytes));
+ assertEquals(helloWorldTwoLinesEncoded, commonsCodecBase64.internalEncode(helloWorldTwoLinesBytes));
+ assertEquals(helloWorldTwoLinesAndNewLineEncoded,
+ commonsCodecBase64.internalEncode(helloWorldTwoLinesAndNewLineBytes));
+ assertEquals(helloWorldDifferentCharsEncoded, commonsCodecBase64.internalEncode(helloWorldDifferentCharsBytes));
+ assertEquals(str, commonsCodecBase64.internalEncode(bytes));
+ assertEquals(allBytesStr, commonsCodecBase64.internalEncode(allBytes));
+
+ assertEquals(helloWorldEncoded, jaxbBase64.internalEncode(helloWorldBytes));
+ assertEquals(helloWorldTwoLinesEncoded, jaxbBase64.internalEncode(helloWorldTwoLinesBytes));
+ assertEquals(helloWorldTwoLinesAndNewLineEncoded, jaxbBase64.internalEncode(helloWorldTwoLinesAndNewLineBytes));
+ assertEquals(helloWorldDifferentCharsEncoded, jaxbBase64.internalEncode(helloWorldDifferentCharsBytes));
+ assertEquals(str, jaxbBase64.internalEncode(bytes));
+ assertEquals(allBytesStr, jaxbBase64.internalEncode(allBytes));
+
+ assertEquals(helloWorldEncoded, jaxb230Base64.internalEncode(helloWorldBytes));
+ assertEquals(helloWorldTwoLinesEncoded, jaxb230Base64.internalEncode(helloWorldTwoLinesBytes));
+ assertEquals(helloWorldTwoLinesAndNewLineEncoded,
+ jaxb230Base64.internalEncode(helloWorldTwoLinesAndNewLineBytes));
+ assertEquals(helloWorldDifferentCharsEncoded, jaxb230Base64.internalEncode(helloWorldDifferentCharsBytes));
+ assertEquals(str, jaxb230Base64.internalEncode(bytes));
+ assertEquals(allBytesStr, jaxb230Base64.internalEncode(allBytes));
+ }
+
+ @Test
+ public void testEncodeUrlWithoutPadding() {
+ final String helloWorldEncoded = "SGVsbG8gV29ybGQ";
+ final String helloWorldTwoLinesEncoded = "SGVsbG8gV29ybGQNCk5ldyBMaW5lMg";
+ final String helloWorldTwoLinesAndNewLineEncoded = "SGVsbG8gV29ybGQNClNlY29uZCBMaW5lDQo";
+ final String helloWorldDifferentCharsEncoded = "YDEyMzQ1Njc4OTAtPX4hQCMkJV4mKigpXyvRkdCBIuKEljs6P3F3ZXJ0eXVpb3B"
+ + "bXWFzZGZnaGprbDsnenhjdmJubSwuL1FXRVJUWVVJT1B7fXxBU0RGR0hKS0w6WlhDVkJOTTw-P9C50YTRj9GG0YvRh9GD0LLRgdC"
+ + "60LDQvNC10L_QuNC90YDRgtCz0L7RjNGI0LvQsdGJ0LTRjtC30LYu0YXRjdGKXNCZ0KTQr9Cm0KvQp9Cj0JLQodCa0JDQnNCV0J_"
+ + "QmNCd0KDQotCT0J7QrNCo0JvQkdCp0JTQrtCX0JYs0KXQrdCqLw0JDCcICg";
+ final String str = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMPQ5BCMxlUq2TYy"
+ + "iRIoEUsz6HGTJhHuasS2nx1Se4Co3lxwxyubVdFj8AuhHNJSmJvjlpbTsGOjLZpr"
+ + "HyDEDdJmf1Fensh1MhUnBZ4a7uLrZrKzFHHJdamX9pxapB89vLeHlCot9hVXdrZH"
+ + "nNtg6FdmRKH_8gbs8iDyIayFvzYDAgMBAAECgYA-c9MpTBy9cQsR9BAvkEPjvkx2"
+ + "XL4ZnfbDgpNA4Nuu7yzsQrPjPomiXMNkkiAFHH67yVxwAlgRjyuuQlgNNTpKvyQt"
+ + "XcHxffnU0820VmE23M-L7jg2TlB3-rUnEDmDvCoyjlwGDR6lNb7t7Fgg2iR-iaov"
+ + "0iVzz-l9w0slRlyGsQJBAPWXW2m3NmFgqfDxtw8fsKC2y8o17_cnPjozRGtWb8LQ"
+ + "g3VCb8kbOFHOYNGazq3M7-wD1qILF2h_HecgK9eQrZ0CQQDMHXoJMfKKbrFrTKgE"
+ + "zyggO1gtuT5OXYeFewMEb5AbDI2FfSc2YP7SHij8iQ2HdukBrbTmi6qxh3HmIR58"
+ + "I_AfAkEA0Y9vr0tombsUB8cZv0v5OYoBZvCTbMANtzfb4AOHpiKqqbohDOevLQ7_"
+ + "SpvgVCmVaDz2PptcRAyEBZ5MCssneQJAB2pmvaDH7Ambfod5bztLfOhLCtY5EkXJ"
+ + "n6rZcDbRaHorRhdG7m3VtDKOUKZ2DF7glkQGV33phKukErVPUzlHBwJAScD9TqaG"
+ + "wJ3juUsVtujV23SnH43iMggXT7m82STpPGam1hPfmqu2Z0niePFo927ogQ7H1EMJ"
+ + "UHgqXmuvk2X_Ww";
+
+ final String allBytesStr = "gIGCg4SFhoeIiYqLjI2Oj5CRkpOUlZaXmJmam5ydnp-goaKjpKWmp6ipqqusra6vsLGys7S1tre4ubq7vL2"
+ + "-v8DBwsPExcbHyMnKy8zNzs_Q0dLT1NXW19jZ2tvc3d7f4OHi4-Tl5ufo6err7O3u7_Dx8vP09fb3-Pn6-_z9_v8AAQIDBAUGBwg"
+ + "JCgsMDQ4PEBESExQVFhcYGRobHB0eHyAhIiMkJSYnKCkqKywtLi8wMTIzNDU2Nzg5Ojs8PT4_QEFCQ0RFRkdISUpLTE1OT1BRUlN"
+ + "UVVZXWFlaW1xdXl9gYWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXp7fH1-fw";
+
+ assertEquals(helloWorldEncoded, java8Base64.internalEncodeUrlWithoutPadding(helloWorldBytes));
+ assertEquals(helloWorldTwoLinesEncoded, java8Base64.internalEncodeUrlWithoutPadding(helloWorldTwoLinesBytes));
+ assertEquals(helloWorldTwoLinesAndNewLineEncoded,
+ java8Base64.internalEncodeUrlWithoutPadding(helloWorldTwoLinesAndNewLineBytes));
+ assertEquals(helloWorldDifferentCharsEncoded,
+ java8Base64.internalEncodeUrlWithoutPadding(helloWorldDifferentCharsBytes));
+ assertEquals(str, java8Base64.internalEncodeUrlWithoutPadding(bytes));
+ assertEquals(allBytesStr, java8Base64.internalEncodeUrlWithoutPadding(allBytes));
+
+ assertEquals(helloWorldEncoded, commonsCodecBase64.internalEncodeUrlWithoutPadding(helloWorldBytes));
+ assertEquals(helloWorldTwoLinesEncoded,
+ commonsCodecBase64.internalEncodeUrlWithoutPadding(helloWorldTwoLinesBytes));
+ assertEquals(helloWorldTwoLinesAndNewLineEncoded,
+ commonsCodecBase64.internalEncodeUrlWithoutPadding(helloWorldTwoLinesAndNewLineBytes));
+ assertEquals(helloWorldDifferentCharsEncoded,
+ commonsCodecBase64.internalEncodeUrlWithoutPadding(helloWorldDifferentCharsBytes));
+ assertEquals(str, commonsCodecBase64.internalEncodeUrlWithoutPadding(bytes));
+ assertEquals(allBytesStr, commonsCodecBase64.internalEncodeUrlWithoutPadding(allBytes));
+
+ assertEquals(helloWorldEncoded, jaxbBase64.internalEncodeUrlWithoutPadding(helloWorldBytes));
+ assertEquals(helloWorldTwoLinesEncoded, jaxbBase64.internalEncodeUrlWithoutPadding(helloWorldTwoLinesBytes));
+ assertEquals(helloWorldTwoLinesAndNewLineEncoded,
+ jaxbBase64.internalEncodeUrlWithoutPadding(helloWorldTwoLinesAndNewLineBytes));
+ assertEquals(helloWorldDifferentCharsEncoded,
+ jaxbBase64.internalEncodeUrlWithoutPadding(helloWorldDifferentCharsBytes));
+ assertEquals(str, jaxbBase64.internalEncodeUrlWithoutPadding(bytes));
+ assertEquals(allBytesStr, jaxbBase64.internalEncodeUrlWithoutPadding(allBytes));
+
+ assertEquals(helloWorldEncoded, jaxb230Base64.internalEncodeUrlWithoutPadding(helloWorldBytes));
+ assertEquals(helloWorldTwoLinesEncoded, jaxb230Base64.internalEncodeUrlWithoutPadding(helloWorldTwoLinesBytes));
+ assertEquals(helloWorldTwoLinesAndNewLineEncoded,
+ jaxb230Base64.internalEncodeUrlWithoutPadding(helloWorldTwoLinesAndNewLineBytes));
+ assertEquals(helloWorldDifferentCharsEncoded,
+ jaxb230Base64.internalEncodeUrlWithoutPadding(helloWorldDifferentCharsBytes));
+ assertEquals(str, jaxb230Base64.internalEncodeUrlWithoutPadding(bytes));
+ assertEquals(allBytesStr, jaxb230Base64.internalEncodeUrlWithoutPadding(allBytes));
+ }
+}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/BaseStringExtractorTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/BaseStringExtractorTest.java
index bc833db08..89865a637 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/BaseStringExtractorTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/BaseStringExtractorTest.java
@@ -7,6 +7,8 @@
import com.github.scribejava.core.exceptions.OAuthParametersMissingException;
import com.github.scribejava.core.model.OAuthRequest;
import com.github.scribejava.core.model.Verb;
+import static org.junit.Assert.assertThrows;
+import org.junit.function.ThrowingRunnable;
public class BaseStringExtractorTest {
@@ -83,15 +85,23 @@ public void shouldExcludePort443v2() {
assertEquals(expected, baseString);
}
- @Test(expected = IllegalArgumentException.class)
public void shouldThrowExceptionIfRquestIsNull() {
- extractor.extract(null);
+ assertThrows(IllegalArgumentException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ extractor.extract(null);
+ }
+ });
}
- @Test(expected = OAuthParametersMissingException.class)
public void shouldThrowExceptionIfRquestHasNoOAuthParameters() {
final OAuthRequest request = new OAuthRequest(Verb.GET, "http://example.com");
- extractor.extract(request);
+ assertThrows(OAuthParametersMissingException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ extractor.extract(request);
+ }
+ });
}
@Test
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/HeaderExtractorTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/HeaderExtractorTest.java
index c1658fc7e..b515908c8 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/HeaderExtractorTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/HeaderExtractorTest.java
@@ -2,12 +2,14 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertThrows;
import org.junit.Before;
import org.junit.Test;
import com.github.scribejava.core.exceptions.OAuthParametersMissingException;
import com.github.scribejava.core.model.OAuthRequest;
import com.github.scribejava.core.model.Verb;
import com.github.scribejava.core.ObjectMother;
+import org.junit.function.ThrowingRunnable;
public class HeaderExtractorTest {
@@ -36,21 +38,29 @@ public void shouldExtractStandardHeader() {
assertTrue(header.contains(timestamp));
// Assert that header only contains the checked elements above and nothing else
assertEquals(", , , ",
- header.replaceFirst(oauth, "")
- .replaceFirst(callback, "")
- .replaceFirst(signature, "")
- .replaceFirst(key, "")
- .replaceFirst(timestamp, ""));
+ header.replaceFirst(oauth, "")
+ .replaceFirst(callback, "")
+ .replaceFirst(signature, "")
+ .replaceFirst(key, "")
+ .replaceFirst(timestamp, ""));
}
- @Test(expected = IllegalArgumentException.class)
public void shouldExceptionIfRequestIsNull() {
- extractor.extract(null);
+ assertThrows(IllegalArgumentException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ extractor.extract(null);
+ }
+ });
}
- @Test(expected = OAuthParametersMissingException.class)
public void shouldExceptionIfRequestHasNoOAuthParams() {
final OAuthRequest emptyRequest = new OAuthRequest(Verb.GET, "http://example.com");
- extractor.extract(emptyRequest);
+ assertThrows(OAuthParametersMissingException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ extractor.extract(emptyRequest);
+ }
+ });
}
}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth1AccessTokenExtractorTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth1AccessTokenExtractorTest.java
index 36ac4cd2e..b62d9bf1e 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth1AccessTokenExtractorTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth1AccessTokenExtractorTest.java
@@ -10,6 +10,8 @@
import java.util.Collections;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+import org.junit.function.ThrowingRunnable;
public class OAuth1AccessTokenExtractorTest {
@@ -22,58 +24,94 @@ public void setUp() {
@Test
public void shouldExtractTokenFromOAuthStandardResponse() throws IOException {
- final String response = "oauth_token=hh5s93j4hdidpola&oauth_token_secret=hdhd0244k9j7ao03";
- final OAuth1Token extracted = extractor.extract(ok(response));
+ final String responseBody = "oauth_token=hh5s93j4hdidpola&oauth_token_secret=hdhd0244k9j7ao03";
+ final OAuth1Token extracted;
+ try (Response response = ok(responseBody)) {
+ extracted = extractor.extract(response);
+ }
assertEquals("hh5s93j4hdidpola", extracted.getToken());
assertEquals("hdhd0244k9j7ao03", extracted.getTokenSecret());
}
@Test
public void shouldExtractTokenFromInvertedOAuthStandardResponse() throws IOException {
- final String response = "oauth_token_secret=hh5s93j4hdidpola&oauth_token=hdhd0244k9j7ao03";
- final OAuth1Token extracted = extractor.extract(ok(response));
+ final String responseBody = "oauth_token_secret=hh5s93j4hdidpola&oauth_token=hdhd0244k9j7ao03";
+ final OAuth1Token extracted;
+ try (Response response = ok(responseBody)) {
+ extracted = extractor.extract(response);
+ }
assertEquals("hh5s93j4hdidpola", extracted.getTokenSecret());
assertEquals("hdhd0244k9j7ao03", extracted.getToken());
}
@Test
public void shouldExtractTokenFromResponseWithCallbackConfirmed() throws IOException {
- final String response = "oauth_token=hh5s93j4hdidpola&oauth_token_secret=hdhd0244k9j7ao03"
+ final String responseBody = "oauth_token=hh5s93j4hdidpola&oauth_token_secret=hdhd0244k9j7ao03"
+ "&callback_confirmed=true";
- final OAuth1Token extracted = extractor.extract(ok(response));
+ final OAuth1Token extracted;
+ try (Response response = ok(responseBody)) {
+ extracted = extractor.extract(response);
+ }
assertEquals("hh5s93j4hdidpola", extracted.getToken());
assertEquals("hdhd0244k9j7ao03", extracted.getTokenSecret());
}
@Test
public void shouldExtractTokenWithEmptySecret() throws IOException {
- final String response = "oauth_token=hh5s93j4hdidpola&oauth_token_secret=";
- final OAuth1Token extracted = extractor.extract(ok(response));
+ final String responseBody = "oauth_token=hh5s93j4hdidpola&oauth_token_secret=";
+ final OAuth1Token extracted;
+ try (Response response = ok(responseBody)) {
+ extracted = extractor.extract(response);
+ }
assertEquals("hh5s93j4hdidpola", extracted.getToken());
assertEquals("", extracted.getTokenSecret());
}
- @Test(expected = OAuthException.class)
public void shouldThrowExceptionIfTokenIsAbsent() throws IOException {
- final String response = "oauth_secret=hh5s93j4hdidpola&callback_confirmed=true";
- extractor.extract(ok(response));
+ final String responseBody = "oauth_secret=hh5s93j4hdidpola&callback_confirmed=true";
+ try (Response response = ok(responseBody)) {
+ assertThrows(OAuthException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ extractor.extract(response);
+ }
+ });
+ }
}
- @Test(expected = OAuthException.class)
public void shouldThrowExceptionIfSecretIsAbsent() throws IOException {
- final String response = "oauth_token=hh5s93j4hdidpola&callback_confirmed=true";
- extractor.extract(ok(response));
+ final String responseBody = "oauth_token=hh5s93j4hdidpola&callback_confirmed=true";
+ try (Response response = ok(responseBody)) {
+ assertThrows(OAuthException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ extractor.extract(response);
+ }
+ });
+ }
}
- @Test(expected = IllegalArgumentException.class)
public void shouldThrowExceptionIfResponseIsNull() throws IOException {
- extractor.extract(ok(null));
+ try (Response response = ok(null)) {
+ assertThrows(IllegalArgumentException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ extractor.extract(response);
+ }
+ });
+ }
}
- @Test(expected = IllegalArgumentException.class)
public void shouldThrowExceptionIfResponseIsEmptyString() throws IOException {
- final String response = "";
- extractor.extract(ok(response));
+ final String responseBody = "";
+ try (Response response = ok(responseBody)) {
+ assertThrows(IllegalArgumentException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ extractor.extract(response);
+ }
+ });
+ }
}
private static Response ok(String body) {
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth2AccessTokenExtractorTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth2AccessTokenExtractorTest.java
index a79a87615..4f71c011d 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth2AccessTokenExtractorTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth2AccessTokenExtractorTest.java
@@ -10,6 +10,8 @@
import java.util.Collections;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+import org.junit.function.ThrowingRunnable;
public class OAuth2AccessTokenExtractorTest {
@@ -22,18 +24,24 @@ public void setUp() {
@Test
public void shouldExtractTokenFromOAuthStandardResponse() throws IOException {
- final String response = "access_token=166942940015970|2.2ltzWXYNDjCtg5ZDVVJJeg__.3600.1295816400-548517159"
+ final String responseBody = "access_token=166942940015970|2.2ltzWXYNDjCtg5ZDVVJJeg__.3600.1295816400-548517159"
+ "|RsXNdKrpxg8L6QNLWcs2TVTmcaE";
- final OAuth2AccessToken extracted = extractor.extract(ok(response));
+ final OAuth2AccessToken extracted;
+ try (Response response = ok(responseBody)) {
+ extracted = extractor.extract(response);
+ }
assertEquals("166942940015970|2.2ltzWXYNDjCtg5ZDVVJJeg__.3600.1295816400-548517159|RsXNdKrpxg8L6QNLWcs2TVTmcaE",
extracted.getAccessToken());
}
@Test
public void shouldExtractTokenFromResponseWithExpiresParam() throws IOException {
- final String response = "access_token=166942940015970|2.2ltzWXYNDjCtg5ZDVVJJeg__.3600.1295816400-548517159"
+ final String responseBody = "access_token=166942940015970|2.2ltzWXYNDjCtg5ZDVVJJeg__.3600.1295816400-548517159"
+ "|RsXNdKrpxg8L6QNLWcs2TVTmcaE&expires_in=5108";
- final OAuth2AccessToken extracted = extractor.extract(ok(response));
+ final OAuth2AccessToken extracted;
+ try (Response response = ok(responseBody)) {
+ extracted = extractor.extract(response);
+ }
assertEquals("166942940015970|2.2ltzWXYNDjCtg5ZDVVJJeg__.3600.1295816400-548517159|RsXNdKrpxg8L6QNLWcs2TVTmcaE",
extracted.getAccessToken());
assertEquals(Integer.valueOf(5108), extracted.getExpiresIn());
@@ -41,9 +49,12 @@ public void shouldExtractTokenFromResponseWithExpiresParam() throws IOException
@Test
public void shouldExtractTokenFromResponseWithExpiresAndRefreshParam() throws IOException {
- final String response = "access_token=166942940015970|2.2ltzWXYNDjCtg5ZDVVJJeg__.3600.1295816400-548517159"
+ final String responseBody = "access_token=166942940015970|2.2ltzWXYNDjCtg5ZDVVJJeg__.3600.1295816400-548517159"
+ "|RsXNdKrpxg8L6QNLWcs2TVTmcaE&expires_in=5108&token_type=bearer&refresh_token=166942940015970";
- final OAuth2AccessToken extracted = extractor.extract(ok(response));
+ final OAuth2AccessToken extracted;
+ try (Response response = ok(responseBody)) {
+ extracted = extractor.extract(response);
+ }
assertEquals("166942940015970|2.2ltzWXYNDjCtg5ZDVVJJeg__.3600.1295816400-548517159|RsXNdKrpxg8L6QNLWcs2TVTmcaE",
extracted.getAccessToken());
assertEquals(Integer.valueOf(5108), extracted.getExpiresIn());
@@ -53,32 +64,59 @@ public void shouldExtractTokenFromResponseWithExpiresAndRefreshParam() throws IO
@Test
public void shouldExtractTokenFromResponseWithManyParameters() throws IOException {
- final String response = "access_token=foo1234&other_stuff=yeah_we_have_this_too&number=42";
- final OAuth2AccessToken extracted = extractor.extract(ok(response));
+ final String responseBody = "access_token=foo1234&other_stuff=yeah_we_have_this_too&number=42";
+ final OAuth2AccessToken extracted;
+ try (Response response = ok(responseBody)) {
+ extracted = extractor.extract(response);
+ }
assertEquals("foo1234", extracted.getAccessToken());
}
- @Test(expected = OAuthException.class)
public void shouldThrowExceptionIfErrorResponse() throws IOException {
- final String response = "";
- extractor.extract(error(response));
+ final String responseBody = "";
+ try (Response response = error(responseBody)) {
+ assertThrows(OAuthException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ extractor.extract(response);
+ }
+ });
+ }
}
- @Test(expected = OAuthException.class)
public void shouldThrowExceptionIfTokenIsAbsent() throws IOException {
- final String response = "&expires=5108";
- extractor.extract(ok(response));
+ final String responseBody = "&expires=5108";
+ try (Response response = ok(responseBody)) {
+ assertThrows(OAuthException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ extractor.extract(response);
+ }
+ });
+ }
}
- @Test(expected = IllegalArgumentException.class)
public void shouldThrowExceptionIfResponseIsNull() throws IOException {
- extractor.extract(ok(null));
+ try (Response response = ok(null)) {
+ assertThrows(IllegalArgumentException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ extractor.extract(response);
+ }
+ });
+ }
}
- @Test(expected = IllegalArgumentException.class)
public void shouldThrowExceptionIfResponseIsEmptyString() throws IOException {
- final String response = "";
- extractor.extract(ok(response));
+ final String responseBody = "";
+ try (Response response = ok(responseBody)) {
+ assertThrows(IllegalArgumentException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ extractor.extract(response);
+ }
+ });
+ }
}
private static Response ok(String body) {
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth2AccessTokenJsonExtractorTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth2AccessTokenJsonExtractorTest.java
index 3aa80cd30..6628d1d9b 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth2AccessTokenJsonExtractorTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth2AccessTokenJsonExtractorTest.java
@@ -3,13 +3,15 @@
import com.github.scribejava.core.model.OAuth2AccessToken;
import com.github.scribejava.core.model.OAuth2AccessTokenErrorResponse;
import com.github.scribejava.core.model.Response;
+import com.github.scribejava.core.oauth2.OAuth2Error;
import org.junit.Test;
import java.io.IOException;
import java.util.Collections;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.assertThrows;
+import org.junit.function.ThrowingRunnable;
public class OAuth2AccessTokenJsonExtractorTest {
@@ -17,59 +19,103 @@ public class OAuth2AccessTokenJsonExtractorTest {
@Test
public void shouldParseResponse() throws IOException {
- final OAuth2AccessToken token = extractor.extract(
- ok("{ \"access_token\":\"I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T3X\"}"));
+ final String responseBody = "{ \"access_token\":\"I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T3X\", "
+ + "\"token_type\":\"example\"}";
+ final OAuth2AccessToken token;
+ try (Response response = ok(responseBody)) {
+ token = extractor.extract(response);
+ }
assertEquals("I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T3X", token.getAccessToken());
}
@Test
public void shouldParseScopeFromResponse() throws IOException {
- OAuth2AccessToken token = extractor.extract(
- ok("{ \"access_token\":\"I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T4X\", "
- + "\"scope\":\"s1\"}"));
+ final String responseBody = "{ \"access_token\":\"I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T4X\", "
+ + "\"token_type\":\"example\","
+ + "\"scope\":\"s1\"}";
+ final OAuth2AccessToken token;
+ try (Response response = ok(responseBody)) {
+ token = extractor.extract(response);
+ }
assertEquals("I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T4X", token.getAccessToken());
assertEquals("s1", token.getScope());
- token = extractor.extract(
- ok("{ \"access_token\":\"I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T5X\", "
- + "\"scope\":\"s1 s2\"}"));
- assertEquals("I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T5X", token.getAccessToken());
- assertEquals("s1 s2", token.getScope());
+ final String responseBody2 = "{ \"access_token\":\"I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T5X\", "
+ + "\"token_type\":\"example\","
+ + "\"scope\":\"s1 s2\"}";
+ final OAuth2AccessToken token2;
+ try (Response response = ok(responseBody2)) {
+ token2 = extractor.extract(response);
+ }
+ assertEquals("I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T5X", token2.getAccessToken());
+ assertEquals("s1 s2", token2.getScope());
- token = extractor.extract(
- ok("{ \"access_token\":\"I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T6X\", "
- + "\"scope\":\"s3 s4\", "
- + "\"refresh_token\":\"refresh_token1\"}"));
- assertEquals("I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T6X", token.getAccessToken());
- assertEquals("s3 s4", token.getScope());
- assertEquals("refresh_token1", token.getRefreshToken());
+ final String responseBody3 = "{ \"access_token\":\"I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T6X\", "
+ + "\"token_type\":\"example\","
+ + "\"scope\":\"s3 s4\", "
+ + "\"refresh_token\":\"refresh_token1\"}";
+ final OAuth2AccessToken token3;
+ try (Response response = ok(responseBody3)) {
+ token3 = extractor.extract(response);
+ }
+ assertEquals("I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T6X", token3.getAccessToken());
+ assertEquals("s3 s4", token3.getScope());
+ assertEquals("refresh_token1", token3.getRefreshToken());
}
- @Test(expected = IllegalArgumentException.class)
public void shouldThrowExceptionIfForNullParameters() throws IOException {
- extractor.extract(ok(null));
+ try (Response response = ok(null)) {
+ assertThrows(IllegalArgumentException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ extractor.extract(response);
+ }
+ });
+ }
}
- @Test(expected = IllegalArgumentException.class)
public void shouldThrowExceptionIfForEmptyStrings() throws IOException {
- extractor.extract(ok(""));
+ final String responseBody = "";
+ try (Response response = ok(responseBody)) {
+ assertThrows(IllegalArgumentException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ extractor.extract(response);
+ }
+ });
+ }
}
@Test
public void shouldThrowExceptionIfResponseIsError() throws IOException {
- final String body = "{" +
- "\"error_description\":\"unknown, invalid, or expired refresh token\"," +
- "\"error\":\"invalid_grant\"" +
- "}";
- try {
- extractor.extract(error(body));
- fail();
- } catch (OAuth2AccessTokenErrorResponse oaer) {
- assertEquals(OAuth2AccessTokenErrorResponse.ErrorCode.invalid_grant, oaer.getErrorCode());
+ final String responseBody = "{"
+ + "\"error_description\":\"unknown, invalid, or expired refresh token\","
+ + "\"error\":\"invalid_grant\""
+ + "}";
+ try (Response response = error(responseBody)) {
+ final OAuth2AccessTokenErrorResponse oaer = assertThrows(OAuth2AccessTokenErrorResponse.class,
+ new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ extractor.extract(response);
+ }
+ });
+ assertEquals(OAuth2Error.INVALID_GRANT, oaer.getError());
assertEquals("unknown, invalid, or expired refresh token", oaer.getErrorDescription());
}
}
+ @Test
+ public void testEscapedJsonInResponse() throws IOException {
+ final String responseBody = "{ \"access_token\":\"I0122HKLEM2\\/MV3ABKFTDT3T5X\","
+ + "\"token_type\":\"example\"}";
+ final OAuth2AccessToken token;
+ try (Response response = ok(responseBody)) {
+ token = extractor.extract(response);
+ }
+ assertEquals("I0122HKLEM2/MV3ABKFTDT3T5X", token.getAccessToken());
+ }
+
private static Response ok(String body) {
return new Response(200, /* message */ null, /* headers */ Collections.emptyMap(), body);
}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/httpclient/multipart/MultipartUtilsTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/httpclient/multipart/MultipartUtilsTest.java
new file mode 100644
index 000000000..c726dd9a7
--- /dev/null
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/httpclient/multipart/MultipartUtilsTest.java
@@ -0,0 +1,353 @@
+package com.github.scribejava.core.httpclient.multipart;
+
+import com.github.scribejava.core.httpclient.HttpClient;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+import org.junit.function.ThrowingRunnable;
+
+public class MultipartUtilsTest {
+
+ @Test
+ public void testEmptyMultipartPayload() throws IOException {
+ final MultipartPayload mP = new MultipartPayload();
+
+ final StringBuilder headersString = new StringBuilder();
+ for (Map.Entry header : mP.getHeaders().entrySet()) {
+ headersString.append(header.getKey())
+ .append(": ")
+ .append(header.getValue())
+ .append("\r\n");
+ }
+
+ assertEquals("Content-Type: multipart/form-data; boundary=\"" + mP.getBoundary() + "\"\r\n",
+ headersString.toString());
+
+ assertEquals("", MultipartUtils.getPayload(mP).toString());
+ }
+
+ @Test
+ public void testSimpleMultipartPayload() throws IOException {
+ final Map headers = new LinkedHashMap<>();
+ headers.put("X-Header", "X-Value");
+ headers.put("Content-Disposition", "Content-Disposition-Value");
+ final MultipartPayload mP = new MultipartPayload("mixed", "simple boundary", headers);
+ mP.setPreamble("This is the preamble. It is to be ignored, though it\n"
+ + "is a handy place for composition agents to include an\n"
+ + "explanatory note to non-MIME conformant readers.");
+
+ mP.addBodyPart(new ByteArrayBodyPartPayload(("This is implicitly typed plain US-ASCII text.\n"
+ + "It does NOT end with a linebreak.").getBytes()));
+
+ final ByteArrayBodyPartPayload bP = new ByteArrayBodyPartPayload(
+ ("This is explicitly typed plain US-ASCII text.\n"
+ + "It DOES end with a linebreak.\n").getBytes(),
+ Collections.singletonMap(HttpClient.CONTENT_TYPE, "text/plain; charset=us-ascii"));
+ mP.addBodyPart(bP);
+
+ mP.setEpilogue("This is the epilogue. It is also to be ignored.");
+
+ final StringBuilder headersString = new StringBuilder();
+ for (Map.Entry header : mP.getHeaders().entrySet()) {
+ headersString.append(header.getKey())
+ .append(": ")
+ .append(header.getValue())
+ .append("\r\n");
+ }
+
+ assertEquals("X-Header: X-Value\r\n"
+ + "Content-Disposition: Content-Disposition-Value\r\n"
+ + "Content-Type: multipart/mixed; boundary=\"simple boundary\"\r\n",
+ headersString.toString());
+
+ assertEquals("This is the preamble. It is to be ignored, though it\n"
+ + "is a handy place for composition agents to include an\n"
+ + "explanatory note to non-MIME conformant readers."
+ + "\r\n--simple boundary\r\n"
+ + "\r\n"
+ + "This is implicitly typed plain US-ASCII text.\n"
+ + "It does NOT end with a linebreak."
+ + "\r\n--simple boundary\r\n"
+ + "Content-Type: text/plain; charset=us-ascii\r\n"
+ + "\r\n"
+ + "This is explicitly typed plain US-ASCII text.\n"
+ + "It DOES end with a linebreak.\n"
+ + "\r\n--simple boundary--"
+ + "\r\nThis is the epilogue. It is also to be ignored.",
+ MultipartUtils.getPayload(mP).toString());
+ }
+
+ @Test
+ public void testCRLFMultipartPayload() throws IOException {
+ final MultipartPayload mP = new MultipartPayload("simple-boundary");
+ mP.addBodyPart(new ByteArrayBodyPartPayload("It does NOT end with a linebreak.".getBytes()));
+ mP.addBodyPart(new ByteArrayBodyPartPayload("It does end with a \\r linebreak.\r".getBytes()));
+ mP.addBodyPart(new ByteArrayBodyPartPayload("It does end with a \\n linebreak.\n".getBytes()));
+ mP.addBodyPart(new ByteArrayBodyPartPayload("It does end with a \\r\\n linebreak.\r\n".getBytes()));
+ mP.addBodyPart(new ByteArrayBodyPartPayload("the last one".getBytes()));
+
+ final StringBuilder headersString = new StringBuilder();
+ for (Map.Entry header : mP.getHeaders().entrySet()) {
+ headersString.append(header.getKey())
+ .append(": ")
+ .append(header.getValue())
+ .append("\r\n");
+ }
+
+ assertEquals("Content-Type: multipart/form-data; boundary=\"simple-boundary\"\r\n", headersString.toString());
+
+ assertEquals("--simple-boundary\r\n"
+ + "\r\n"
+ + "It does NOT end with a linebreak."
+ + "\r\n--simple-boundary\r\n"
+ + "\r\n"
+ + "It does end with a \\r linebreak.\r"
+ + "\r\n--simple-boundary\r\n"
+ + "\r\n"
+ + "It does end with a \\n linebreak.\n"
+ + "\r\n--simple-boundary\r\n"
+ + "\r\n"
+ + "It does end with a \\r\\n linebreak.\r\n"
+ + "\r\n--simple-boundary\r\n"
+ + "\r\n"
+ + "the last one"
+ + "\r\n--simple-boundary--",
+ MultipartUtils.getPayload(mP).toString());
+ }
+
+ @Test
+ public void testFileByteArrayBodyPartPayloadMultipartPayload() throws IOException {
+ final MultipartPayload mP = new MultipartPayload("testFileByteArrayBodyPartPayloadMultipartPayload boundary");
+ mP.addBodyPart(new FileByteArrayBodyPartPayload("fileContent".getBytes(), "name", "filename.ext"));
+
+ final StringBuilder headersString = new StringBuilder();
+ for (Map.Entry header : mP.getHeaders().entrySet()) {
+ headersString.append(header.getKey())
+ .append(": ")
+ .append(header.getValue())
+ .append("\r\n");
+ }
+
+ assertEquals("Content-Type: multipart/form-data; "
+ + "boundary=\"testFileByteArrayBodyPartPayloadMultipartPayload boundary\"\r\n",
+ headersString.toString());
+
+ assertEquals("--testFileByteArrayBodyPartPayloadMultipartPayload boundary\r\n"
+ + "Content-Disposition: form-data; name=\"name\"; filename=\"filename.ext\"\r\n"
+ + "\r\n"
+ + "fileContent"
+ + "\r\n--testFileByteArrayBodyPartPayloadMultipartPayload boundary--",
+ MultipartUtils.getPayload(mP).toString());
+ }
+
+ @Test
+ public void testComplexMultipartPayload() throws IOException {
+ final MultipartPayload mP = new MultipartPayload("mixed", "unique-boundary-1");
+
+ mP.setPreamble("This is the preamble area of a multipart message.\n"
+ + "Mail readers that understand multipart format\n"
+ + "should ignore this preamble.\n"
+ + "\n"
+ + "If you are reading this text, you might want to\n"
+ + "consider changing to a mail reader that understands\n"
+ + "how to properly display multipart messages.\n");
+
+ mP.addBodyPart(new ByteArrayBodyPartPayload("... Some text appears here ...".getBytes()));
+
+ mP.addBodyPart(new ByteArrayBodyPartPayload(("This could have been part of the previous part, but\n"
+ + "illustrates explicit versus implicit typing of body\n"
+ + "parts.\n").getBytes(), "text/plain; charset=US-ASCII"));
+
+ final MultipartPayload innerMP = new MultipartPayload("parallel", "unique-boundary-2");
+ mP.addBodyPart(innerMP);
+
+ final Map audioHeaders = new LinkedHashMap<>();
+ audioHeaders.put("Content-Type", "audio/basic");
+ audioHeaders.put("Content-Transfer-Encoding", "base64");
+ innerMP.addBodyPart(new ByteArrayBodyPartPayload(("... base64-encoded 8000 Hz single-channel\n"
+ + " mu-law-format audio data goes here ...").getBytes(), audioHeaders));
+
+ final Map imageHeaders = new LinkedHashMap<>();
+ imageHeaders.put("Content-Type", "image/jpeg");
+ imageHeaders.put("Content-Transfer-Encoding", "base64");
+ innerMP.addBodyPart(new ByteArrayBodyPartPayload("... base64-encoded image data goes here ...".getBytes(),
+ imageHeaders));
+
+ mP.addBodyPart(new ByteArrayBodyPartPayload(("This is enriched.\n"
+ + "as defined in RFC 1896\n"
+ + "\n"
+ + "Isn't it\n"
+ + "cool?\n").getBytes(), "text/enriched"));
+
+ mP.addBodyPart(new ByteArrayBodyPartPayload(("From: (mailbox in US-ASCII)\n"
+ + "To: (address in US-ASCII)\n"
+ + "Subject: (subject in US-ASCII)\n"
+ + "Content-Type: Text/plain; charset=ISO-8859-1\n"
+ + "Content-Transfer-Encoding: Quoted-printable\n"
+ + "\n"
+ + "... Additional text in ISO-8859-1 goes here ...\n").getBytes(), "message/rfc822"));
+
+ final StringBuilder headersString = new StringBuilder();
+ for (Map.Entry header : mP.getHeaders().entrySet()) {
+ headersString.append(header.getKey())
+ .append(": ")
+ .append(header.getValue())
+ .append("\r\n");
+ }
+ assertEquals("Content-Type: multipart/mixed; boundary=\"unique-boundary-1\"\r\n", headersString.toString());
+
+ assertEquals("This is the preamble area of a multipart message.\n"
+ + "Mail readers that understand multipart format\n"
+ + "should ignore this preamble.\n"
+ + "\n"
+ + "If you are reading this text, you might want to\n"
+ + "consider changing to a mail reader that understands\n"
+ + "how to properly display multipart messages.\n"
+ + "\r\n--unique-boundary-1\r\n"
+ + "\r\n"
+ + "... Some text appears here ..."
+ + "\r\n--unique-boundary-1\r\n"
+ + "Content-Type: text/plain; charset=US-ASCII\r\n"
+ + "\r\n"
+ + "This could have been part of the previous part, but\n"
+ + "illustrates explicit versus implicit typing of body\n"
+ + "parts.\n"
+ + "\r\n--unique-boundary-1\r\n"
+ + "Content-Type: multipart/parallel; boundary=\"unique-boundary-2\"\r\n"
+ + "\r\n--unique-boundary-2\r\n"
+ + "Content-Type: audio/basic\r\n"
+ + "Content-Transfer-Encoding: base64\r\n"
+ + "\r\n"
+ + "... base64-encoded 8000 Hz single-channel\n"
+ + " mu-law-format audio data goes here ..."
+ + "\r\n--unique-boundary-2\r\n"
+ + "Content-Type: image/jpeg\r\n"
+ + "Content-Transfer-Encoding: base64\r\n"
+ + "\r\n"
+ + "... base64-encoded image data goes here ..."
+ + "\r\n--unique-boundary-2--"
+ + "\r\n--unique-boundary-1\r\n"
+ + "Content-Type: text/enriched\r\n"
+ + "\r\n"
+ + "This is enriched.\n"
+ + "as defined in RFC 1896\n"
+ + "\n"
+ + "Isn't it\n"
+ + "cool?\n"
+ + "\r\n--unique-boundary-1\r\n"
+ + "Content-Type: message/rfc822\r\n"
+ + "\r\n"
+ + "From: (mailbox in US-ASCII)\n"
+ + "To: (address in US-ASCII)\n"
+ + "Subject: (subject in US-ASCII)\n"
+ + "Content-Type: Text/plain; charset=ISO-8859-1\n"
+ + "Content-Transfer-Encoding: Quoted-printable\n"
+ + "\n"
+ + "... Additional text in ISO-8859-1 goes here ...\n"
+ + "\r\n--unique-boundary-1--",
+ MultipartUtils.getPayload(mP).toString());
+ }
+
+ @Test
+ public void testParseBoundaryFromHeader() {
+ assertNull(MultipartUtils.parseBoundaryFromHeader(null));
+
+ assertEquals("0aA'()+_,-./:=?",
+ MultipartUtils.parseBoundaryFromHeader("multipart/subtype; boundary=\"0aA'()+_,-./:=?\""));
+
+ assertEquals("0aA'()+_, -./:=?",
+ MultipartUtils.parseBoundaryFromHeader("multipart/subtype; boundary=\"0aA'()+_, -./:=?\""));
+
+ assertEquals("0aA'()+_, -./:=?",
+ MultipartUtils.parseBoundaryFromHeader("multipart/subtype; boundary=\"0aA'()+_, -./:=? \""));
+
+ assertEquals("0aA'()+_,-./:=?",
+ MultipartUtils.parseBoundaryFromHeader("multipart/subtype; boundary=0aA'()+_,-./:=?"));
+
+ assertEquals("0aA'()+_, -./:=?",
+ MultipartUtils.parseBoundaryFromHeader("multipart/subtype; boundary=0aA'()+_, -./:=?"));
+
+ assertEquals("0aA'()+_, -./:=?",
+ MultipartUtils.parseBoundaryFromHeader("multipart/subtype; boundary=0aA'()+_, -./:=? "));
+
+ assertEquals(" 0aA'()+_, -./:=?",
+ MultipartUtils.parseBoundaryFromHeader("multipart/subtype; boundary= 0aA'()+_, -./:=?"));
+
+ assertNull(MultipartUtils.parseBoundaryFromHeader("multipart/subtype; boundar=0aA'()+_, -./:=? "));
+ assertNull(MultipartUtils.parseBoundaryFromHeader("multipart/subtype; "));
+ assertNull(MultipartUtils.parseBoundaryFromHeader("multipart/subtype;"));
+ assertNull(MultipartUtils.parseBoundaryFromHeader("multipart/subtype"));
+ assertNull(MultipartUtils.parseBoundaryFromHeader("multipart/subtype; boundary="));
+
+ assertEquals("0aA'()+_,",
+ MultipartUtils.parseBoundaryFromHeader("multipart/subtype; boundary=0aA'()+_,; -./:=? "));
+
+ assertEquals("0aA'()+_, -./:=?",
+ MultipartUtils.parseBoundaryFromHeader("multipart/subtype; boundary=\"0aA'()+_, -./:=?"));
+
+ assertEquals("0aA'()+_, -./:=?",
+ MultipartUtils.parseBoundaryFromHeader("multipart/subtype; boundary=0aA'()+_, -./:=?\""));
+
+ assertEquals("1234567890123456789012345678901234567890123456789012345678901234567890",
+ MultipartUtils.parseBoundaryFromHeader("multipart/subtype; "
+ + "boundary=1234567890123456789012345678901234567890123456789012345678901234567890"));
+
+ assertEquals("1234567890123456789012345678901234567890123456789012345678901234567890",
+ MultipartUtils.parseBoundaryFromHeader("multipart/subtype; "
+ + "boundary=12345678901234567890123456789012345678901234567890123456789012345678901"));
+
+ assertNull(MultipartUtils.parseBoundaryFromHeader("multipart/subtype; boundary="));
+ assertNull(MultipartUtils.parseBoundaryFromHeader("multipart/subtype; boundary=\"\""));
+ assertNull(MultipartUtils.parseBoundaryFromHeader("multipart/subtype; boundary=;123"));
+ assertNull(MultipartUtils.parseBoundaryFromHeader("multipart/subtype; boundary=\"\"123"));
+ }
+
+ @Test
+ public void testValidCheckBoundarySyntax() {
+ MultipartUtils.checkBoundarySyntax("0aA'()+_,-./:=?");
+ MultipartUtils.checkBoundarySyntax("0aA'()+_,- ./:=?");
+ MultipartUtils.checkBoundarySyntax(" 0aA'()+_,-./:=?");
+ MultipartUtils.checkBoundarySyntax("1234567890123456789012345678901234567890123456789012345678901234567890");
+ }
+
+ @Test
+ public void testNonValidLastWhiteSpaceCheckBoundarySyntax() {
+ testNotValidBoundary("0aA'()+_,-./:=? ");
+ }
+
+ @Test
+ public void testNonValidEmptyCheckBoundarySyntax() {
+ testNotValidBoundary("");
+ }
+
+ @Test
+ public void testNonValidIllegalSymbolCheckBoundarySyntax() {
+ testNotValidBoundary("0aA'()+_;,-./:=? ");
+ }
+
+ @Test
+ public void testNonValidTooLongCheckBoundarySyntax() {
+ testNotValidBoundary("12345678901234567890123456789012345678901234567890123456789012345678901");
+ }
+
+ @Test
+ public void testNonValidNullCheckBoundarySyntax() {
+ testNotValidBoundary(null);
+ }
+
+ private static void testNotValidBoundary(final String boundary) {
+ final IllegalArgumentException thrown = assertThrows(IllegalArgumentException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ MultipartUtils.checkBoundarySyntax(boundary);
+ }
+ });
+ assertTrue(thrown.getMessage().startsWith("{'boundary'='" + boundary + "'} has invalid syntax. Should be '"));
+ }
+}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/model/OAuthRequestTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/model/OAuthRequestTest.java
index 0ea88985d..32d5d6731 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/model/OAuthRequestTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/model/OAuthRequestTest.java
@@ -1,8 +1,11 @@
package com.github.scribejava.core.model;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
+import org.junit.function.ThrowingRunnable;
public class OAuthRequestTest {
@@ -24,8 +27,30 @@ public void shouldAddOAuthParamters() {
assertEquals(5, request.getOauthParameters().size());
}
- @Test(expected = IllegalArgumentException.class)
public void shouldThrowExceptionIfParameterIsNotOAuth() {
- request.addOAuthParameter("otherParam", "value");
+ assertThrows(IllegalArgumentException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ request.addOAuthParameter("otherParam", "value");
+ }
+ });
+ }
+
+ @Test
+ public void shouldNotSentHeaderTwice() {
+ assertTrue(request.getHeaders().isEmpty());
+ request.addHeader("HEADER-NAME", "first");
+ request.addHeader("header-name", "middle");
+ request.addHeader("Header-Name", "last");
+
+ assertEquals(1, request.getHeaders().size());
+
+ assertTrue(request.getHeaders().containsKey("HEADER-NAME"));
+ assertTrue(request.getHeaders().containsKey("header-name"));
+ assertTrue(request.getHeaders().containsKey("Header-Name"));
+
+ assertEquals("last", request.getHeaders().get("HEADER-NAME"));
+ assertEquals("last", request.getHeaders().get("header-name"));
+ assertEquals("last", request.getHeaders().get("Header-Name"));
}
}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/model/ParameterListTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/model/ParameterListTest.java
index 78a22c9f9..702c66395 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/model/ParameterListTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/model/ParameterListTest.java
@@ -5,6 +5,8 @@
import org.junit.Test;
import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertThrows;
+import org.junit.function.ThrowingRunnable;
public class ParameterListTest {
@@ -15,9 +17,13 @@ public void setUp() {
this.params = new ParameterList();
}
- @Test(expected = IllegalArgumentException.class)
public void shouldThrowExceptionWhenAppendingNullMapToQuerystring() {
- params.appendTo(null);
+ assertThrows(IllegalArgumentException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ params.appendTo(null);
+ }
+ });
}
@Test
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/model/RequestTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/model/RequestTest.java
index 274ccca23..87189632b 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/model/RequestTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/model/RequestTest.java
@@ -1,27 +1,21 @@
package com.github.scribejava.core.model;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import org.junit.Before;
import org.junit.Test;
-import java.net.MalformedURLException;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertArrayEquals;
public class RequestTest {
- private OAuthRequest getRequest;
- private OAuthRequest postRequest;
-
- @Before
- public void setUp() throws MalformedURLException {
- postRequest = new OAuthRequest(Verb.POST, "http://example.com");
+ @Test
+ public void shouldGetQueryStringParameters() {
+ final OAuthRequest postRequest = new OAuthRequest(Verb.POST, "http://example.com");
postRequest.addBodyParameter("param", "value");
postRequest.addBodyParameter("param with spaces", "value with spaces");
- getRequest = new OAuthRequest(Verb.GET, "http://example.com?qsparam=value&other+param=value+with+spaces");
- }
+ final OAuthRequest getRequest
+ = new OAuthRequest(Verb.GET, "http://example.com?qsparam=value&other+param=value+with+spaces");
- @Test
- public void shouldGetQueryStringParameters() {
assertEquals(2, getRequest.getQueryStringParams().size());
assertEquals(0, postRequest.getQueryStringParams().size());
assertTrue(getRequest.getQueryStringParams().contains(new Parameter("qsparam", "value")));
@@ -29,13 +23,21 @@ public void shouldGetQueryStringParameters() {
@Test
public void shouldSetBodyParamsAndAddContentLength() {
+ final OAuthRequest postRequest = new OAuthRequest(Verb.POST, "http://example.com");
+ postRequest.addBodyParameter("param", "value");
+ postRequest.addBodyParameter("param with spaces", "value with spaces");
+
assertEquals("param=value¶m%20with%20spaces=value%20with%20spaces",
new String(postRequest.getByteArrayPayload()));
}
@Test
public void shouldSetPayloadAndHeaders() {
+ final OAuthRequest postRequest = new OAuthRequest(Verb.POST, "http://example.com");
+ postRequest.addBodyParameter("param", "value");
+ postRequest.addBodyParameter("param with spaces", "value with spaces");
postRequest.setPayload("PAYLOAD");
+
assertEquals("PAYLOAD", postRequest.getStringPayload());
}
@@ -57,6 +59,41 @@ public void shouldReturnTheCompleteUrl() {
@Test
public void shouldHandleQueryStringSpaceEncodingProperly() {
+ final OAuthRequest getRequest
+ = new OAuthRequest(Verb.GET, "http://example.com?qsparam=value&other+param=value+with+spaces");
+
assertTrue(getRequest.getQueryStringParams().contains(new Parameter("other param", "value with spaces")));
}
+
+ @Test
+ public void shouldNotEncodeInStringPayload() throws Exception {
+ final String requestBody = "~/!@#$%^&*( )_+//\r\n%2F&";
+
+ final OAuthRequest postRequest = new OAuthRequest(Verb.POST, "http://example.com");
+ postRequest.setPayload(requestBody);
+
+ assertEquals(requestBody, postRequest.getStringPayload());
+ }
+
+ @Test
+ public void shouldNotEncodeInByteBodyPayload() throws Exception {
+ final byte[] requestBody = "~/!@#$%^&*( )_+//\r\n%2F&".getBytes();
+
+ final OAuthRequest postRequest = new OAuthRequest(Verb.POST, "http://example.com");
+ postRequest.setPayload(requestBody);
+
+ assertArrayEquals(requestBody, postRequest.getByteArrayPayload());
+ }
+
+ @Test
+ public void shouldEncodeInBodyParamsPayload() throws Exception {
+ final String expectedRequestBodyParamName = "~/!@#$%^&*( )_+//\r\n%2F&name";
+ final String expectedRequestBodyParamValue = "~/!@#$%^&*( )_+//\r\n%2F&value";
+ final String expectedRequestBody = "~%2F%21%40%23%24%25%5E%26%2A%28%20%29_%2B%2F%2F%0D%0A%252F%26amp%3Bname="
+ + "~%2F%21%40%23%24%25%5E%26%2A%28%20%29_%2B%2F%2F%0D%0A%252F%26amp%3Bvalue";
+
+ final OAuthRequest postRequest = new OAuthRequest(Verb.POST, "http://example.com");
+ postRequest.addBodyParameter(expectedRequestBodyParamName, expectedRequestBodyParamValue);
+ assertArrayEquals(expectedRequestBody.getBytes(), postRequest.getByteArrayPayload());
+ }
}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ApiUnit.java b/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ApiUnit.java
index a3187957e..cd9e58550 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ApiUnit.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ApiUnit.java
@@ -1,10 +1,12 @@
package com.github.scribejava.core.oauth;
+import java.io.OutputStream;
+
import com.github.scribejava.core.builder.api.DefaultApi20;
-import com.github.scribejava.core.builder.api.OAuth2SignatureType;
import com.github.scribejava.core.httpclient.HttpClient;
import com.github.scribejava.core.httpclient.HttpClientConfig;
-import java.io.OutputStream;
+import com.github.scribejava.core.oauth2.bearersignature.BearerSignature;
+import com.github.scribejava.core.oauth2.bearersignature.BearerSignatureURIQueryParameter;
class OAuth20ApiUnit extends DefaultApi20 {
@@ -19,15 +21,15 @@ protected String getAuthorizationBaseUrl() {
}
@Override
- public OAuth20ServiceUnit createService(String apiKey, String apiSecret, String callback, String scope,
- OutputStream debugStream, String state, String responseType, String userAgent,
- HttpClientConfig httpClientConfig, HttpClient httpClient) {
- return new OAuth20ServiceUnit(this, apiKey, apiSecret, callback, scope, state, responseType, userAgent,
- httpClientConfig, httpClient);
+ public OAuth20ServiceUnit createService(String apiKey, String apiSecret, String callback, String defaultScope,
+ String responseType, OutputStream debugStream, String userAgent, HttpClientConfig httpClientConfig,
+ HttpClient httpClient) {
+ return new OAuth20ServiceUnit(this, apiKey, apiSecret, callback, defaultScope, responseType, debugStream,
+ userAgent, httpClientConfig, httpClient);
}
@Override
- public OAuth2SignatureType getSignatureType() {
- return OAuth2SignatureType.BEARER_URI_QUERY_PARAMETER;
+ public BearerSignature getBearerSignature() {
+ return BearerSignatureURIQueryParameter.instance();
}
}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceTest.java
index c74e0ea57..3e0024c6c 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceTest.java
@@ -1,24 +1,23 @@
package com.github.scribejava.core.oauth;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.scribejava.core.base64.Base64;
import com.github.scribejava.core.builder.ServiceBuilder;
-import com.github.scribejava.core.java8.Base64;
import com.github.scribejava.core.model.OAuth2AccessToken;
import com.github.scribejava.core.model.OAuth2Authorization;
import com.github.scribejava.core.model.OAuthConstants;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
import java.io.IOException;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
import java.nio.charset.Charset;
-import java.util.Map;
import java.util.concurrent.ExecutionException;
public class OAuth20ServiceTest {
- private final Base64.Encoder base64Encoder = Base64.getEncoder();
+ private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
@Test
public void shouldProduceCorrectRequestSync() throws IOException, InterruptedException, ExecutionException {
@@ -27,51 +26,46 @@ public void shouldProduceCorrectRequestSync() throws IOException, InterruptedExc
.build(new OAuth20ApiUnit());
final OAuth2AccessToken token = service.getAccessTokenPasswordGrant("user1", "password1");
- final Gson json = new Gson();
-
assertNotNull(token);
- final Map map = json.fromJson(token.getRawResponse(), new TypeTokenImpl().getType());
+ final JsonNode response = OBJECT_MAPPER.readTree(token.getRawResponse());
- assertEquals(OAuth20ServiceUnit.TOKEN, map.get(OAuthConstants.ACCESS_TOKEN));
- assertEquals(OAuth20ServiceUnit.STATE, map.get(OAuthConstants.STATE));
- assertEquals(OAuth20ServiceUnit.EXPIRES, map.get("expires_in"));
+ assertEquals(OAuth20ServiceUnit.TOKEN, response.get(OAuthConstants.ACCESS_TOKEN).asText());
+ assertEquals(OAuth20ServiceUnit.EXPIRES, response.get("expires_in").asInt());
- final String authorize = base64Encoder.encodeToString(
+ final String authorize = Base64.encode(
String.format("%s:%s", service.getApiKey(), service.getApiSecret()).getBytes(Charset.forName("UTF-8")));
- assertEquals(OAuthConstants.BASIC + " " + authorize, map.get(OAuthConstants.HEADER));
+ assertEquals(OAuthConstants.BASIC + ' ' + authorize, response.get(OAuthConstants.HEADER).asText());
- assertEquals("user1", map.get("query-username"));
- assertEquals("password1", map.get("query-password"));
- assertEquals("password", map.get("query-grant_type"));
+ assertEquals("user1", response.get("query-username").asText());
+ assertEquals("password1", response.get("query-password").asText());
+ assertEquals("password", response.get("query-grant_type").asText());
}
@Test
- public void shouldProduceCorrectRequestAsync() throws ExecutionException, InterruptedException {
+ public void shouldProduceCorrectRequestAsync() throws ExecutionException, InterruptedException, IOException {
final OAuth20Service service = new ServiceBuilder("your_api_key")
.apiSecret("your_api_secret")
.build(new OAuth20ApiUnit());
- final OAuth2AccessToken token = service.getAccessTokenPasswordGrantAsync("user1", "password1", null).get();
- final Gson json = new Gson();
+ final OAuth2AccessToken token = service.getAccessTokenPasswordGrantAsync("user1", "password1").get();
assertNotNull(token);
- final Map map = json.fromJson(token.getRawResponse(), new TypeTokenImpl().getType());
+ final JsonNode response = OBJECT_MAPPER.readTree(token.getRawResponse());
- assertEquals(OAuth20ServiceUnit.TOKEN, map.get(OAuthConstants.ACCESS_TOKEN));
- assertEquals(OAuth20ServiceUnit.STATE, map.get(OAuthConstants.STATE));
- assertEquals(OAuth20ServiceUnit.EXPIRES, map.get("expires_in"));
+ assertEquals(OAuth20ServiceUnit.TOKEN, response.get(OAuthConstants.ACCESS_TOKEN).asText());
+ assertEquals(OAuth20ServiceUnit.EXPIRES, response.get("expires_in").asInt());
- final String authorize = base64Encoder.encodeToString(
+ final String authorize = Base64.encode(
String.format("%s:%s", service.getApiKey(), service.getApiSecret()).getBytes(Charset.forName("UTF-8")));
- assertEquals(OAuthConstants.BASIC + " " + authorize, map.get(OAuthConstants.HEADER));
+ assertEquals(OAuthConstants.BASIC + ' ' + authorize, response.get(OAuthConstants.HEADER).asText());
- assertEquals("user1", map.get("query-username"));
- assertEquals("password1", map.get("query-password"));
- assertEquals("password", map.get("query-grant_type"));
+ assertEquals("user1", response.get("query-username").asText());
+ assertEquals("password1", response.get("query-password").asText());
+ assertEquals("password", response.get("query-grant_type").asText());
}
@Test
@@ -119,13 +113,5 @@ public void testOAuthExtractAuthorization() {
authorization = service.extractAuthorization("https://cl.ex.com/cb");
assertEquals(null, authorization.getCode());
assertEquals(null, authorization.getState());
-
- }
-
- private static class TypeTokenImpl extends TypeToken> {
-
- private TypeTokenImpl() {
- }
}
-
}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceUnit.java b/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceUnit.java
index a5cbf9763..2766b7f2b 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceUnit.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceUnit.java
@@ -1,5 +1,7 @@
package com.github.scribejava.core.oauth;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.scribejava.core.builder.api.DefaultApi20;
import com.github.scribejava.core.httpclient.HttpClient;
import com.github.scribejava.core.httpclient.HttpClientConfig;
@@ -8,8 +10,8 @@
import com.github.scribejava.core.model.OAuthConstants;
import com.github.scribejava.core.model.OAuthRequest;
import com.github.scribejava.core.model.Parameter;
-import com.google.gson.Gson;
+import java.io.OutputStream;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.Future;
@@ -18,11 +20,14 @@ class OAuth20ServiceUnit extends OAuth20Service {
static final String TOKEN = "ae82980abab675c646a070686d5558ad";
static final String STATE = "123";
- static final String EXPIRES = "3600";
+ static final int EXPIRES = 3600;
+ private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
- OAuth20ServiceUnit(DefaultApi20 api, String apiKey, String apiSecret, String callback, String scope, String state,
- String responseType, String userAgent, HttpClientConfig httpClientConfig, HttpClient httpClient) {
- super(api, apiKey, apiSecret, callback, scope, state, responseType, userAgent, httpClientConfig, httpClient);
+ OAuth20ServiceUnit(DefaultApi20 api, String apiKey, String apiSecret, String callback, String defaultScope,
+ String responseType, OutputStream debugStream, String userAgent, HttpClientConfig httpClientConfig,
+ HttpClient httpClient) {
+ super(api, apiKey, apiSecret, callback, defaultScope, responseType, debugStream, userAgent, httpClientConfig,
+ httpClient);
}
@Override
@@ -31,8 +36,7 @@ protected OAuth2AccessToken sendAccessTokenRequestSync(OAuthRequest request) {
}
private String prepareRawResponse(OAuthRequest request) {
- final Gson json = new Gson();
- final Map response = new HashMap<>();
+ final Map response = new HashMap<>();
response.put(OAuthConstants.ACCESS_TOKEN, TOKEN);
response.put(OAuthConstants.STATE, STATE);
response.put("expires_in", EXPIRES);
@@ -44,7 +48,11 @@ private String prepareRawResponse(OAuthRequest request) {
response.put("query-" + param.getKey(), param.getValue());
}
- return json.toJson(response);
+ try {
+ return OBJECT_MAPPER.writeValueAsString(response);
+ } catch (JsonProcessingException ex) {
+ throw new IllegalStateException("smth wrong with Jackson?");
+ }
}
@Override
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/pkce/PKCECodeChallengeMethodTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/pkce/PKCECodeChallengeMethodTest.java
index 1f580480a..a83a5470d 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/pkce/PKCECodeChallengeMethodTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/pkce/PKCECodeChallengeMethodTest.java
@@ -16,7 +16,7 @@ public class PKCECodeChallengeMethodTest {
@Test
public void testGeneratingPKCE() {
- final PKCE pkce = new PKCEService().generatePKCE(RANDOM_BYTES);
+ final PKCE pkce = PKCEService.defaultInstance().generatePKCE(RANDOM_BYTES);
assertEquals(PKCECodeChallengeMethod.S256, pkce.getCodeChallengeMethod());
assertEquals("dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk", pkce.getCodeVerifier());
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/services/HMACSha1SignatureServiceTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/services/HMACSha1SignatureServiceTest.java
index d3fba9ae2..d824d2112 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/services/HMACSha1SignatureServiceTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/services/HMACSha1SignatureServiceTest.java
@@ -4,6 +4,8 @@
import org.junit.Before;
import org.junit.Test;
import com.github.scribejava.core.exceptions.OAuthException;
+import static org.junit.Assert.assertThrows;
+import org.junit.function.ThrowingRunnable;
public class HMACSha1SignatureServiceTest {
@@ -29,23 +31,34 @@ public void shouldReturnSignature() {
assertEquals(signature, service.getSignature(baseString, apiSecret, tokenSecret));
}
- @Test(expected = OAuthException.class)
public void shouldThrowExceptionIfBaseStringIsNull() {
- service.getSignature(null, "apiSecret", "tokenSecret");
+ assertThrows(OAuthException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ service.getSignature(null, "apiSecret", "tokenSecret");
+ }
+ });
}
- @Test(expected = OAuthException.class)
public void shouldThrowExceptionIfBaseStringIsEmpty() {
- service.getSignature(" ", "apiSecret", "tokenSecret");
+ assertThrows(OAuthException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ service.getSignature(" ", "apiSecret", "tokenSecret");
+ }
+ });
}
- @Test(expected = OAuthException.class)
public void shouldThrowExceptionIfApiSecretIsNull() {
- service.getSignature("base string", null, "tokenSecret");
+ assertThrows(OAuthException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ service.getSignature("base string", null, "tokenSecret");
+ }
+ });
}
- @Test(expected = OAuthException.class)
- public void shouldThrowExceptionIfApiSecretIsEmpty() {
+ public void shouldNotThrowExceptionIfApiSecretIsEmpty() {
service.getSignature("base string", " ", "tokenSecret");
}
}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/services/RSASha1SignatureServiceTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/services/RSASha1SignatureServiceTest.java
index 261bc2bb4..652f328e3 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/services/RSASha1SignatureServiceTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/services/RSASha1SignatureServiceTest.java
@@ -5,7 +5,7 @@
import java.security.PrivateKey;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.PKCS8EncodedKeySpec;
-import javax.xml.bind.DatatypeConverter;
+import org.apache.commons.codec.binary.Base64;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
@@ -48,11 +48,12 @@ private static PrivateKey getPrivateKey() {
+ "I/AfAkEA0Y9vr0tombsUB8cZv0v5OYoBZvCTbMANtzfb4AOHpiKqqbohDOevLQ7/\n"
+ "SpvgVCmVaDz2PptcRAyEBZ5MCssneQJAB2pmvaDH7Ambfod5bztLfOhLCtY5EkXJ\n"
+ "n6rZcDbRaHorRhdG7m3VtDKOUKZ2DF7glkQGV33phKukErVPUzlHBwJAScD9TqaG\n"
- + "wJ3juUsVtujV23SnH43iMggXT7m82STpPGam1hPfmqu2Z0niePFo927ogQ7H1EMJ\n" + "UHgqXmuvk2X/Ww==";
+ + "wJ3juUsVtujV23SnH43iMggXT7m82STpPGam1hPfmqu2Z0niePFo927ogQ7H1EMJ\n"
+ + "UHgqXmuvk2X/Ww==";
try {
final KeyFactory fac = KeyFactory.getInstance("RSA");
- final PKCS8EncodedKeySpec privKeySpec = new PKCS8EncodedKeySpec(DatatypeConverter.parseBase64Binary(str));
+ final PKCS8EncodedKeySpec privKeySpec = new PKCS8EncodedKeySpec(Base64.decodeBase64(str));
return fac.generatePrivate(privKeySpec);
} catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
throw new RuntimeException(e);
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/utils/OAuthEncoderTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/utils/OAuthEncoderTest.java
index 1a1489b41..9a27d238d 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/utils/OAuthEncoderTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/utils/OAuthEncoderTest.java
@@ -1,7 +1,9 @@
package com.github.scribejava.core.utils;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
import org.junit.Test;
+import org.junit.function.ThrowingRunnable;
public class OAuthEncoderTest {
@@ -34,14 +36,22 @@ public void shouldNotPercentEncodeReservedCharacters() {
assertEquals(encoded, OAuthEncoder.encode(plain));
}
- @Test(expected = IllegalArgumentException.class)
public void shouldThrowExceptionIfStringToEncodeIsNull() {
- OAuthEncoder.encode(null);
+ assertThrows(IllegalArgumentException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ OAuthEncoder.encode(null);
+ }
+ });
}
- @Test(expected = IllegalArgumentException.class)
public void shouldThrowExceptionIfStringToDecodeIsNull() {
- OAuthEncoder.decode(null);
+ assertThrows(IllegalArgumentException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ OAuthEncoder.decode(null);
+ }
+ });
}
@Test
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/utils/PreconditionsTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/utils/PreconditionsTest.java
index ec6722c5a..1e3bd71e2 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/utils/PreconditionsTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/utils/PreconditionsTest.java
@@ -1,28 +1,45 @@
package com.github.scribejava.core.utils;
-import org.junit.Test;
+import static org.junit.Assert.assertThrows;
+import org.junit.function.ThrowingRunnable;
public class PreconditionsTest {
private static final String ERROR_MSG = "";
- @Test(expected = IllegalArgumentException.class)
public void shouldThrowExceptionForNullObjects() {
- Preconditions.checkNotNull(null, ERROR_MSG);
+ assertThrows(IllegalArgumentException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ Preconditions.checkNotNull(null, ERROR_MSG);
+ }
+ });
}
- @Test(expected = IllegalArgumentException.class)
public void shouldThrowExceptionForNullStrings() {
- Preconditions.checkEmptyString(null, ERROR_MSG);
+ assertThrows(IllegalArgumentException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ Preconditions.checkEmptyString(null, ERROR_MSG);
+ }
+ });
}
- @Test(expected = IllegalArgumentException.class)
public void shouldThrowExceptionForEmptyStrings() {
- Preconditions.checkEmptyString("", ERROR_MSG);
+ assertThrows(IllegalArgumentException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ Preconditions.checkEmptyString("", ERROR_MSG);
+ }
+ });
}
- @Test(expected = IllegalArgumentException.class)
public void shouldThrowExceptionForSpacesOnlyStrings() {
- Preconditions.checkEmptyString(" ", ERROR_MSG);
+ assertThrows(IllegalArgumentException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ Preconditions.checkEmptyString(" ", ERROR_MSG);
+ }
+ });
}
}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/utils/StreamUtilsTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/utils/StreamUtilsTest.java
index cb5c6c7c9..61937bac6 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/utils/StreamUtilsTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/utils/StreamUtilsTest.java
@@ -4,8 +4,9 @@
import java.io.IOException;
import java.io.InputStream;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.assertThrows;
import org.junit.Test;
+import org.junit.function.ThrowingRunnable;
public class StreamUtilsTest {
@@ -27,16 +28,22 @@ public void shouldCorrectlyDecodeAStream() throws IOException {
assertEquals("expected", decoded);
}
- @Test(expected = IllegalArgumentException.class)
public void shouldFailForNullParameter() throws IOException {
- StreamUtils.getStreamContents(null);
- fail("Must throw exception before getting here");
+ assertThrows(IllegalArgumentException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ StreamUtils.getStreamContents(null);
+ }
+ });
}
- @Test(expected = IOException.class)
public void shouldFailWithBrokenStream() throws IOException {
- // This object simulates problems with input stream.
- StreamUtils.getStreamContents(ALLWAYS_ERROR_INPUT_STREAM);
- fail("Must throw exception before getting here");
+ assertThrows(IOException.class, new ThrowingRunnable() {
+ @Override
+ public void run() throws Throwable {
+ // This object simulates problems with input stream.
+ StreamUtils.getStreamContents(ALLWAYS_ERROR_INPUT_STREAM);
+ }
+ });
}
}
diff --git a/scribejava-httpclient-ahc/pom.xml b/scribejava-httpclient-ahc/pom.xml
index eacdd6208..fabd225c3 100644
--- a/scribejava-httpclient-ahc/pom.xml
+++ b/scribejava-httpclient-ahc/pom.xml
@@ -5,10 +5,10 @@
com.github.scribejava
scribejava
- 5.5.1-SNAPSHOT
+ 8.3.4-SNAPSHOT
../pom.xml
-
+
com.github.scribejava
scribejava-httpclient-ahc
ScribeJava Async Http Http Client support
@@ -20,10 +20,16 @@
scribejava-core
${project.version}
+
+ org.slf4j
+ slf4j-simple
+ 2.0.3
+ test
+
org.asynchttpclient
async-http-client
- 2.5.2
+ 2.12.3
com.github.scribejava
diff --git a/scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/AhcHttpClient.java b/scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/AhcHttpClient.java
index ebe551571..5c9b87249 100644
--- a/scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/AhcHttpClient.java
+++ b/scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/AhcHttpClient.java
@@ -1,8 +1,7 @@
package com.github.scribejava.httpclient.ahc;
import com.github.scribejava.core.httpclient.AbstractAsyncOnlyHttpClient;
-import com.github.scribejava.core.httpclient.MultipartPayload;
-import com.github.scribejava.core.java8.Consumer;
+import com.github.scribejava.core.httpclient.multipart.MultipartPayload;
import com.github.scribejava.core.model.OAuthAsyncRequestCallback;
import com.github.scribejava.core.model.OAuthConstants;
import com.github.scribejava.core.model.OAuthRequest;
@@ -42,9 +41,8 @@ public void close() throws IOException {
@Override
public Future executeAsync(String userAgent, Map headers, Verb httpVerb, String completeUrl,
- final byte[] bodyContents, OAuthAsyncRequestCallback callback,
- OAuthRequest.ResponseConverter converter) {
- return doExecuteAsync(userAgent, headers, httpVerb, completeUrl, new ByteArrayConsumer(bodyContents), callback,
+ byte[] bodyContents, OAuthAsyncRequestCallback callback, OAuthRequest.ResponseConverter converter) {
+ return doExecuteAsync(userAgent, headers, httpVerb, completeUrl, BodySetter.BYTE_ARRAY, bodyContents, callback,
converter);
}
@@ -58,22 +56,20 @@ public Future executeAsync(String userAgent, Map headers,
@Override
public Future executeAsync(String userAgent, Map headers, Verb httpVerb, String completeUrl,
- final String bodyContents, OAuthAsyncRequestCallback callback,
- OAuthRequest.ResponseConverter converter) {
- return doExecuteAsync(userAgent, headers, httpVerb, completeUrl, new StringConsumer(bodyContents), callback,
+ String bodyContents, OAuthAsyncRequestCallback callback, OAuthRequest.ResponseConverter converter) {
+ return doExecuteAsync(userAgent, headers, httpVerb, completeUrl, BodySetter.STRING, bodyContents, callback,
converter);
}
@Override
public Future executeAsync(String userAgent, Map headers, Verb httpVerb, String completeUrl,
- final File bodyContents, OAuthAsyncRequestCallback callback,
- OAuthRequest.ResponseConverter converter) {
- return doExecuteAsync(userAgent, headers, httpVerb, completeUrl, new FileConsumer(bodyContents), callback,
+ File bodyContents, OAuthAsyncRequestCallback callback, OAuthRequest.ResponseConverter converter) {
+ return doExecuteAsync(userAgent, headers, httpVerb, completeUrl, BodySetter.FILE, bodyContents, callback,
converter);
}
private Future doExecuteAsync(String userAgent, Map headers, Verb httpVerb,
- String completeUrl, Consumer bodySetter, OAuthAsyncRequestCallback callback,
+ String completeUrl, BodySetter bodySetter, Object bodyContents, OAuthAsyncRequestCallback callback,
OAuthRequest.ResponseConverter converter) {
final BoundRequestBuilder boundRequestBuilder;
switch (httpVerb) {
@@ -97,7 +93,7 @@ private Future doExecuteAsync(String userAgent, Map heade
if (!headers.containsKey(CONTENT_TYPE)) {
boundRequestBuilder.addHeader(CONTENT_TYPE, DEFAULT_CONTENT_TYPE);
}
- bodySetter.accept(boundRequestBuilder);
+ bodySetter.setBody(boundRequestBuilder, bodyContents);
}
for (Map.Entry header : headers.entrySet()) {
@@ -111,45 +107,26 @@ private Future doExecuteAsync(String userAgent, Map heade
return boundRequestBuilder.execute(new OAuthAsyncCompletionHandler<>(callback, converter));
}
- private static class ByteArrayConsumer implements Consumer {
-
- private final byte[] bodyContents;
-
- private ByteArrayConsumer(byte[] bodyContents) {
- this.bodyContents = bodyContents;
- }
-
- @Override
- public void accept(BoundRequestBuilder requestBuilder) {
- requestBuilder.setBody(bodyContents);
- }
- }
-
- private static class StringConsumer implements Consumer {
-
- private final String bodyContents;
-
- private StringConsumer(String bodyContents) {
- this.bodyContents = bodyContents;
- }
-
- @Override
- public void accept(BoundRequestBuilder requestBuilder) {
- requestBuilder.setBody(bodyContents);
- }
- }
-
- private static class FileConsumer implements Consumer {
-
- private final File bodyContents;
-
- private FileConsumer(File bodyContents) {
- this.bodyContents = bodyContents;
- }
+ private enum BodySetter {
+ BYTE_ARRAY {
+ @Override
+ BoundRequestBuilder setBody(BoundRequestBuilder requestBuilder, Object bodyContents) {
+ return requestBuilder.setBody((byte[]) bodyContents);
+ }
+ },
+ STRING {
+ @Override
+ BoundRequestBuilder setBody(BoundRequestBuilder requestBuilder, Object bodyContents) {
+ return requestBuilder.setBody((String) bodyContents);
+ }
+ },
+ FILE {
+ @Override
+ BoundRequestBuilder setBody(BoundRequestBuilder requestBuilder, Object bodyContents) {
+ return requestBuilder.setBody((File) bodyContents);
+ }
+ };
- @Override
- public void accept(BoundRequestBuilder requestBuilder) {
- requestBuilder.setBody(bodyContents);
- }
+ abstract BoundRequestBuilder setBody(BoundRequestBuilder requestBuilder, Object bodyContents);
}
}
diff --git a/scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/OAuthAsyncCompletionHandler.java b/scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/OAuthAsyncCompletionHandler.java
index 08706c195..0cb77af25 100644
--- a/scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/OAuthAsyncCompletionHandler.java
+++ b/scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/OAuthAsyncCompletionHandler.java
@@ -48,4 +48,4 @@ public void onThrowable(Throwable t) {
callback.onThrowable(t);
}
}
-};
+}
diff --git a/scribejava-httpclient-ahc/src/test/java/com/github/scribejava/httpclient/ahc/AhcHttpClientTest.java b/scribejava-httpclient-ahc/src/test/java/com/github/scribejava/httpclient/ahc/AhcHttpClientTest.java
index 1ee1ebaa1..5de2d153e 100644
--- a/scribejava-httpclient-ahc/src/test/java/com/github/scribejava/httpclient/ahc/AhcHttpClientTest.java
+++ b/scribejava-httpclient-ahc/src/test/java/com/github/scribejava/httpclient/ahc/AhcHttpClientTest.java
@@ -2,9 +2,7 @@
import com.github.scribejava.core.AbstractClientTest;
import com.github.scribejava.core.httpclient.HttpClient;
-import org.junit.Ignore;
-@Ignore(value = "we are java7 and AHC is java8")
public class AhcHttpClientTest extends AbstractClientTest {
@Override
diff --git a/scribejava-httpclient-apache/pom.xml b/scribejava-httpclient-apache/pom.xml
index 0043155d0..1dc9dd53c 100644
--- a/scribejava-httpclient-apache/pom.xml
+++ b/scribejava-httpclient-apache/pom.xml
@@ -5,10 +5,10 @@