Skip to content

Commit

Permalink
fix(build): not exported Md5 class
Browse files Browse the repository at this point in the history
  • Loading branch information
@snics
snics committed Dec 21, 2017
1 parent 09678ff commit be6f241
Show file tree
Hide file tree
Showing 6 changed files with 279 additions and 15 deletions.
1 change: 0 additions & 1 deletion README.MD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ View all the directives in action at https://snics.github.io/ng2-avatar

## Dependencies
* [Angular](https://angular.io) (*requires* Angular 2 or higher, tested with 2.0.0)
* [ts-md5](https://github.com/cotag/ts-md5) - The Md5 hashing framework

## Installation
Install above dependencies via *npm*.
Expand Down
1 change: 0 additions & 1 deletion demo/src/app/getting-started/getting-started.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ <h1>Getting Started</h1>
<h2>Dependencies</h2>
<ul>
<li><a href="https://angular.io" target="_blank">Angular</a> (<em>requires</em> Angular 2 or higher, tested with 2.0.0)</li>
<li><a href="https://github.com/cotag/ts-md5" target="_blank">ts-md5</a> - The Md5 hashing framework</li>
</ul>

<h2>Installation</h2>
Expand Down
7 changes: 1 addition & 6 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@
},
"dependencies": {
"@angular/common": "2.0.0",
"@angular/core": "2.0.0",
"ts-md5": "^1.2.2"
"@angular/core": "2.0.0"
},
"devDependencies": {
"@angular/compiler": "2.0.0",
Expand Down
275 changes: 275 additions & 0 deletions src/module/Md5.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,275 @@
/* tslint:disable */

export abstract class Md5 {

private static string: string;
private static x: Array<number> = <Array<number>>Array();
private static k: number;
private static AA: number;
private static BB: number;
private static CC: number;
private static DD: number;
private static a: number;
private static b: number;
private static c: number;
private static d: number;
private static S11: number = 7;
private static S12: number = 12;
private static S13: number = 17;
private static S14: number = 22;
private static S21: number = 5;
private static S22: number = 9;
private static S23: number = 14;
private static S24: number = 20;
private static S31: number = 4;
private static S32: number = 11;
private static S33: number = 16;
private static S34: number = 23;
private static S41: number = 6;
private static S42: number = 10;
private static S43: number = 15;
private static S44: number = 21;

private static RotateLeft: Function = ( lValue: number, iShiftBits: number ) : number => (lValue << iShiftBits) | (lValue >>> (32 - iShiftBits));

private static AddUnsigned( lX: number, lY: number ) : number
{
let lX4: number,
lY4: number,
lX8: number,
lY8: number,
lResult: number;

lX8 = (lX & 0x80000000);
lY8 = (lY & 0x80000000);
lX4 = (lX & 0x40000000);
lY4 = (lY & 0x40000000);
lResult = (lX & 0x3FFFFFFF) + (lY & 0x3FFFFFFF);

if ( !!(lX4 & lY4) )
{
return (lResult ^ 0x80000000 ^ lX8 ^ lY8);
}

if ( !!(lX4 | lY4) )
{
if ( !!(lResult & 0x40000000) )
{
return (lResult ^ 0xC0000000 ^ lX8 ^ lY8);
}
else
{
return (lResult ^ 0x40000000 ^ lX8 ^ lY8);
}
}
else
{
return (lResult ^ lX8 ^ lY8);
}
}

private static F: Function = ( x: number, y: number, z: number ) : number => (x & y) | ((~x) & z);

private static G: Function = ( x: number, y: number, z: number ) : number => (x & z) | (y & (~z));

private static H: Function = ( x: number, y: number, z: number ) : number => (x ^ y ^ z);

private static I: Function = ( x: number, y: number, z: number ) : number => (y ^ (x | (~z)));

private static FF( a: number, b: number, c: number, d: number, x: number, s: number, ac: number ) : number
{
a = Md5.AddUnsigned(a, Md5.AddUnsigned(Md5.AddUnsigned(Md5.F(b, c, d), x), ac));
return Md5.AddUnsigned(Md5.RotateLeft(a, s), b);
}

private static GG( a: number, b: number, c: number, d: number, x: number, s: number, ac: number) : number
{
a = Md5.AddUnsigned(a, Md5.AddUnsigned(Md5.AddUnsigned(Md5.G(b, c, d), x), ac));
return Md5.AddUnsigned(Md5.RotateLeft(a, s), b);
}

private static HH( a: number, b: number, c: number, d: number, x: number, s: number, ac: number ) : number
{
a = Md5.AddUnsigned(a, Md5.AddUnsigned(Md5.AddUnsigned(Md5.H(b, c, d), x), ac));
return Md5.AddUnsigned(Md5.RotateLeft(a, s), b);
}

private static II(a: number, b: number, c: number, d: number, x: number, s: number, ac: number) : number
{
a = Md5.AddUnsigned(a, Md5.AddUnsigned(Md5.AddUnsigned(Md5.I(b, c, d), x), ac));
return Md5.AddUnsigned(Md5.RotateLeft(a, s), b);
}

private static ConvertToWordArray( string: string ) : Array<number>
{
let lWordCount: number,
lMessageLength: number = string.length,
lNumberOfWords_temp1: number = lMessageLength + 8,
lNumberOfWords_temp2: number = (lNumberOfWords_temp1 - (lNumberOfWords_temp1 % 64)) / 64,
lNumberOfWords: number = (lNumberOfWords_temp2 + 1) * 16,
lWordArray: Array<number> = Array(lNumberOfWords - 1),
lBytePosition: number = 0,
lByteCount: number = 0;

while ( lByteCount < lMessageLength )
{
lWordCount = (lByteCount - (lByteCount % 4)) / 4;
lBytePosition = (lByteCount % 4) * 8;
lWordArray[lWordCount] = (lWordArray[lWordCount] | (string.charCodeAt(lByteCount) << lBytePosition));
lByteCount++;
}

lWordCount = (lByteCount - (lByteCount % 4)) / 4;
lBytePosition = (lByteCount % 4) * 8;
lWordArray[lWordCount] = lWordArray[lWordCount] | (0x80 << lBytePosition);
lWordArray[lNumberOfWords - 2] = lMessageLength << 3;
lWordArray[lNumberOfWords - 1] = lMessageLength >>> 29;

return lWordArray;
}

private static WordToHex( lValue: number ) : string
{
let WordToHexValue: string = "",
WordToHexValue_temp: string = "",
lByte: number,
lCount: number;

for ( lCount = 0; lCount <= 3; lCount++ )
{
lByte = (lValue >>> (lCount * 8)) & 255;
WordToHexValue_temp = "0" + lByte.toString(16);
WordToHexValue = WordToHexValue + WordToHexValue_temp.substr(WordToHexValue_temp.length - 2, 2);
}

return WordToHexValue;
}

private static Utf8Encode( string: string ) : string
{
let utftext: string = "",
c: number;

string = string.replace(/\r\n/g, "\n");

for ( let n = 0; n < string.length; n++ )
{
c = string.charCodeAt(n);

if ( c < 128 )
{
utftext += String.fromCharCode(c);
}
else if ( (c > 127) && (c < 2048) )
{
utftext += String.fromCharCode((c >> 6) | 192);
utftext += String.fromCharCode((c & 63) | 128);
}
else
{
utftext += String.fromCharCode((c >> 12) | 224);
utftext += String.fromCharCode(((c >> 6) & 63) | 128);
utftext += String.fromCharCode((c & 63) | 128);
}

}

return utftext;
}

public static init( string: any ) : string
{
let temp: string;

if ( typeof string !== 'string' )
string = JSON.stringify(string);

Md5.string = Md5.Utf8Encode(string);
Md5.x = Md5.ConvertToWordArray(Md5.string);

Md5.a = 0x67452301;
Md5.b = 0xEFCDAB89;
Md5.c = 0x98BADCFE;
Md5.d = 0x10325476;

for ( Md5.k = 0; Md5.k < Md5.x.length; Md5.k += 16 )
{
Md5.AA = Md5.a;
Md5.BB = Md5.b;
Md5.CC = Md5.c;
Md5.DD = Md5.d;
Md5.a = Md5.FF(Md5.a, Md5.b, Md5.c, Md5.d, Md5.x[Md5.k], Md5.S11, 0xD76AA478);
Md5.d = Md5.FF(Md5.d, Md5.a, Md5.b, Md5.c, Md5.x[Md5.k + 1], Md5.S12, 0xE8C7B756);
Md5.c = Md5.FF(Md5.c, Md5.d, Md5.a, Md5.b, Md5.x[Md5.k + 2], Md5.S13, 0x242070DB);
Md5.b = Md5.FF(Md5.b, Md5.c, Md5.d, Md5.a, Md5.x[Md5.k + 3], Md5.S14, 0xC1BDCEEE);
Md5.a = Md5.FF(Md5.a, Md5.b, Md5.c, Md5.d, Md5.x[Md5.k + 4], Md5.S11, 0xF57C0FAF);
Md5.d = Md5.FF(Md5.d, Md5.a, Md5.b, Md5.c, Md5.x[Md5.k + 5], Md5.S12, 0x4787C62A);
Md5.c = Md5.FF(Md5.c, Md5.d, Md5.a, Md5.b, Md5.x[Md5.k + 6], Md5.S13, 0xA8304613);
Md5.b = Md5.FF(Md5.b, Md5.c, Md5.d, Md5.a, Md5.x[Md5.k + 7], Md5.S14, 0xFD469501);
Md5.a = Md5.FF(Md5.a, Md5.b, Md5.c, Md5.d, Md5.x[Md5.k + 8], Md5.S11, 0x698098D8);
Md5.d = Md5.FF(Md5.d, Md5.a, Md5.b, Md5.c, Md5.x[Md5.k + 9], Md5.S12, 0x8B44F7AF);
Md5.c = Md5.FF(Md5.c, Md5.d, Md5.a, Md5.b, Md5.x[Md5.k + 10], Md5.S13, 0xFFFF5BB1);
Md5.b = Md5.FF(Md5.b, Md5.c, Md5.d, Md5.a, Md5.x[Md5.k + 11], Md5.S14, 0x895CD7BE);
Md5.a = Md5.FF(Md5.a, Md5.b, Md5.c, Md5.d, Md5.x[Md5.k + 12], Md5.S11, 0x6B901122);
Md5.d = Md5.FF(Md5.d, Md5.a, Md5.b, Md5.c, Md5.x[Md5.k + 13], Md5.S12, 0xFD987193);
Md5.c = Md5.FF(Md5.c, Md5.d, Md5.a, Md5.b, Md5.x[Md5.k + 14], Md5.S13, 0xA679438E);
Md5.b = Md5.FF(Md5.b, Md5.c, Md5.d, Md5.a, Md5.x[Md5.k + 15], Md5.S14, 0x49B40821);
Md5.a = Md5.GG(Md5.a, Md5.b, Md5.c, Md5.d, Md5.x[Md5.k + 1], Md5.S21, 0xF61E2562);
Md5.d = Md5.GG(Md5.d, Md5.a, Md5.b, Md5.c, Md5.x[Md5.k + 6], Md5.S22, 0xC040B340);
Md5.c = Md5.GG(Md5.c, Md5.d, Md5.a, Md5.b, Md5.x[Md5.k + 11], Md5.S23, 0x265E5A51);
Md5.b = Md5.GG(Md5.b, Md5.c, Md5.d, Md5.a, Md5.x[Md5.k], Md5.S24, 0xE9B6C7AA);
Md5.a = Md5.GG(Md5.a, Md5.b, Md5.c, Md5.d, Md5.x[Md5.k + 5], Md5.S21, 0xD62F105D);
Md5.d = Md5.GG(Md5.d, Md5.a, Md5.b, Md5.c, Md5.x[Md5.k + 10], Md5.S22, 0x2441453);
Md5.c = Md5.GG(Md5.c, Md5.d, Md5.a, Md5.b, Md5.x[Md5.k + 15], Md5.S23, 0xD8A1E681);
Md5.b = Md5.GG(Md5.b, Md5.c, Md5.d, Md5.a, Md5.x[Md5.k + 4], Md5.S24, 0xE7D3FBC8);
Md5.a = Md5.GG(Md5.a, Md5.b, Md5.c, Md5.d, Md5.x[Md5.k + 9], Md5.S21, 0x21E1CDE6);
Md5.d = Md5.GG(Md5.d, Md5.a, Md5.b, Md5.c, Md5.x[Md5.k + 14], Md5.S22, 0xC33707D6);
Md5.c = Md5.GG(Md5.c, Md5.d, Md5.a, Md5.b, Md5.x[Md5.k + 3], Md5.S23, 0xF4D50D87);
Md5.b = Md5.GG(Md5.b, Md5.c, Md5.d, Md5.a, Md5.x[Md5.k + 8], Md5.S24, 0x455A14ED);
Md5.a = Md5.GG(Md5.a, Md5.b, Md5.c, Md5.d, Md5.x[Md5.k + 13], Md5.S21, 0xA9E3E905);
Md5.d = Md5.GG(Md5.d, Md5.a, Md5.b, Md5.c, Md5.x[Md5.k + 2], Md5.S22, 0xFCEFA3F8);
Md5.c = Md5.GG(Md5.c, Md5.d, Md5.a, Md5.b, Md5.x[Md5.k + 7], Md5.S23, 0x676F02D9);
Md5.b = Md5.GG(Md5.b, Md5.c, Md5.d, Md5.a, Md5.x[Md5.k + 12], Md5.S24, 0x8D2A4C8A);
Md5.a = Md5.HH(Md5.a, Md5.b, Md5.c, Md5.d, Md5.x[Md5.k + 5], Md5.S31, 0xFFFA3942);
Md5.d = Md5.HH(Md5.d, Md5.a, Md5.b, Md5.c, Md5.x[Md5.k + 8], Md5.S32, 0x8771F681);
Md5.c = Md5.HH(Md5.c, Md5.d, Md5.a, Md5.b, Md5.x[Md5.k + 11], Md5.S33, 0x6D9D6122);
Md5.b = Md5.HH(Md5.b, Md5.c, Md5.d, Md5.a, Md5.x[Md5.k + 14], Md5.S34, 0xFDE5380C);
Md5.a = Md5.HH(Md5.a, Md5.b, Md5.c, Md5.d, Md5.x[Md5.k + 1], Md5.S31, 0xA4BEEA44);
Md5.d = Md5.HH(Md5.d, Md5.a, Md5.b, Md5.c, Md5.x[Md5.k + 4], Md5.S32, 0x4BDECFA9);
Md5.c = Md5.HH(Md5.c, Md5.d, Md5.a, Md5.b, Md5.x[Md5.k + 7], Md5.S33, 0xF6BB4B60);
Md5.b = Md5.HH(Md5.b, Md5.c, Md5.d, Md5.a, Md5.x[Md5.k + 10], Md5.S34, 0xBEBFBC70);
Md5.a = Md5.HH(Md5.a, Md5.b, Md5.c, Md5.d, Md5.x[Md5.k + 13], Md5.S31, 0x289B7EC6);
Md5.d = Md5.HH(Md5.d, Md5.a, Md5.b, Md5.c, Md5.x[Md5.k], Md5.S32, 0xEAA127FA);
Md5.c = Md5.HH(Md5.c, Md5.d, Md5.a, Md5.b, Md5.x[Md5.k + 3], Md5.S33, 0xD4EF3085);
Md5.b = Md5.HH(Md5.b, Md5.c, Md5.d, Md5.a, Md5.x[Md5.k + 6], Md5.S34, 0x4881D05);
Md5.a = Md5.HH(Md5.a, Md5.b, Md5.c, Md5.d, Md5.x[Md5.k + 9], Md5.S31, 0xD9D4D039);
Md5.d = Md5.HH(Md5.d, Md5.a, Md5.b, Md5.c, Md5.x[Md5.k + 12], Md5.S32, 0xE6DB99E5);
Md5.c = Md5.HH(Md5.c, Md5.d, Md5.a, Md5.b, Md5.x[Md5.k + 15], Md5.S33, 0x1FA27CF8);
Md5.b = Md5.HH(Md5.b, Md5.c, Md5.d, Md5.a, Md5.x[Md5.k + 2], Md5.S34, 0xC4AC5665);
Md5.a = Md5.II(Md5.a, Md5.b, Md5.c, Md5.d, Md5.x[Md5.k], Md5.S41, 0xF4292244);
Md5.d = Md5.II(Md5.d, Md5.a, Md5.b, Md5.c, Md5.x[Md5.k + 7], Md5.S42, 0x432AFF97);
Md5.c = Md5.II(Md5.c, Md5.d, Md5.a, Md5.b, Md5.x[Md5.k + 14], Md5.S43, 0xAB9423A7);
Md5.b = Md5.II(Md5.b, Md5.c, Md5.d, Md5.a, Md5.x[Md5.k + 5], Md5.S44, 0xFC93A039);
Md5.a = Md5.II(Md5.a, Md5.b, Md5.c, Md5.d, Md5.x[Md5.k + 12], Md5.S41, 0x655B59C3);
Md5.d = Md5.II(Md5.d, Md5.a, Md5.b, Md5.c, Md5.x[Md5.k + 3], Md5.S42, 0x8F0CCC92);
Md5.c = Md5.II(Md5.c, Md5.d, Md5.a, Md5.b, Md5.x[Md5.k + 10], Md5.S43, 0xFFEFF47D);
Md5.b = Md5.II(Md5.b, Md5.c, Md5.d, Md5.a, Md5.x[Md5.k + 1], Md5.S44, 0x85845DD1);
Md5.a = Md5.II(Md5.a, Md5.b, Md5.c, Md5.d, Md5.x[Md5.k + 8], Md5.S41, 0x6FA87E4F);
Md5.d = Md5.II(Md5.d, Md5.a, Md5.b, Md5.c, Md5.x[Md5.k + 15], Md5.S42, 0xFE2CE6E0);
Md5.c = Md5.II(Md5.c, Md5.d, Md5.a, Md5.b, Md5.x[Md5.k + 6], Md5.S43, 0xA3014314);
Md5.b = Md5.II(Md5.b, Md5.c, Md5.d, Md5.a, Md5.x[Md5.k + 13], Md5.S44, 0x4E0811A1);
Md5.a = Md5.II(Md5.a, Md5.b, Md5.c, Md5.d, Md5.x[Md5.k + 4], Md5.S41, 0xF7537E82);
Md5.d = Md5.II(Md5.d, Md5.a, Md5.b, Md5.c, Md5.x[Md5.k + 11], Md5.S42, 0xBD3AF235);
Md5.c = Md5.II(Md5.c, Md5.d, Md5.a, Md5.b, Md5.x[Md5.k + 2], Md5.S43, 0x2AD7D2BB);
Md5.b = Md5.II(Md5.b, Md5.c, Md5.d, Md5.a, Md5.x[Md5.k + 9], Md5.S44, 0xEB86D391);

Md5.a = Md5.AddUnsigned(Md5.a, Md5.AA);
Md5.b = Md5.AddUnsigned(Md5.b, Md5.BB);
Md5.c = Md5.AddUnsigned(Md5.c, Md5.CC);
Md5.d = Md5.AddUnsigned(Md5.d, Md5.DD);
}

temp = Md5.WordToHex(Md5.a) + Md5.WordToHex(Md5.b) + Md5.WordToHex(Md5.c) + Md5.WordToHex(Md5.d);
return temp.toLowerCase();
}
}
7 changes: 2 additions & 5 deletions src/module/component/avatar.component.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* tslint:disable component-selector-name */

import {Component, Input, OnChanges, OnInit} from '@angular/core';
import {Md5} from 'ts-md5/dist/md5';
import {Md5} from '../Md5';

/**
* The main component for the avatar
Expand Down Expand Up @@ -99,12 +99,9 @@ export class AvatarComponent implements OnInit, OnChanges {
* Create a Gravatar API url
*/
getAvatar(): void {
const md5 = new Md5();
// tslint:disable-next-line
if (this.email && /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test(this.email)) {
const hash = md5.start()
.appendStr(this.email)
.end();
const hash = Md5.init(this.email);

const protocol = this.defaultProtocol ? this.defaultProtocol + ':' : '';
this.gravatarUrl = `${protocol}//www.gravatar.com/avatar/${hash}?s=${this.size}&d=404`;
Expand Down

0 comments on commit be6f241

Please sign in to comment.